trustfence-sign-artifact: re-use RAMDISK address for rootfs
Re-use RAMDISK address for authenticating the rootfs instead of allocating a new address (if authenticating a rootfs, we're not using a ramdisk). Signed-off-by: Hector Palacios <hector.palacios@digi.com>
This commit is contained in:
parent
116fb5e203
commit
82dd2cbc4d
|
|
@ -90,24 +90,20 @@ if [ "${PLATFORM}" = "ccimx6" ]; then
|
||||||
CONFIG_FDT_LOADADDR="0x18000000"
|
CONFIG_FDT_LOADADDR="0x18000000"
|
||||||
CONFIG_RAMDISK_LOADADDR="0x19000000"
|
CONFIG_RAMDISK_LOADADDR="0x19000000"
|
||||||
CONFIG_KERNEL_LOADADDR="0x12000000"
|
CONFIG_KERNEL_LOADADDR="0x12000000"
|
||||||
CONFIG_ROOTFS_LOADADDR="0x19800000"
|
|
||||||
CONFIG_CSF_SIZE="0x4000"
|
CONFIG_CSF_SIZE="0x4000"
|
||||||
elif [ "${PLATFORM}" = "ccimx6ul" ]; then
|
elif [ "${PLATFORM}" = "ccimx6ul" ]; then
|
||||||
CONFIG_FDT_LOADADDR="0x83000000"
|
CONFIG_FDT_LOADADDR="0x83000000"
|
||||||
CONFIG_RAMDISK_LOADADDR="0x83800000"
|
CONFIG_RAMDISK_LOADADDR="0x83800000"
|
||||||
CONFIG_KERNEL_LOADADDR="0x80800000"
|
CONFIG_KERNEL_LOADADDR="0x80800000"
|
||||||
CONFIG_ROOTFS_LOADADDR="0x84000000"
|
|
||||||
CONFIG_CSF_SIZE="0x4000"
|
CONFIG_CSF_SIZE="0x4000"
|
||||||
elif [ "${PLATFORM}" = "ccimx8x" ]; then
|
elif [ "${PLATFORM}" = "ccimx8x" ]; then
|
||||||
CONFIG_FDT_LOADADDR="0x82000000"
|
CONFIG_FDT_LOADADDR="0x82000000"
|
||||||
CONFIG_RAMDISK_LOADADDR="0x82100000"
|
CONFIG_RAMDISK_LOADADDR="0x82100000"
|
||||||
CONFIG_KERNEL_LOADADDR="0x80280000"
|
CONFIG_KERNEL_LOADADDR="0x80280000"
|
||||||
CONFIG_ROOTFS_LOADADDR="0x82900000"
|
|
||||||
elif [ "${PLATFORM}" = "ccimx8mn" ] || [ "${PLATFORM}" = "ccimx8mm" ]; then
|
elif [ "${PLATFORM}" = "ccimx8mn" ] || [ "${PLATFORM}" = "ccimx8mm" ]; then
|
||||||
CONFIG_FDT_LOADADDR="0x43000000"
|
CONFIG_FDT_LOADADDR="0x43000000"
|
||||||
CONFIG_RAMDISK_LOADADDR="0x43800000"
|
CONFIG_RAMDISK_LOADADDR="0x43800000"
|
||||||
CONFIG_KERNEL_LOADADDR="0x40480000"
|
CONFIG_KERNEL_LOADADDR="0x40480000"
|
||||||
CONFIG_ROOTFS_LOADADDR="0x44000000"
|
|
||||||
CONFIG_CSF_SIZE="0x2000"
|
CONFIG_CSF_SIZE="0x2000"
|
||||||
else
|
else
|
||||||
echo "Invalid platform: ${PLATFORM}"
|
echo "Invalid platform: ${PLATFORM}"
|
||||||
|
|
@ -122,7 +118,8 @@ fi
|
||||||
[ "${ARTIFACT_BOOTSCRIPT}" = "y" ] && CONFIG_RAM_START="${CONFIG_KERNEL_LOADADDR}"
|
[ "${ARTIFACT_BOOTSCRIPT}" = "y" ] && CONFIG_RAM_START="${CONFIG_KERNEL_LOADADDR}"
|
||||||
# DTB overlays are loaded to $initrd_addr, just like the ramdisk
|
# DTB overlays are loaded to $initrd_addr, just like the ramdisk
|
||||||
[ "${ARTIFACT_DTB_OVERLAY}" = "y" ] && CONFIG_RAM_START="${CONFIG_RAMDISK_LOADADDR}"
|
[ "${ARTIFACT_DTB_OVERLAY}" = "y" ] && CONFIG_RAM_START="${CONFIG_RAMDISK_LOADADDR}"
|
||||||
[ "${ARTIFACT_ROOTFS}" = "y" ] && CONFIG_RAM_START="${CONFIG_ROOTFS_LOADADDR}"
|
# Rootfs is loaded to $initrd_addr, just like the ramdisk
|
||||||
|
[ "${ARTIFACT_ROOTFS}" = "y" ] && CONFIG_RAM_START="${CONFIG_RAMDISK_LOADADDR}"
|
||||||
|
|
||||||
if [ -z "${CONFIG_RAM_START}" ]; then
|
if [ -z "${CONFIG_RAM_START}" ]; then
|
||||||
echo "Specify the type of image to process (-b, -i, -d, -l, -r, or -o)"
|
echo "Specify the type of image to process (-b, -i, -d, -l, -r, or -o)"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue