config: Move CONFIG_BOARD_LATE_INIT to defconfigs

[people/ms/u-boot.git] / include / configs / udoo_neo.h

diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index 0c590682315a9f09c60d8162a10760b70b578a2b..94a38d1264e2922dcf5c8169a469ed609e2fcbee 100644 (file)
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -19,7 +19,6 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (3 * SZ_1M)
 #define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_LATE_INIT
 #define CONFIG_MXC_UART
 
 /* MMC Configuration */
@@ -34,21 +33,21 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
-       "fdt_file=undefined\0" \
+       "fdtfile=undefined\0" \
        "fdt_addr=0x83000000\0" \
        "ip_dyn=yes\0" \
        "mmcdev=0\0" \
        "mmcrootfstype=ext4\0" \
        "findfdt="\
                "if test $board_name = BASIC; then " \
-                       "setenv fdt_file imx6sx-udoo-neo-basic.dtb; fi; " \
+                       "setenv fdtfile imx6sx-udoo-neo-basic.dtb; fi; " \
                "if test $board_name = BASICKS; then " \
-                       "setenv fdt_file imx6sx-udoo-neo-basic.dtb; fi; " \
+                       "setenv fdtfile imx6sx-udoo-neo-basic.dtb; fi; " \
                "if test $board_name = FULL; then " \
-                       "setenv fdt_file imx6sx-udoo-neo-full.dtb; fi; " \
+                       "setenv fdtfile imx6sx-udoo-neo-full.dtb; fi; " \
                "if test $board_name = EXTENDED; then " \
-                       "setenv fdt_file imx6sx-udoo-neo-extended.dtb; fi; " \
-               "if test $fdt_file = UNDEFINED; then " \
+                       "setenv fdtfile imx6sx-udoo-neo-extended.dtb; fi; " \
+               "if test $fdtfile = UNDEFINED; then " \
                        "echo WARNING: Could not determine dtb to use; fi; \0" \
        "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
        "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
@@ -58,7 +57,8 @@
        BOOTENV
 
 #define BOOT_TARGET_DEVICES(func) \
-       func(MMC, mmc, 0)
+       func(MMC, mmc, 0) \
+       func(DHCP, dhcp, na)
 
 #define CONFIG_BOOTCOMMAND \
        "run findfdt; " \
@@ -103,4 +103,18 @@
 #define CONFIG_POWER_PFUZE3000_I2C_ADDR        0x08
 #define PFUZE3000_I2C_BUS      0
 
+/* Network */
+#define CONFIG_FEC_MXC
+#define CONFIG_MII
+
+#define CONFIG_FEC_ENET_DEV 0
+#define IMX_FEC_BASE                   ENET_BASE_ADDR
+#define CONFIG_FEC_MXC_PHYADDR          0x0
+
+#define CONFIG_FEC_XCV_TYPE             RMII
+#define CONFIG_ETHPRIME                 "FEC0"
+
+#define CONFIG_PHYLIB
+#define CONFIG_PHY_MICREL
+
 #endif                         /* __CONFIG_H */