Merge git://git.denx.de/u-boot-mpc85xx

[platform/kernel/u-boot.git] / include / configs / udoo_neo.h

diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index aec39db..23a3685 100644 (file)
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -18,8 +18,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,26 +32,26 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
-       "fdt_file=undefined\0" \
+       "fdtfile=undefined\0" \
        "fdt_addr=0x83000000\0" \
+       "fdt_addr_r=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 " \
-                       "echo WARNING: Could not determine dtb to use; fi; \0" \
+                       "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" \
        "ramdisk_addr_r=0x83000000\0" \
-       "ramdiskaddr=0x83000000\0" \
        "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
        BOOTENV