Skip to contentSkip to conversation

rpi: set fdt_addr_r to 0x00000100 to match default device_tree_address

PATCH In review Jonathan Liu 2 participants 2 messages Aug 22, 2015 – Aug 28, 2015

lore
Share & tools
lore

Jonathan Liu

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 include/configs/rpi-common.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/configs/rpi-common.h +2 -2
index 8830a10..06836cd 100644
@@ -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) \
Signature · 1 line
2.5.0
#1 lore raw
Quoted 4 lines · Jonathan Liu

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 <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150828/ac2a104a/attachment.sig>