summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2015-08-22 20:27:17 +1000
committerTom Rini <trini@konsulko.com>2015-08-28 11:46:35 -0400
commit14006a5671058bfe2f323beeec66448fce228adb (patch)
tree75d42997a7efac29595532ccc09c70030438e474 /include
parent9734b97f76a942f449fdc9ff445a003aa812baa7 (diff)
downloadblackbird-obmc-uboot-14006a5671058bfe2f323beeec66448fce228adb.tar.gz
blackbird-obmc-uboot-14006a5671058bfe2f323beeec66448fce228adb.zip
rpi: set fdt_addr_r to 0x00000100 to match default device_tree_address
Raspberry Pi by default loads the FDT to 0x00000100 so set fdt_addr_r to match and move scriptaddr to 0x02000000 to avoid clobbering the FDT. Signed-off-by: Jonathan Liu <net147@gmail.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/rpi-common.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h
index 8830a10efb..06836cd5d8 100644
--- 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) \
OpenPOWER on IntegriCloud