projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-usb
[platform/kernel/u-boot.git]
/
include
/
fsl_ddr.h
diff --git
a/include/fsl_ddr.h
b/include/fsl_ddr.h
index
0c3be0e
..
261b94e
100644
(file)
--- 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 */
#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_CONTROLLE
RS
+#define CONFIG_SYS_FSL_DDR_MAIN_NUM_CTRLS CONFIG_
SYS_NUM_DDR_CTL
RS
#endif
#ifdef CONFIG_SYS_FSL_DDR_LE
#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
*/
*
* 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 {
#define CONFIG_SYS_DIMM_SLOTS_PER_CTLR CONFIG_DIMM_SLOTS_PER_CTLR
typedef struct {