arm-bsp/trusted-firmware-a: use full option names in sgdisk call
PATCH 1/2 arm-bsp/trusted-firmware-a: use full option names in sgdisk call
The TC appends include a long sgdisk invocation which can be made a lot clearer by using the full option names (e.g. --change-name) instead of short (e.g. -c).
Signed-off-by Ross Burton <[email protected]>
--- .../trusted-firmware-a-tc.inc | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-)
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-tc.inc +21 -5
@@ -101,11 +101,27 @@ do_generate_gpt() { dd if=/dev/zero of=$gpt_image bs=$gpt_size count=1 # create the GPT layout - sgdisk -a 1 -U $location_uuid \ - -n 1:$start_sector_1:+$num_sectors_fip -c 1:FIP_A -t 1:$fip_type_uuid -u 1:$FIP_A_uuid \ - -n 2:$start_sector_2:+$num_sectors_fip -c 2:FIP_B -t 2:$fip_type_uuid -u 2:$FIP_B_uuid \ - -n 3:$start_sector_3:+$num_sectors_metadata -c 3:FWU-Metadata -t 3:$metadata_type_uuid \ - -n 4:$start_sector_4:+$num_sectors_metadata -c 4:Bkup-FWU-Metadata -t 4:$metadata_type_uuid $gpt_image + sgdisk $gpt_image \ + --set-alignment 1 \ + --disk-guid $location_uuid \ + \ + --new 1:$start_sector_1:+$num_sectors_fip \ + --change-name 1:FIP_A \ + --typecode 1:$fip_type_uuid \ + --partition-guid 1:$FIP_A_uuid \ + \ + --new 2:$start_sector_2:+$num_sectors_fip \ + --change-name 2:FIP_B \ + --typecode 2:$fip_type_uuid \ + --partition-guid 2:$FIP_B_uuid \ + \ + --new 3:$start_sector_3:+$num_sectors_metadata \ + --change-name 3:FWU-Metadata \ + --typecode 3:$metadata_type_uuid \ + \ + --new 4:$start_sector_4:+$num_sectors_metadata \ + --change-name 4:Bkup-FWU-Metadata \ + --typecode 4:$metadata_type_uuid # populate the GPT partitions dd if=$fip_bin of=$gpt_image bs=$sector_size seek=$start_sector_1 count=$num_sectors_fip conv=notrunc
Signature · 1 line
2.25.1
PATCH 2/2 arm-bsp/trusted-firmware-a: upgrade TC to 2.6
Upgrade TC's TF-A from a post-2.5 snapshot to the 2.6 release.
This means increasing the maximum size of BL31.
Signed-off-by Ross Burton <[email protected]>
--- meta-arm-bsp/conf/machine/include/tc.inc | 2 -- .../0001-plat-tc-Increase-maximum-BL2-size.patch | 11 ++++++++++- .../trusted-firmware-a/trusted-firmware-a-tc.inc | 5 ----- 3 files changed, 10 insertions(+), 8 deletions(-)
meta-arm-bsp/conf/machine/include/tc.inc +0 -2
@@ -21,8 +21,6 @@ UBOOT_SIGN_KEYNAME = "dev_key" UBOOT_SIGN_KEYDIR = "${DEPLOY_DIR_IMAGE}/keys" FIT_GENERATE_KEYS = "1" -PREFERRED_VERSION_trusted-firmware-a ?= "2.5%" - PREFERRED_PROVIDER_virtual/kernel ?= "linux-arm64-ack" PREFERRED_VERSION_linux-arm64-ack ?= "5.10"
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/0001-plat-tc-Increase-maximum-BL2-size.patch +10 -1
@@ -27,8 +27,17 @@ index ccabced9e..f45457b9f 100644 -# define PLAT_ARM_MAX_BL2_SIZE 0x14000 +# define PLAT_ARM_MAX_BL2_SIZE 0x16000 #endif - + + /* +@@ -130,7 +130,7 @@ + * calculated using the current BL31 PROGBITS debug size plus the sizes of + * BL2 and BL1-RW + */ +-#define PLAT_ARM_MAX_BL31_SIZE 0x3F000 ++#define PLAT_ARM_MAX_BL31_SIZE 0x4F000 + /* + * Size of cacheable stacks -- 2.17.1
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-tc.inc +0 -5
@@ -1,10 +1,5 @@ # TC0 specific TFA configuration -# Intermediate SHA with 2.5 baseline version -SRCREV_tfa = "34a87d74d9fbbe8037431ea5101110a9f1cf30e1" -PV = "2.5+git${SRCPV}" -LIC_FILES_CHKSUM = "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" - DEPENDS += "scp-firmware util-linux-native gptfdisk-native" SRC_URI:append = " \
Signature · 1 line
2.25.1
Jon Mason
AppliedQuoted 3 lines · Ross Burton
The TC appends include a long sgdisk invocation which can be made a lot clearer by using the full option names (e.g. --change-name) instead of short (e.g. -c).
Applied, thanks!
[1/2] arm-bsp/trusted-firmware-a: use full option names in sgdisk call
commit: 8d53f4c3eb03218d9b1c31f6bbfda8e6f2dc5bb1
[2/2] arm-bsp/trusted-firmware-a: upgrade TC to 2.6
commit: b398c1bcdfd653adc72d10882b21695d0d236988Best regards,
Signature · 1 line
Jon Mason <[email protected]>