From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonathan Liu Date: Sat, 22 Aug 2015 20:27:17 +1000 Subject: [U-Boot] [PATCH] rpi: set fdt_addr_r to 0x00000100 to match default device_tree_address Message-ID: <1440239237-14823-1-git-send-email-net147@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 --- include/configs/rpi-common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h index 8830a10..06836cd 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) \ -- 2.5.0