From 70de03097444ae371f0c219da957d5ce494efe91 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Fri, 3 Dec 2021 16:32:08 +0100 Subject: [PATCH] Revert "trustfence: change RAM location to the same values used in u-boot" The AHAB decryption process takes the encrypted file from the address defined in U-Boot and decrypts it into the address defined in this script. If both addresses are the same, the decryption process ends up failing. This happens even for signed-only images. Maintain the original addresses in this script so they do not collide. This reverts commit c970d87d5a0370b1c76e7e36e0563e2120ec1b9d. Signed-off-by: Gonzalo Ruiz --- .../trustfence-sign-tools/trustfence-sign-artifact.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh index 324686bbb..28adac4c6 100755 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh @@ -97,9 +97,9 @@ elif [ "${PLATFORM}" = "ccimx6ul" ]; then CONFIG_KERNEL_LOADADDR="0x80800000" CONFIG_CSF_SIZE="0x4000" elif [ "${PLATFORM}" = "ccimx8x" ]; then - CONFIG_FDT_LOADADDR="0x8A000000" - CONFIG_RAMDISK_LOADADDR="0x8A100000" - CONFIG_KERNEL_LOADADDR="0x88280000" + CONFIG_FDT_LOADADDR="0x82000000" + CONFIG_RAMDISK_LOADADDR="0x82100000" + CONFIG_KERNEL_LOADADDR="0x80280000" elif [ "${PLATFORM}" = "ccimx8mn" ] || [ "${PLATFORM}" = "ccimx8mm" ]; then CONFIG_FDT_LOADADDR="0x43000000" CONFIG_RAMDISK_LOADADDR="0x43800000"