Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[u-boot] / include / configs / rpi-common.h

diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h
index 8830a10efb012755ae76e644212a20482b89c434..06836cd5d8e916bd51197fdc55e9541952afcccc 100644 (file)
--- a/include/configs/rpi-common.h
+++ b/include/configs/rpi-common.h
@@ -163,10 +163,10 @@
  *   for the FDT/DTB to be up to 1M, which is hopefully plenty.
  */
 #define ENV_MEM_LAYOUT_SETTINGS \
-       "scriptaddr=0x00000000\0" \
+       "fdt_addr_r=0x00000100\0" \
        "pxefile_addr_r=0x00100000\0" \
        "kernel_addr_r=0x01000000\0" \
-       "fdt_addr_r=0x02000000\0" \
+       "scriptaddr=0x02000000\0" \
        "ramdisk_addr_r=0x02100000\0" \
 
 #define BOOT_TARGET_DEVICES(func) \