From 74d8f9d56266773784be2cecb5f52a573b1d060c Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Thu, 20 Aug 2020 08:56:49 -0500 Subject: [PATCH] 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 Reviewed-by: Tom Rini Reviewed-by: Fabio Estevam --- include/configs/imx6_logic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 63662dd18d..6b992f9ab8 100644 --- 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" \ -- 2.39.5