| Message ID | 20220104210558.3504309-2-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] arm-bsp/trusted-firmware-a: use full option names in sgdisk call | expand |
diff --git a/meta-arm-bsp/conf/machine/include/tc.inc b/meta-arm-bsp/conf/machine/include/tc.inc index 9f0239bb..abdbfd3d 100644 --- a/meta-arm-bsp/conf/machine/include/tc.inc +++ b/meta-arm-bsp/conf/machine/include/tc.inc @@ -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" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/0001-plat-tc-Increase-maximum-BL2-size.patch b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/0001-plat-tc-Increase-maximum-BL2-size.patch index 22d32576..b6a5b4de 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/0001-plat-tc-Increase-maximum-BL2-size.patch +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/0001-plat-tc-Increase-maximum-BL2-size.patch @@ -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 diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-tc.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-tc.inc index f47856b2..19b46230 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-tc.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-tc.inc @@ -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 = " \
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 <ross.burton@arm.com> --- 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(-)