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
global: Migrate CONFIG_MXC_UART_BASE to CFG
[platform/kernel/u-boot.git]
/
include
/
configs
/
mx6ullevk.h
diff --git
a/include/configs/mx6ullevk.h
b/include/configs/mx6ullevk.h
index
db09db4
..
2c3cd32
100644
(file)
--- a/
include/configs/mx6ullevk.h
+++ b/
include/configs/mx6ullevk.h
@@
-16,21
+16,15
@@
#define PHYS_SDRAM_SIZE SZ_512M
#define PHYS_SDRAM_SIZE SZ_512M
-#define C
ONFIG_MXC_UART_BASE
UART1_BASE
+#define C
FG_MXC_UART_BASE
UART1_BASE
/* MMC Configs */
#ifdef CONFIG_FSL_USDHC
/* MMC Configs */
#ifdef CONFIG_FSL_USDHC
-#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
-
-/* NAND pin conflicts with usdhc2 */
-#ifdef CONFIG_SYS_USE_NAND
-#define CONFIG_SYS_FSL_USDHC_NUM 1
-#else
-#define CONFIG_SYS_FSL_USDHC_NUM 2
-#endif
+#define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
+#define CFG_SYS_FSL_USDHC_NUM 2
#endif
#endif
-#define C
ONFI
G_EXTRA_ENV_SETTINGS \
+#define C
F
G_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
"image=zImage\0" \
"console=ttymxc0\0" \
"script=boot.scr\0" \
"image=zImage\0" \
"console=ttymxc0\0" \
@@
-108,16
+102,14
@@
/* Physical Memory Map */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
/* Physical Memory Map */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
-#define C
ONFIG_SYS_SDRAM_BASE
PHYS_SDRAM
-#define C
ONFIG_SYS_INIT_RAM_ADDR
IRAM_BASE_ADDR
-#define C
ONFIG_SYS_INIT_RAM_SIZE
IRAM_SIZE
+#define C
FG_SYS_SDRAM_BASE
PHYS_SDRAM
+#define C
FG_SYS_INIT_RAM_ADDR
IRAM_BASE_ADDR
+#define C
FG_SYS_INIT_RAM_SIZE
IRAM_SIZE
/* environment organization */
/* environment organization */
-#define CONFIG_IOMUX_LPSR
-
#ifdef CONFIG_CMD_NET
#ifdef CONFIG_CMD_NET
-#define C
ONFIG_FEC_ENET_DEV
1
+#define C
FG_FEC_ENET_DEV
1
#endif
#endif
#endif
#endif