summaryrefslogtreecommitdiff
path: root/include/fsl_ddr.h
diff options
context:
space:
mode:
authorYork Sun <york.sun@nxp.com>2016-12-28 16:43:45 (GMT)
committerTom Rini <trini@konsulko.com>2017-01-05 00:40:52 (GMT)
commit51370d561842ae7438337e77a93177e13796ac45 (patch)
treeda97bb17019e198360bd99d81e9d98a533c014b4 /include/fsl_ddr.h
parent66e399b68d20d96a90ba391d75c2290bd63bf4a5 (diff)
downloadu-boot-51370d561842ae7438337e77a93177e13796ac45.tar.xz
ddr: fsl: Merge macro CONFIG_NUM_DDR_CONTROLLERS and CONFIG_SYS_NUM_DDR_CTRLS
These two macros are used for the same thing, the total number of DDR controllers for a given SoC. Use SYS_NUM_DDR_CTRLS in Kconfig and merge existing usage. Signed-off-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'include/fsl_ddr.h')
-rw-r--r--include/fsl_ddr.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/fsl_ddr.h b/include/fsl_ddr.h
index 0c3be0e..261b94e 100644
--- a/include/fsl_ddr.h
+++ b/include/fsl_ddr.h
@@ -15,7 +15,7 @@
#ifndef CONFIG_SYS_FSL_DDR_MAIN_NUM_CTRLS
/* All controllers are for main memory */
-#define CONFIG_SYS_FSL_DDR_MAIN_NUM_CTRLS CONFIG_NUM_DDR_CONTROLLERS
+#define CONFIG_SYS_FSL_DDR_MAIN_NUM_CTRLS CONFIG_SYS_NUM_DDR_CTLRS
#endif
#ifdef CONFIG_SYS_FSL_DDR_LE
@@ -54,7 +54,6 @@ compute_dimm_parameters(const unsigned int ctrl_num,
*
* All data structures have to be on the stack
*/
-#define CONFIG_SYS_NUM_DDR_CTLRS CONFIG_NUM_DDR_CONTROLLERS
#define CONFIG_SYS_DIMM_SLOTS_PER_CTLR CONFIG_DIMM_SLOTS_PER_CTLR
typedef struct {