From ec32ff912937b38156f215ecabed23a21f815cc0 Mon Sep 17 00:00:00 2001 From: Sergio Prado Date: Wed, 19 Apr 2023 22:05:08 -0300 Subject: machines: fix fitimage ramdisk load address Booting with a FIT image (that includes a ramdisk image) is failing on several machines with the following error message: Error: ramdisk overwritten Ramdisk image is corrupt or invalid This is because the boot script uses ramdisk_addr_r to load the FIT image, and this is overlapping with the default fitimage ramdisk load address. Fix by adjusting the fitimage ramdisk load address: UBOOT_RD_LOADADDRESS = ramdisk_addr_r + 32M Build and boot time tested on all impacted machines. Signed-off-by: Sergio Prado (cherry picked from commit 5a1617c4d363e6b1ac23d6884b47cd113b395d84) --- conf/machine/include/apalis-imx6.inc | 2 +- conf/machine/include/colibri-imx6.inc | 2 +- conf/machine/include/colibri-imx6ull.inc | 2 +- conf/machine/include/colibri-imx7-emmc.inc | 2 +- conf/machine/verdin-imx8mm.conf | 2 +- conf/machine/verdin-imx8mp.conf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc index 1942e68..6b599fc 100644 --- a/conf/machine/include/apalis-imx6.inc +++ b/conf/machine/include/apalis-imx6.inc @@ -33,4 +33,4 @@ MACHINE_FIRMWARE:remove = "firmware-imx-epdc" UBOOT_DTB_LOADADDRESS:apalis-imx6 = "0x18200000" UBOOT_DTBO_LOADADDRESS:apalis-imx6 = "0x18300000" UBOOT_ENTRYPOINT:apalis-imx6 = "0x14200000" -UBOOT_RD_LOADADDRESS:apalis-imx6 = "0x18400000" +UBOOT_RD_LOADADDRESS:apalis-imx6 = "0x1A400000" diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc index 2577188..c0364a7 100644 --- a/conf/machine/include/colibri-imx6.inc +++ b/conf/machine/include/colibri-imx6.inc @@ -33,4 +33,4 @@ MACHINE_FIRMWARE:remove = "firmware-imx-epdc" UBOOT_DTB_LOADADDRESS:colibri-imx6 = "0x18200000" UBOOT_DTBO_LOADADDRESS:colibri-imx6 = "0x18300000" UBOOT_ENTRYPOINT:colibri-imx6 = "0x14200000" -UBOOT_RD_LOADADDRESS:colibri-imx6 = "0x18400000" +UBOOT_RD_LOADADDRESS:colibri-imx6 = "0x1A400000" diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc index 1c7642c..483121c 100644 --- a/conf/machine/include/colibri-imx6ull.inc +++ b/conf/machine/include/colibri-imx6ull.inc @@ -35,4 +35,4 @@ UBOOT_DTB_LOADADDRESS:colibri-imx6ull = "0x88200000" UBOOT_DTBO_LOADADDRESS:colibri-imx6ull = "0x88300000" UBOOT_ENTRYPOINT:colibri-imx6ull = "0x84200000" UBOOT_MAKE_TARGET:colibri-imx6ull = "u-boot.imx" -UBOOT_RD_LOADADDRESS:colibri-imx6ull = "0x88400000" +UBOOT_RD_LOADADDRESS:colibri-imx6ull = "0x8A400000" diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc index b3141b3..7c525eb 100644 --- a/conf/machine/include/colibri-imx7-emmc.inc +++ b/conf/machine/include/colibri-imx7-emmc.inc @@ -34,5 +34,5 @@ UBOOT_DTB_LOADADDRESS:colibri-imx7-emmc = "0x88200000" UBOOT_DTBO_LOADADDRESS:colibri-imx7-emmc = "0x88300000" UBOOT_ENTRYPOINT:colibri-imx7-emmc = "0x84200000" UBOOT_MAKE_TARGET:colibri-imx7-emmc = "u-boot.imx" -UBOOT_RD_LOADADDRESS:colibri-imx7-emmc = "0x88400000" +UBOOT_RD_LOADADDRESS:colibri-imx7-emmc = "0x8A400000" UBOOT_SUFFIX:${MACHINE} = "imx" diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf index 4033ae9..9f4c4e0 100644 --- a/conf/machine/verdin-imx8mm.conf +++ b/conf/machine/verdin-imx8mm.conf @@ -36,7 +36,7 @@ SPL_BINARY = "spl/u-boot-spl.bin" UBOOT_DTB_LOADADDRESS:mx8mm-generic-bsp = "0x50200000" UBOOT_DTBO_LOADADDRESS:mx8mm-generic-bsp = "0x50240000" UBOOT_ENTRYPOINT:mx8mm-generic-bsp = "0x48200000" -UBOOT_RD_LOADADDRESS = "0x50300000" +UBOOT_RD_LOADADDRESS = "0x52300000" # Set u-boot DTB UBOOT_DTB_NAME = "imx8mm-verdin.dtb" diff --git a/conf/machine/verdin-imx8mp.conf b/conf/machine/verdin-imx8mp.conf index 0a1d4fd..6d6abaf 100644 --- a/conf/machine/verdin-imx8mp.conf +++ b/conf/machine/verdin-imx8mp.conf @@ -36,7 +36,7 @@ SPL_BINARY = "spl/u-boot-spl.bin" UBOOT_DTB_LOADADDRESS:mx8mp-generic-bsp = "0x50200000" UBOOT_DTBO_LOADADDRESS:mx8mp-generic-bsp = "0x50240000" UBOOT_ENTRYPOINT:mx8mp-generic-bsp = "0x48200000" -UBOOT_RD_LOADADDRESS = "0x50300000" +UBOOT_RD_LOADADDRESS = "0x52300000" # Set u-boot DTB UBOOT_DTB_NAME = "imx8mp-verdin.dtb" -- cgit v1.2.3