ARM: imx6q_logic: Fix broken booting by moving fdt_addr_r address

The loading address is too close to the kernel address, so newer kernels
may overlap memory space, so loading the device tree may corrupt zImage.

This patch moves the fdt_addr_r to 0x14000000 which is also consistent
with guidance that the kernel be allocated 32MB.  This places it
in the same place as the ramdisk, so this patch moves the ramdisk address
512KB after the fdt.

Signed-off-by: Adam Ford <[email protected]>
Reviewed-by: Tom Rini <[email protected]>
Reviewed-by: Fabio Estevam <[email protected]>

diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index 63662dd18d400d9633c452bbd8341c63b5ca3a12..6b992f9ab8bff8b9c11e39abb671284da9abf1e9 100644 (file)
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -34,8 +34,8 @@
        "script=boot.scr\0" \
        "image=zImage\0" \
        "bootm_size=0x10000000\0" \
-       "fdt_addr_r=0x13000000\0" \
-       "ramdisk_addr_r=0x14000000\0" \
+       "fdt_addr_r=0x14000000\0" \
+       "ramdisk_addr_r=0x14080000\0" \
        "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
        "ramdisk_file=rootfs.cpio.uboot\0" \
        "boot_fdt=try\0" \