apalis/colibri imx6: provide proper fdtfile value

[oweals/u-boot.git] / include / configs / apalis_imx6.h

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 96169f55f08c6f7d87f69a5c98a26fd5e8c4bc96..c27ba6ca6b71e5730762030ec81bce1950889e94 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -46,8 +46,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       3
 
-#define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
-
 /*
  * SATA Configs
  */
@@ -138,12 +136,12 @@
 
 #define MEM_LAYOUT_ENV_SETTINGS \
        "bootm_size=0x20000000\0" \
-       "fdt_addr_r=0x12000000\0" \
+       "fdt_addr_r=0x12100000\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
        "kernel_addr_r=0x11000000\0" \
        "pxefile_addr_r=0x17100000\0" \
-       "ramdisk_addr_r=0x12100000\0" \
+       "ramdisk_addr_r=0x12200000\0" \
        "scriptaddr=0x17000000\0"
 
 #define NFS_BOOTCMD \
@@ -188,7 +186,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        BOOTENV \
        "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
-               "run distro_bootcmd ; " \
+               "setenv fdtfile ${fdt_file}; run distro_bootcmd ; " \
                "usb start ; " \
                "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
        "boot_file=zImage\0" \