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_USB_FLAGS et al to CFG
[platform/kernel/u-boot.git]
/
include
/
configs
/
npi_imx6ull.h
diff --git
a/include/configs/npi_imx6ull.h
b/include/configs/npi_imx6ull.h
index
09c4ddb
..
5f93339
100644
(file)
--- a/
include/configs/npi_imx6ull.h
+++ b/
include/configs/npi_imx6ull.h
@@
-13,13
+13,11
@@
#define CFG_SYS_FSL_USDHC_NUM 1
/* Console configs */
#define CFG_SYS_FSL_USDHC_NUM 1
/* Console configs */
-#define C
ONFIG_MXC_UART_BASE
UART1_BASE
+#define C
FG_MXC_UART_BASE
UART1_BASE
/* MMC Configs */
#define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
/* MMC Configs */
#define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
-#define CONFIG_NETMASK 255.255.255.0
-
/* Physical Memory Map */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
/* Physical Memory Map */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
@@
-31,16
+29,16
@@
#define CFG_SYS_NAND_BASE 0x40000000
/* USB Configs */
#define CFG_SYS_NAND_BASE 0x40000000
/* USB Configs */
-#define C
ONFIG_MXC_USB_PORTSC
(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define C
ONFIG_MXC_USB_FLAGS
0
+#define C
FG_MXC_USB_PORTSC
(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define C
FG_MXC_USB_FLAGS
0
#ifdef CONFIG_CMD_NET
#ifdef CONFIG_CMD_NET
-#define C
ONFIG_FEC_MXC_PHYADDR
0x1
+#define C
FG_FEC_MXC_PHYADDR
0x1
#endif
#endif
-#define C
ONFIG_FEC_ENET_DEV
1
+#define C
FG_FEC_ENET_DEV
1
-#define C
ONFI
G_EXTRA_ENV_SETTINGS \
+#define C
F
G_EXTRA_ENV_SETTINGS \
"console=ttymxc0,115200n8\0" \
"image=zImage\0" \
"fdtfile=imx6ull-seeed-npi-dev-board.dtb\0" \
"console=ttymxc0,115200n8\0" \
"image=zImage\0" \
"fdtfile=imx6ull-seeed-npi-dev-board.dtb\0" \