diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2023-09-11 15:24:07 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2023-09-11 15:24:17 +0300 |
| commit | fc7e7973f3119e2bad511209aa336537dc5ffbed (patch) | |
| tree | 17f710baf630d26af09b667744e0381ac0967c50 /meta-arm/meta-arm | |
| parent | 566b706ac11162bf6311c2885e9772473e25c7bc (diff) | |
| download | openbmc-fc7e7973f3119e2bad511209aa336537dc5ffbed.tar.xz | |
subtree updates
meta-security: b9bc938785..1856a7cf43:
Armin Kuster (1):
scap-security-guide: update to 0.1.69+
Lei Maohui (2):
paxctl: Fix do_package QA Issue.
ccs-tools: Fix do_package QA Issue.
Martin Jansa (1):
layer.conf: update LAYERSERIES_COMPAT for nanbield
Yi Zhao (1):
scap-security-guide: pass the correct cpe/schemas/xsl paths to oscap
meta-arm: 992c07f7c0..bd0953cc60:
Abdellatif El Khlifi (1):
arm-bsp/u-boot: corstone1000: detect the kernel size automatically
Anusmita Dutta Mazumder (5):
arm-bsp/u-boot: corstone1000: add unique firmware GUID
arm-bsp/trusted-firmware-m: corstone1000: add unique firmware GUID
arm-bsp/scp-firmware: Update N1SDP scp-firmware version
arm-bsp/n1sdp: Enable tests with pseudo trusted application
CI: Build custom image for N1SDP optee-xtest
Delane Brandy (1):
arm-bsp/corstone1000: mmc2-enablement
Emekcan Aras (2):
arm-bsp/trusted-firmware-a: corstone1000: Update TF-A v2.9
arm-bsp/optee-os: corstone1000: Update optee-os v3.22
Javier Tia (1):
optee-client: Add path condition to tee-supplicant.service
Jon Mason (14):
arm/trusted-firmware-a: update to 2.9.0
arm-bsp/juno: update kernel to 6.4
arm/linux-yocto: change defconfig patch for 6.4
arm/hafnium: update to v2.8
arm/linux-yocto: update kernel patches
arm/trusted-services: add SRCREV_FORMAT
arm-bsp/tc1: update optee
arm-bsp/fvp-baser-aemv8r64: update u-boot to 2023.01
arm-bsp/corstone500: upgrade u-boot to the latest
arm-bsp/corstone500: removal of support
arm: patch clean-ups
arm/edk2: update to 202305 version
arm/sbsa-acs: update to v7.1.2
arm-bsp/trusted-firmware-a: remove unneeded patches
Mariam Elshakfy (2):
arm-bsp/trusted-firmware-a: Update TF-A version for N1SDP
arm-bsp/n1sdp: Update edk2-firmware version for N1SDP to 202305
Ross Burton (3):
kas/: pass through DISPLAY from environment
Remove explicit SRCPV
arm-bsp/external-system: set PACKAGE_ARCH as this is machine-specific
meta-raspberrypi: 5e2f79a6fa..6501ec892c:
Andrei Gherzan (2):
ci: Add usrmerge to distro features
docs: Fix documentation theme
Sangmo Kang (1):
omxplayer: fix an error caused by new srcrev fetcher API
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-arm/meta-arm')
38 files changed, 168 insertions, 1044 deletions
diff --git a/meta-arm/meta-arm/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_git.bb b/meta-arm/meta-arm/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_git.bb index cb79069bcf..775f406457 100644 --- a/meta-arm/meta-arm/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_git.bb +++ b/meta-arm/meta-arm/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_git.bb @@ -9,7 +9,7 @@ SRCREV = "d3b1a15d18542b2086e72bfdc3fc43f454772a3b" # boot-wrapper doesn't make releases UPSTREAM_CHECK_COMMITS = "1" -PV = "git${SRCPV}" +PV = "0+git" S = "${WORKDIR}/git" diff --git a/meta-arm/meta-arm/recipes-bsp/hafnium/hafnium/0002-arm-hafnium-fix-kernel-tool-linking.patch b/meta-arm/meta-arm/recipes-bsp/hafnium/hafnium/0001-arm-hafnium-fix-kernel-tool-linking.patch index 5c69b78838..d4fe49ae6e 100644 --- a/meta-arm/meta-arm/recipes-bsp/hafnium/hafnium/0002-arm-hafnium-fix-kernel-tool-linking.patch +++ b/meta-arm/meta-arm/recipes-bsp/hafnium/hafnium/0001-arm-hafnium-fix-kernel-tool-linking.patch @@ -1,4 +1,4 @@ -From b54c7b4d325b7effbebe5bdd86d0cfceedb66b9d Mon Sep 17 00:00:00 2001 +From ef156578c1f7100b339ddfe956ff2cd89d61e0d4 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@arm.com> Date: Tue, 9 Nov 2021 23:31:22 +0000 Subject: [PATCH] arm/hafnium: fix kernel tool linking @@ -11,16 +11,15 @@ ld: .../recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/lib/libcrypto.so: u Upstream-Status: Inappropriate Signed-off-by: Ross Burton <ross.burton@arm.com> - --- build/linux/linux.gni | 1 + 1 file changed, 1 insertion(+) diff --git a/build/linux/linux.gni b/build/linux/linux.gni -index 45860fab..b0102544 100644 +index 497915290106..0e0167d5f485 100644 --- a/build/linux/linux.gni +++ b/build/linux/linux.gni -@@ -60,6 +60,7 @@ template("linux_kernel") { +@@ -54,6 +54,7 @@ template("linux_kernel") { "LLVM=1", "LLVM_IAS=1", "CROSS_COMPILE=aarch64-linux-gnu-", diff --git a/meta-arm/meta-arm/recipes-bsp/hafnium/hafnium/0001-define-_Noreturn-if-needed.patch b/meta-arm/meta-arm/recipes-bsp/hafnium/hafnium/0001-define-_Noreturn-if-needed.patch deleted file mode 100644 index 8353fc1223..0000000000 --- a/meta-arm/meta-arm/recipes-bsp/hafnium/hafnium/0001-define-_Noreturn-if-needed.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3da6c62e6f56facf9c6a8d7d46fa9509e76f482e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 19 Apr 2022 22:32:56 -0700 -Subject: [PATCH] define _Noreturn if needed - -The new _Noreturn function specifier is not recognized by the parser and shows as a syntax error: - -Fixes -../git/inc/hf/panic.h:13:1: error: '_Noreturn' is a C11 extension [-Werror,-Wc11-extensions] -noreturn void panic(const char *fmt, ...); -^ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - inc/hf/panic.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/inc/hf/panic.h b/inc/hf/panic.h -index ec864e4f..588f1193 100644 ---- a/inc/hf/panic.h -+++ b/inc/hf/panic.h -@@ -10,4 +10,8 @@ - - #include <stdnoreturn.h> - -+#ifndef _Noreturn -+#define _Noreturn __attribute__ ((noreturn)) -+#endif -+ - noreturn void panic(const char *fmt, ...); - diff --git a/meta-arm/meta-arm/recipes-bsp/hafnium/hafnium/0003-Fix-build-with-clang-15.patch b/meta-arm/meta-arm/recipes-bsp/hafnium/hafnium/0002-Fix-build-with-clang-15.patch index f037d2b58f..c305e97bfd 100644 --- a/meta-arm/meta-arm/recipes-bsp/hafnium/hafnium/0003-Fix-build-with-clang-15.patch +++ b/meta-arm/meta-arm/recipes-bsp/hafnium/hafnium/0002-Fix-build-with-clang-15.patch @@ -1,4 +1,4 @@ -From d96f696244e0869654004f49586b53811037db30 Mon Sep 17 00:00:00 2001 +From 960d022fa69568752a58b6f5d78e9759b54cff68 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 22 Sep 2022 19:13:49 -0700 Subject: [PATCH] Fix build with clang-15 @@ -8,19 +8,17 @@ Remove unused variable suites_in_image Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> - --- test/hftest/common.c | 2 -- - test/vmapi/arch/aarch64/gicv3/gicv3.c | 2 +- test/vmapi/arch/aarch64/gicv3/inc/gicv3.h | 2 +- test/vmapi/arch/aarch64/gicv3/timer_secondary.c | 2 +- test/vmapi/el0_partitions/services/interruptible.c | 2 +- test/vmapi/el0_partitions/services/interruptible_echo.c | 2 +- test/vmapi/primary_with_secondaries/services/interruptible.c | 2 +- - 7 files changed, 6 insertions(+), 8 deletions(-) + 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/test/hftest/common.c b/test/hftest/common.c -index 344ff24..175230a 100644 +index 344ff2452c36..175230a7cfa7 100644 --- a/test/hftest/common.c +++ b/test/hftest/common.c @@ -67,7 +67,6 @@ void hftest_json(void) @@ -39,31 +37,18 @@ index 344ff24..175230a 100644 suite = test->suite; tests_in_suite = 0; HFTEST_LOG(" {"); -diff --git a/test/vmapi/arch/aarch64/gicv3/gicv3.c b/test/vmapi/arch/aarch64/gicv3/gicv3.c -index 682bc4e..82582f0 100644 ---- a/test/vmapi/arch/aarch64/gicv3/gicv3.c -+++ b/test/vmapi/arch/aarch64/gicv3/gicv3.c -@@ -42,7 +42,7 @@ static void irq(void) - dlog("primary IRQ %d ended\n", interrupt_id); - } - --void system_setup() -+void system_setup(void) - { - const uint32_t mode = MM_MODE_R | MM_MODE_W | MM_MODE_D; - hftest_mm_identity_map((void *)GICD_BASE, PAGE_SIZE, mode); diff --git a/test/vmapi/arch/aarch64/gicv3/inc/gicv3.h b/test/vmapi/arch/aarch64/gicv3/inc/gicv3.h -index 5faf3a8..f681e58 100644 +index 28bf29d412f4..dede047a381a 100644 --- a/test/vmapi/arch/aarch64/gicv3/inc/gicv3.h +++ b/test/vmapi/arch/aarch64/gicv3/inc/gicv3.h @@ -30,4 +30,4 @@ extern void *recv_buffer; extern volatile uint32_t last_interrupt_id; --void system_setup(); -+void system_setup(void); +-void gicv3_system_setup(); ++void gicv3_system_setup(void); diff --git a/test/vmapi/arch/aarch64/gicv3/timer_secondary.c b/test/vmapi/arch/aarch64/gicv3/timer_secondary.c -index ebc4db3..8260e10 100644 +index 0ac07f4411df..6264a5864721 100644 --- a/test/vmapi/arch/aarch64/gicv3/timer_secondary.c +++ b/test/vmapi/arch/aarch64/gicv3/timer_secondary.c @@ -55,7 +55,7 @@ TEAR_DOWN(timer_secondary_ffa) @@ -76,10 +61,10 @@ index ebc4db3..8260e10 100644 const char message[] = "loop 0099999"; const char expected_response[] = "Got IRQ 03."; diff --git a/test/vmapi/el0_partitions/services/interruptible.c b/test/vmapi/el0_partitions/services/interruptible.c -index 0d00b16..3c3250d 100644 +index 85c97dc7a857..80fc61b2e5a9 100644 --- a/test/vmapi/el0_partitions/services/interruptible.c +++ b/test/vmapi/el0_partitions/services/interruptible.c -@@ -43,7 +43,7 @@ static void irq(void) +@@ -44,7 +44,7 @@ static void irq(void) * Try to receive a message from the mailbox, blocking if necessary, and * retrying if interrupted. */ @@ -89,10 +74,10 @@ index 0d00b16..3c3250d 100644 struct ffa_value received; diff --git a/test/vmapi/el0_partitions/services/interruptible_echo.c b/test/vmapi/el0_partitions/services/interruptible_echo.c -index b618cf2..636ebc9 100644 +index 958d75090cce..55511d6a2bce 100644 --- a/test/vmapi/el0_partitions/services/interruptible_echo.c +++ b/test/vmapi/el0_partitions/services/interruptible_echo.c -@@ -32,7 +32,7 @@ static void irq(void) +@@ -33,7 +33,7 @@ static void irq(void) * Try to receive a message from the mailbox, blocking if necessary, and * retrying if interrupted. */ @@ -102,10 +87,10 @@ index b618cf2..636ebc9 100644 struct ffa_value received; diff --git a/test/vmapi/primary_with_secondaries/services/interruptible.c b/test/vmapi/primary_with_secondaries/services/interruptible.c -index cc1c1f9..c94093b 100644 +index 594f28ac8bc8..3888bf8b0b6e 100644 --- a/test/vmapi/primary_with_secondaries/services/interruptible.c +++ b/test/vmapi/primary_with_secondaries/services/interruptible.c -@@ -40,7 +40,7 @@ static void irq(void) +@@ -41,7 +41,7 @@ static void irq(void) * Try to receive a message from the mailbox, blocking if necessary, and * retrying if interrupted. */ diff --git a/meta-arm/meta-arm/recipes-bsp/hafnium/hafnium_2.7.bb b/meta-arm/meta-arm/recipes-bsp/hafnium/hafnium_2.8.bb index 564c203f1f..5302725638 100644 --- a/meta-arm/meta-arm/recipes-bsp/hafnium/hafnium_2.7.bb +++ b/meta-arm/meta-arm/recipes-bsp/hafnium/hafnium_2.8.bb @@ -14,13 +14,12 @@ CLANGNATIVE:runtime-llvm = "clang-native" inherit deploy python3native pkgconfig ${CLANGNATIVE} SRC_URI = "gitsm://git.trustedfirmware.org/hafnium/hafnium.git;protocol=https;branch=master \ - file://0001-define-_Noreturn-if-needed.patch \ - file://0002-arm-hafnium-fix-kernel-tool-linking.patch \ - file://0003-Fix-build-with-clang-15.patch \ + file://0001-arm-hafnium-fix-kernel-tool-linking.patch \ + file://0002-Fix-build-with-clang-15.patch \ file://0001-Use-pkg-config-native-to-find-the-libssl-headers.patch;patchdir=third_party/linux \ file://0001-work-around-visibility-issue.patch;patchdir=third_party/dtc \ " -SRCREV = "79e9522d26fc2a88a44af149034acc27312b73a1" +SRCREV = "b7d27acb9c63a52f8bd8a37d1eee335d4ccfbe93" S = "${WORKDIR}/git" B = "${WORKDIR}/build" diff --git a/meta-arm/meta-arm/recipes-bsp/scp-firmware/files/optee-private-includes.patch b/meta-arm/meta-arm/recipes-bsp/scp-firmware/files/0001-OPTEE-Private-Includes.patch index c2d860228e..f3063a957e 100644 --- a/meta-arm/meta-arm/recipes-bsp/scp-firmware/files/optee-private-includes.patch +++ b/meta-arm/meta-arm/recipes-bsp/scp-firmware/files/0001-OPTEE-Private-Includes.patch @@ -1,3 +1,8 @@ +From b298400a5783453f64d8bebbd92db2c84c4a49fd Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Mon, 10 Jul 2023 14:09:16 +0100 +Subject: [PATCH] OPTEE Private Includes + Change the optee module includes to be private instead of public, so they don't get used in every build, which can result in compile failures as /core/include/ doesn't exit. @@ -5,9 +10,13 @@ For some reason this behaviour isn't deterministic, a ticket has been filed with Upstream-Status: Pending Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + module/optee/console/CMakeLists.txt | 2 +- + module/optee/mbx/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/optee/console/CMakeLists.txt b/module/optee/console/CMakeLists.txt -index aebb7cc79..942aa98c8 100644 +index aebb7cc79766..942aa98c85ff 100644 --- a/module/optee/console/CMakeLists.txt +++ b/module/optee/console/CMakeLists.txt @@ -14,7 +14,7 @@ target_include_directories(${SCP_MODULE_TARGET} @@ -20,7 +29,7 @@ index aebb7cc79..942aa98c8 100644 "${SCP_OPTEE_DIR}/lib/libutils/ext/include/" "${SCP_OPTEE_DIR}/lib/libutee/include/") diff --git a/module/optee/mbx/CMakeLists.txt b/module/optee/mbx/CMakeLists.txt -index 305fa42b7..783a7970c 100644 +index 305fa42b7370..783a7970c2d5 100644 --- a/module/optee/mbx/CMakeLists.txt +++ b/module/optee/mbx/CMakeLists.txt @@ -15,7 +15,7 @@ target_include_directories(${SCP_MODULE_TARGET} diff --git a/meta-arm/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.12.0.bb b/meta-arm/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.12.0.bb index 58482cd37b..9a16de7b92 100644 --- a/meta-arm/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.12.0.bb +++ b/meta-arm/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.12.0.bb @@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://license.md;beginline=5;md5=9db9e3d2fb8d9300a6c3d15101 SRC_URI_SCP_FIRMWARE ?= "gitsm://github.com/ARM-software/SCP-firmware.git;protocol=https" SRC_URI = "${SRC_URI_SCP_FIRMWARE};branch=${SRCBRANCH} \ - file://optee-private-includes.patch" + file://0001-OPTEE-Private-Includes.patch \ + " SRCBRANCH = "master" SRCREV = "0c7236b1851d90124210a0414fd982dc55322c7c" diff --git a/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/files/add-spmc_manifest-for-qemu.patch b/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-Add-spmc_manifest-for-qemu.patch index 50a57d6179..8ddf353b18 100644 --- a/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/files/add-spmc_manifest-for-qemu.patch +++ b/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-Add-spmc_manifest-for-qemu.patch @@ -1,7 +1,7 @@ -From e1cbb35ad4655fe13ccb89247c81e850f6392c92 Mon Sep 17 00:00:00 2001 +From 56874ab381b0f0beade2d200147245e157b4aff6 Mon Sep 17 00:00:00 2001 From: Gyorgy Szing <Gyorgy.Szing@arm.com> Date: Mon, 13 Mar 2023 21:15:59 +0100 -Subject: Add spmc_manifest for qemu +Subject: [PATCH] Add spmc_manifest for qemu This version only supports embedded packaging. @@ -18,7 +18,7 @@ Signed-off-by: Gyorgy Szing <Gyorgy.Szing@arm.com> diff --git a/plat/qemu/fdts/optee_spmc_manifest.dts b/plat/qemu/fdts/optee_spmc_manifest.dts new file mode 100644 -index 000000000..ae2ae3d95 +index 000000000000..ae2ae3d951de --- /dev/null +++ b/plat/qemu/fdts/optee_spmc_manifest.dts @@ -0,0 +1,40 @@ @@ -62,6 +62,3 @@ index 000000000..ae2ae3d95 + #error "FIP SP load addresses configuration is missing. +#endif +}; --- -2.39.1.windows.1 - diff --git a/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/files/feat-qemu-update-abi-between-spmd-and-spmc.patch b/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/files/feat-qemu-update-abi-between-spmd-and-spmc.patch deleted file mode 100644 index 7c851fd041..0000000000 --- a/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/files/feat-qemu-update-abi-between-spmd-and-spmc.patch +++ /dev/null @@ -1,263 +0,0 @@ -From d215b0c08e51192baab96d75beaeacf3abf8724e Mon Sep 17 00:00:00 2001 -From: Jens Wiklander <jens.wiklander@linaro.org> -Date: Fri, 18 Nov 2022 15:40:04 +0100 -Subject: feat(qemu): update abi between spmd and spmc - -Updates the ABI between SPMD and the SPMC at S-EL1 so that the hard -coded SPMC manifest can be replaced by a proper manifest via TOS FW -Config. TOS FW Config is provided via QEMU_TOS_FW_CONFIG_DTS as a DTS -file when building. The DTS is turned into a DTB which is added to the -FIP. - -Note that this is an incompatible change and requires corresponding -change in OP-TEE ("core: sel1 spmc: boot abi update"). - -Upstream-Status: Accepted - -Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org> -Change-Id: Ibabe78ef50a24f775492854ce5ac54e4d471e369 ---- - plat/qemu/common/qemu_bl2_mem_params_desc.c | 18 +++++++++++- - plat/qemu/common/qemu_bl2_setup.c | 32 +++++++++++++-------- - plat/qemu/common/qemu_io_storage.c | 16 ++++++++++- - plat/qemu/common/qemu_spmd_manifest.c | 31 -------------------- - plat/qemu/qemu/include/platform_def.h | 3 ++ - plat/qemu/qemu/platform.mk | 12 +++++++- - 6 files changed, 66 insertions(+), 46 deletions(-) - delete mode 100644 plat/qemu/common/qemu_spmd_manifest.c - -diff --git a/plat/qemu/common/qemu_bl2_mem_params_desc.c b/plat/qemu/common/qemu_bl2_mem_params_desc.c -index 5af3a2264..8d8047c92 100644 ---- a/plat/qemu/common/qemu_bl2_mem_params_desc.c -+++ b/plat/qemu/common/qemu_bl2_mem_params_desc.c -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2017-2021, ARM Limited and Contributors. All rights reserved. -+ * Copyright (c) 2017-2022, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -@@ -122,6 +122,22 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = { - #endif - .next_handoff_image_id = INVALID_IMAGE_ID, - }, -+ -+#if defined(SPD_spmd) -+ /* Fill TOS_FW_CONFIG related information */ -+ { -+ .image_id = TOS_FW_CONFIG_ID, -+ SET_STATIC_PARAM_HEAD(ep_info, PARAM_IMAGE_BINARY, -+ VERSION_2, entry_point_info_t, SECURE | NON_EXECUTABLE), -+ SET_STATIC_PARAM_HEAD(image_info, PARAM_IMAGE_BINARY, -+ VERSION_2, image_info_t, 0), -+ .image_info.image_base = TOS_FW_CONFIG_BASE, -+ .image_info.image_max_size = TOS_FW_CONFIG_LIMIT - -+ TOS_FW_CONFIG_BASE, -+ .next_handoff_image_id = INVALID_IMAGE_ID, -+ }, -+#endif -+ - # endif /* QEMU_LOAD_BL32 */ - - /* Fill BL33 related information */ -diff --git a/plat/qemu/common/qemu_bl2_setup.c b/plat/qemu/common/qemu_bl2_setup.c -index 2c0da15b9..6afa3a44d 100644 ---- a/plat/qemu/common/qemu_bl2_setup.c -+++ b/plat/qemu/common/qemu_bl2_setup.c -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2015-2021, ARM Limited and Contributors. All rights reserved. -+ * Copyright (c) 2015-2022, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -@@ -149,8 +149,7 @@ static int qemu_bl2_handle_post_image_load(unsigned int image_id) - bl_mem_params_node_t *paged_mem_params = NULL; - #endif - #if defined(SPD_spmd) -- unsigned int mode_rw = MODE_RW_64; -- uint64_t pagable_part = 0; -+ bl_mem_params_node_t *bl32_mem_params = NULL; - #endif - - assert(bl_mem_params); -@@ -170,17 +169,18 @@ static int qemu_bl2_handle_post_image_load(unsigned int image_id) - if (err != 0) { - WARN("OPTEE header parse error.\n"); - } --#if defined(SPD_spmd) -- mode_rw = bl_mem_params->ep_info.args.arg0; -- pagable_part = bl_mem_params->ep_info.args.arg1; --#endif - #endif - --#if defined(SPD_spmd) -- bl_mem_params->ep_info.args.arg0 = ARM_PRELOADED_DTB_BASE; -- bl_mem_params->ep_info.args.arg1 = pagable_part; -- bl_mem_params->ep_info.args.arg2 = mode_rw; -- bl_mem_params->ep_info.args.arg3 = 0; -+#if defined(SPMC_OPTEE) -+ /* -+ * Explicit zeroes to unused registers since they may have -+ * been populated by parse_optee_header() above. -+ * -+ * OP-TEE expects system DTB in x2 and TOS_FW_CONFIG in x0, -+ * the latter is filled in below for TOS_FW_CONFIG_ID and -+ * applies to any other SPMC too. -+ */ -+ bl_mem_params->ep_info.args.arg2 = ARM_PRELOADED_DTB_BASE; - #elif defined(SPD_opteed) - /* - * OP-TEE expect to receive DTB address in x2. -@@ -224,6 +224,14 @@ static int qemu_bl2_handle_post_image_load(unsigned int image_id) - - bl_mem_params->ep_info.spsr = qemu_get_spsr_for_bl33_entry(); - break; -+#if defined(SPD_spmd) -+ case TOS_FW_CONFIG_ID: -+ /* An SPMC expects TOS_FW_CONFIG in x0/r0 */ -+ bl32_mem_params = get_bl_mem_params_node(BL32_IMAGE_ID); -+ bl32_mem_params->ep_info.args.arg0 = -+ bl_mem_params->image_info.image_base; -+ break; -+#endif - default: - /* Do nothing in default case */ - break; -diff --git a/plat/qemu/common/qemu_io_storage.c b/plat/qemu/common/qemu_io_storage.c -index 1107e443f..e2d4932c0 100644 ---- a/plat/qemu/common/qemu_io_storage.c -+++ b/plat/qemu/common/qemu_io_storage.c -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved. -+ * Copyright (c) 2015-2022, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -@@ -24,6 +24,7 @@ - #define BL2_IMAGE_NAME "bl2.bin" - #define BL31_IMAGE_NAME "bl31.bin" - #define BL32_IMAGE_NAME "bl32.bin" -+#define TOS_FW_CONFIG_NAME "tos_fw_config.dtb" - #define BL32_EXTRA1_IMAGE_NAME "bl32_extra1.bin" - #define BL32_EXTRA2_IMAGE_NAME "bl32_extra2.bin" - #define BL33_IMAGE_NAME "bl33.bin" -@@ -78,6 +79,10 @@ static const io_uuid_spec_t bl32_extra2_uuid_spec = { - .uuid = UUID_SECURE_PAYLOAD_BL32_EXTRA2, - }; - -+static const io_uuid_spec_t tos_fw_config_uuid_spec = { -+ .uuid = UUID_TOS_FW_CONFIG, -+}; -+ - static const io_uuid_spec_t bl33_uuid_spec = { - .uuid = UUID_NON_TRUSTED_FIRMWARE_BL33, - }; -@@ -137,6 +142,10 @@ static const io_file_spec_t sh_file_spec[] = { - .path = BL32_EXTRA2_IMAGE_NAME, - .mode = FOPEN_MODE_RB - }, -+ [TOS_FW_CONFIG_ID] = { -+ .path = TOS_FW_CONFIG_NAME, -+ .mode = FOPEN_MODE_RB -+ }, - [BL33_IMAGE_ID] = { - .path = BL33_IMAGE_NAME, - .mode = FOPEN_MODE_RB -@@ -252,6 +261,11 @@ static const struct plat_io_policy policies[] = { - open_fip - }, - #endif -+ [TOS_FW_CONFIG_ID] = { -+ &fip_dev_handle, -+ (uintptr_t)&tos_fw_config_uuid_spec, -+ open_fip -+ }, - [BL33_IMAGE_ID] = { - &fip_dev_handle, - (uintptr_t)&bl33_uuid_spec, -diff --git a/plat/qemu/common/qemu_spmd_manifest.c b/plat/qemu/common/qemu_spmd_manifest.c -deleted file mode 100644 -index fd46e2675..000000000 ---- a/plat/qemu/common/qemu_spmd_manifest.c -+++ /dev/null -@@ -1,31 +0,0 @@ --/* -- * Copyright (c) 2021, ARM Limited and Contributors. All rights reserved. -- * -- * SPDX-License-Identifier: BSD-3-Clause -- */ -- --#include <assert.h> -- --#include <services/spm_core_manifest.h> -- --#include <plat/common/platform.h> --#include <platform_def.h> -- --int plat_spm_core_manifest_load(spmc_manifest_attribute_t *manifest, -- const void *pm_addr) --{ -- entry_point_info_t *ep_info = bl31_plat_get_next_image_ep_info(SECURE); -- -- assert(ep_info != NULL); -- assert(manifest != NULL); -- -- manifest->major_version = 1; -- manifest->minor_version = 0; -- manifest->exec_state = ep_info->args.arg2; -- manifest->load_address = BL32_BASE; -- manifest->entrypoint = BL32_BASE; -- manifest->binary_size = BL32_LIMIT - BL32_BASE; -- manifest->spmc_id = 0x8000; -- -- return 0; --} -diff --git a/plat/qemu/qemu/include/platform_def.h b/plat/qemu/qemu/include/platform_def.h -index c9ed6409f..5c3239cb8 100644 ---- a/plat/qemu/qemu/include/platform_def.h -+++ b/plat/qemu/qemu/include/platform_def.h -@@ -118,6 +118,9 @@ - #define BL_RAM_BASE (SHARED_RAM_BASE + SHARED_RAM_SIZE) - #define BL_RAM_SIZE (SEC_SRAM_SIZE - SHARED_RAM_SIZE) - -+#define TOS_FW_CONFIG_BASE BL_RAM_BASE -+#define TOS_FW_CONFIG_LIMIT (TOS_FW_CONFIG_BASE + PAGE_SIZE) -+ - /* - * BL1 specific defines. - * -diff --git a/plat/qemu/qemu/platform.mk b/plat/qemu/qemu/platform.mk -index 6becc32fa..02493025a 100644 ---- a/plat/qemu/qemu/platform.mk -+++ b/plat/qemu/qemu/platform.mk -@@ -212,7 +212,10 @@ BL31_SOURCES += lib/cpus/aarch64/aem_generic.S \ - ${QEMU_GIC_SOURCES} - - ifeq (${SPD},spmd) --BL31_SOURCES += plat/qemu/common/qemu_spmd_manifest.c -+BL31_SOURCES += plat/common/plat_spmd_manifest.c \ -+ common/uuid.c \ -+ ${LIBFDT_SRCS} \ -+ ${FDT_WRAPPERS_SOURCES} - endif - endif - -@@ -233,6 +236,13 @@ $(eval $(call TOOL_ADD_IMG,bl32_extra2,--tos-fw-extra2)) - endif - endif - -+ifneq ($(QEMU_TOS_FW_CONFIG_DTS),) -+FDT_SOURCES += ${QEMU_TOS_FW_CONFIG_DTS} -+QEMU_TOS_FW_CONFIG := ${BUILD_PLAT}/fdts/$(notdir $(basename ${QEMU_TOS_FW_CONFIG_DTS})).dtb -+# Add the TOS_FW_CONFIG to FIP -+$(eval $(call TOOL_ADD_PAYLOAD,${QEMU_TOS_FW_CONFIG},--tos-fw-config,${QEMU_TOS_FW_CONFIG})) -+endif -+ - SEPARATE_CODE_AND_RODATA := 1 - ENABLE_STACK_PROTECTOR := 0 - ifneq ($(ENABLE_STACK_PROTECTOR), 0) --- -2.39.1.windows.1 - diff --git a/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/files/rwx-segments.patch b/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/files/rwx-segments.patch deleted file mode 100644 index a4518ec6b0..0000000000 --- a/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/files/rwx-segments.patch +++ /dev/null @@ -1,38 +0,0 @@ -Binutils 2.39 now warns when a segment has RXW permissions[1]: - -aarch64-none-elf-ld.bfd: warning: bl31.elf has a LOAD segment with RWX -permissions - -However, TF-A passes --fatal-warnings to LD, so this is a build failure. - -There is a ticket filed upstream[2], so until that is resolved just -remove --fatal-warnings. - -[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 -[2] https://developer.trustedfirmware.org/T996 - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton <ross.burton@arm.com> - -diff --git a/Makefile b/Makefile -index 3941f8698..13bbac348 100644 ---- a/Makefile -+++ b/Makefile -@@ -418,7 +418,7 @@ TF_LDFLAGS += $(TF_LDFLAGS_$(ARCH)) - # LD = gcc (used when GCC LTO is enabled) - else ifneq ($(findstring gcc,$(notdir $(LD))),) - # Pass ld options with Wl or Xlinker switches --TF_LDFLAGS += -Wl,--fatal-warnings -O1 -+TF_LDFLAGS += -O1 - TF_LDFLAGS += -Wl,--gc-sections - ifeq ($(ENABLE_LTO),1) - ifeq (${ARCH},aarch64) -@@ -435,7 +435,7 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH))) - - # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other - else --TF_LDFLAGS += --fatal-warnings -O1 -+TF_LDFLAGS += -O1 - TF_LDFLAGS += --gc-sections - # ld.lld doesn't recognize the errata flags, - # therefore don't add those in that case diff --git a/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/files/tf-a-tests-no-warn-rwx-segments.patch b/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/files/tf-a-tests-no-warn-rwx-segments.patch deleted file mode 100644 index 5d02e35317..0000000000 --- a/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/files/tf-a-tests-no-warn-rwx-segments.patch +++ /dev/null @@ -1,26 +0,0 @@ -Binutils 2.39 now warns when a segment has RXW permissions[1]: - -aarch64-poky-linux-musl-ld: tftf.elf has a LOAD segment with RWX permissions - -There is a ticket filed upstream[2], so until that is resolved just -disable the warning - -[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 -[2] https://developer.trustedfirmware.org/T996 - -Upstream-Status: Inappropriate -Signed-off-by: Anton Antonov <anrton.antonov@arm.com> - -diff --git a/Makefile b/Makefile -index 6d0774e1..be3f84ce 100644 ---- a/Makefile -+++ b/Makefile -@@ -238,7 +238,7 @@ TFTF_SOURCES := ${FRAMEWORK_SOURCES} ${TESTS_SOURCES} ${PLAT_SOURCES} ${LIBC_SR - TFTF_INCLUDES += ${PLAT_INCLUDES} - TFTF_CFLAGS += ${COMMON_CFLAGS} - TFTF_ASFLAGS += ${COMMON_ASFLAGS} --TFTF_LDFLAGS += ${COMMON_LDFLAGS} -+TFTF_LDFLAGS += ${COMMON_LDFLAGS} --no-warn-rwx-segments - TFTF_EXTRA_OBJS := - - ifneq (${BP_OPTION},none) diff --git a/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.8.6.bb b/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.9.0.bb index 02f3387396..58ee1dcac0 100644 --- a/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.8.6.bb +++ b/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.9.0.bb @@ -9,9 +9,9 @@ SRC_URI_TRUSTED_FIRMWARE_A ?= "git://git.trustedfirmware.org/TF-A/trusted-firmwa SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};destsuffix=fiptool-${PV};branch=${SRCBRANCH}" LIC_FILES_CHKSUM = "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" -# Use fiptool from TF-A v2.8.6 -SRCREV = "ff0bd5f9bb2ba2f31fb9cec96df917747af9e92d" -SRCBRANCH = "lts-v2.8" +# Use fiptool from TF-A v2.9.0 +SRCREV = "d3e71ead6ea5bc3555ac90a446efec84ef6c6122" +SRCBRANCH = "master" DEPENDS += "openssl-native" diff --git a/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.8.0.bb b/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.9.0.bb index ed3b349950..72a3e7911b 100644 --- a/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.8.0.bb +++ b/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.9.0.bb @@ -9,9 +9,9 @@ COMPATIBLE_MACHINE ?= "invalid" SRC_URI_TRUSTED_FIRMWARE_A_TESTS ?= "git://git.trustedfirmware.org/TF-A/tf-a-tests.git;protocol=https" SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};branch=${SRCBRANCH} \ - file://tf-a-tests-no-warn-rwx-segments.patch" -SRCBRANCH = "lts-v2.8" -SRCREV = "85442d2943440718c2c2c9c5c690202b4b4f5725" + " +SRCBRANCH = "master" +SRCREV = "df6783437cdc98dabf4f49568312b86460f72efa" DEPENDS += "optee-os" diff --git a/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.6.bb b/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.9.0.bb index 140faf5335..8f78b5e70f 100644 --- a/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.6.bb +++ b/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.9.0.bb @@ -1,21 +1,17 @@ require trusted-firmware-a.inc -# TF-A v2.8.6 -SRCREV_tfa = "ff0bd5f9bb2ba2f31fb9cec96df917747af9e92d" -SRCBRANCH = "lts-v2.8" - -SRC_URI += "file://rwx-segments.patch" +# TF-A v2.9.0 +SRCREV_tfa = "d3e71ead6ea5bc3555ac90a446efec84ef6c6122" # Enable passing TOS_FW_CONFIG from FIP package to Trusted OS. SRC_URI:append:qemuarm64-secureboot = " \ - file://add-spmc_manifest-for-qemu.patch \ - file://feat-qemu-update-abi-between-spmd-and-spmc.patch \ + file://0001-Add-spmc_manifest-for-qemu.patch \ " LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" -# mbed TLS v2.28.2 +# mbed TLS v2.28.4 SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=mbedtls-2.28" -SRCREV_mbedtls = "89f040a5c938985c5f30728baed21e49d0846a53" +SRCREV_mbedtls = "aeb97a18913a86f051afab11b2c92c6be0c2eb83" LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" diff --git a/meta-arm/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202302.bb b/meta-arm/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202305.bb index b331c361e3..3a48ea5e2f 100644 --- a/meta-arm/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202302.bb +++ b/meta-arm/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202305.bb @@ -10,7 +10,7 @@ LICENSE = "BSD-2-Clause-Patent" SRC_URI = "git://github.com/tianocore/edk2.git;branch=master;protocol=https" LIC_FILES_CHKSUM = "file://License.txt;md5=2b415520383f7964e96700ae12b4570a" -SRCREV = "f80f052277c88a67c55e107b550f504eeea947d3" +SRCREV = "ba91d0292e593df8528b66f99c1b0b14fadc8e16" S = "${WORKDIR}/git" diff --git a/meta-arm/meta-arm/recipes-bsp/uefi/edk2-firmware.inc b/meta-arm/meta-arm/recipes-bsp/uefi/edk2-firmware.inc index 20eea36bbd..274852e26d 100644 --- a/meta-arm/meta-arm/recipes-bsp/uefi/edk2-firmware.inc +++ b/meta-arm/meta-arm/recipes-bsp/uefi/edk2-firmware.inc @@ -76,6 +76,17 @@ EDK_COMPILER:toolchain-clang = "CLANG38" export CLANG38_AARCH64_PREFIX = "${TARGET_PREFIX}" export CLANG38_ARM_PREFIX = "${TARGET_PREFIX}" +# These variables were changed in edk2 commit +# 206168e83f0901cbc1815ef5df4ac6598ad9721b, which was part of edk2-202305 +export CC = "${BUILD_CC}" +export CXX = "${BUILD_CXX}" +export AS = "${BUILD_AS}" +export AR = "${BUILD_AR}" +export LD = "${BUILD_LD}" +export CFLAGS = "${BUILD_CFLAGS}" +export CPPFLAGS = "${BUILD_CPPFLAGS}" +export LDFLAGS = "${BUILD_LFLAGS}" + #FIXME - arm32 doesn't work with clang due to a linker issue TOOLCHAIN:arm = "gcc" diff --git a/meta-arm/meta-arm/recipes-bsp/uefi/edk2-firmware_2023%.bbappend b/meta-arm/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend index 19b335417c..7a39bb0319 100644 --- a/meta-arm/meta-arm/recipes-bsp/uefi/edk2-firmware_2023%.bbappend +++ b/meta-arm/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend @@ -7,10 +7,6 @@ COMPATIBLE_MACHINE:qemuarm64 = "qemuarm64" EDK2_PLATFORM:qemuarm64 = "ArmVirtQemu-AARCH64" EDK2_PLATFORM_DSC:qemuarm64 = "ArmVirtPkg/ArmVirtQemu.dsc" EDK2_BIN_NAME:qemuarm64 = "QEMU_EFI.fd" -SRC_URI:append:qemuarm64 = " \ - file://0001-Revert-ArmVirtPkg-QemuVirtMemInfoLib-use-HOB-not-PCD.patch \ - file://0002-Revert-ArmVirtPkg-ArmVirtQemu-omit-PCD-PEIM-unless-T.patch \ - " COMPATIBLE_MACHINE:qemuarm = "qemuarm" EDK2_PLATFORM:qemuarm = "ArmVirtQemu-ARM" diff --git a/meta-arm/meta-arm/recipes-bsp/uefi/edk2-firmware_202302.bb b/meta-arm/meta-arm/recipes-bsp/uefi/edk2-firmware_202302.bb deleted file mode 100644 index 02738d318b..0000000000 --- a/meta-arm/meta-arm/recipes-bsp/uefi/edk2-firmware_202302.bb +++ /dev/null @@ -1,6 +0,0 @@ -SRCREV_edk2 ?= "f80f052277c88a67c55e107b550f504eeea947d3" -SRCREV_edk2-platforms ?= "65e001a7f2abedf7799cfb36b057326c1540bd47" - -SRC_URI:append = " file://default.patch;patchdir=edk2-platforms" - -require edk2-firmware.inc diff --git a/meta-arm/meta-arm/recipes-bsp/uefi/edk2-firmware_202305.bb b/meta-arm/meta-arm/recipes-bsp/uefi/edk2-firmware_202305.bb new file mode 100644 index 0000000000..fe153f47ce --- /dev/null +++ b/meta-arm/meta-arm/recipes-bsp/uefi/edk2-firmware_202305.bb @@ -0,0 +1,7 @@ +SRCREV_edk2 ?= "ba91d0292e593df8528b66f99c1b0b14fadc8e16" +SRCREV_edk2-platforms ?= "be2af02a3fb202756ed9855173e0d0ed878ab6be" + +# FIXME - clang is having issues with antlr +TOOLCHAIN:aarch64 = "gcc" + +require edk2-firmware.inc diff --git a/meta-arm/meta-arm/recipes-bsp/uefi/files/0001-Revert-ArmVirtPkg-QemuVirtMemInfoLib-use-HOB-not-PCD.patch b/meta-arm/meta-arm/recipes-bsp/uefi/files/0001-Revert-ArmVirtPkg-QemuVirtMemInfoLib-use-HOB-not-PCD.patch deleted file mode 100644 index 824c6ccb87..0000000000 --- a/meta-arm/meta-arm/recipes-bsp/uefi/files/0001-Revert-ArmVirtPkg-QemuVirtMemInfoLib-use-HOB-not-PCD.patch +++ /dev/null @@ -1,290 +0,0 @@ -From 44b69c8d7c8ed665b4f8d8a9953ea23a731d221f Mon Sep 17 00:00:00 2001 -From: Your Name <you@example.com> -Date: Fri, 10 Mar 2023 18:46:49 +0000 -Subject: [PATCH] Revert "ArmVirtPkg/QemuVirtMemInfoLib: use HOB not PCD to - record the memory size" - -This reverts commit 7136d5491e225c57f1d73e4a1b7ac27ed656ff72. - -Upstream-Status: Inappropriate [other] -Signed-off-by: Jon Mason <jon.mason@arm.com> - ---- - ArmVirtPkg/ArmVirtPkg.dec | 1 - - ArmVirtPkg/ArmVirtQemu.dsc | 6 ++-- - .../ArmVirtMemoryInitPeiLib.c | 14 ++------ - .../ArmVirtMemoryInitPeiLib.inf | 1 - - .../QemuVirtMemInfoLib/QemuVirtMemInfoLib.c | 35 ++----------------- - .../QemuVirtMemInfoLib/QemuVirtMemInfoLib.inf | 5 +-- - .../QemuVirtMemInfoPeiLib.inf | 8 ++--- - .../QemuVirtMemInfoPeiLibConstructor.c | 30 +++++++--------- - 8 files changed, 25 insertions(+), 75 deletions(-) - -diff --git a/ArmVirtPkg/ArmVirtPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec -index 4645c91a83..d2d325d71e 100644 ---- a/ArmVirtPkg/ArmVirtPkg.dec -+++ b/ArmVirtPkg/ArmVirtPkg.dec -@@ -32,7 +32,6 @@ - gArmVirtTokenSpaceGuid = { 0x0B6F5CA7, 0x4F53, 0x445A, { 0xB7, 0x6E, 0x2E, 0x36, 0x5B, 0x80, 0x63, 0x66 } }
- gEarlyPL011BaseAddressGuid = { 0xB199DEA9, 0xFD5C, 0x4A84, { 0x80, 0x82, 0x2F, 0x41, 0x70, 0x78, 0x03, 0x05 } }
- gEarly16550UartBaseAddressGuid = { 0xea67ca3e, 0x1f54, 0x436b, { 0x97, 0x88, 0xd4, 0xeb, 0x29, 0xc3, 0x42, 0x67 } }
-- gArmVirtSystemMemorySizeGuid = { 0x504eccb9, 0x1bf0, 0x4420, { 0x86, 0x5d, 0xdc, 0x66, 0x06, 0xd4, 0x13, 0xbf } }
-
- [PcdsFeatureFlag]
- #
-diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 72a0cacab4..2e786dad12 100644 ---- a/ArmVirtPkg/ArmVirtQemu.dsc -+++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -226,9 +226,6 @@ - # Shadowing PEI modules is absolutely pointless when the NOR flash is emulated
- gEfiMdeModulePkgTokenSpaceGuid.PcdShadowPeimOnBoot|FALSE
-
-- # System Memory Size -- 128 MB initially, actual size will be fetched from DT
-- gArmTokenSpaceGuid.PcdSystemMemorySize|0x8000000
--
- [PcdsFixedAtBuild.AARCH64]
- # Clearing BIT0 in this PCD prevents installing a 32-bit SMBIOS entry point,
- # if the entry point version is >= 3.0. AARCH64 OSes cannot assume the
-@@ -245,6 +242,9 @@ - # enumeration to complete before installing ACPI tables.
- gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|TRUE
-
-+ # System Memory Size -- 1 MB initially, actual size will be fetched from DT
-+ gArmTokenSpaceGuid.PcdSystemMemorySize|0x00100000
-+
- gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum|0x0
- gArmTokenSpaceGuid.PcdArmArchTimerIntrNum|0x0
- gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum|0x0
-diff --git a/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c b/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c -index 72e5c65af7..98d90ad420 100644 ---- a/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c -+++ b/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c -@@ -52,19 +52,10 @@ MemoryPeim ( - {
- EFI_RESOURCE_ATTRIBUTE_TYPE ResourceAttributes;
- UINT64 SystemMemoryTop;
-- UINT64 SystemMemorySize;
-- VOID *Hob;
-
- // Ensure PcdSystemMemorySize has been set
- ASSERT (PcdGet64 (PcdSystemMemorySize) != 0);
-
-- SystemMemorySize = PcdGet64 (PcdSystemMemorySize);
--
-- Hob = GetFirstGuidHob (&gArmVirtSystemMemorySizeGuid);
-- if (Hob != NULL) {
-- SystemMemorySize = *(UINT64 *)GET_GUID_HOB_DATA (Hob);
-- }
--
- //
- // Now, the permanent memory has been installed, we can call AllocatePages()
- //
-@@ -75,7 +66,8 @@ MemoryPeim ( - EFI_RESOURCE_ATTRIBUTE_TESTED
- );
-
-- SystemMemoryTop = PcdGet64 (PcdSystemMemoryBase) + SystemMemorySize;
-+ SystemMemoryTop = PcdGet64 (PcdSystemMemoryBase) +
-+ PcdGet64 (PcdSystemMemorySize);
-
- if (SystemMemoryTop - 1 > MAX_ALLOC_ADDRESS) {
- BuildResourceDescriptorHob (
-@@ -95,7 +87,7 @@ MemoryPeim ( - EFI_RESOURCE_SYSTEM_MEMORY,
- ResourceAttributes,
- PcdGet64 (PcdSystemMemoryBase),
-- SystemMemorySize
-+ PcdGet64 (PcdSystemMemorySize)
- );
- }
-
-diff --git a/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.inf b/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.inf -index 48d9c66b22..21327f79f4 100644 ---- a/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.inf -+++ b/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.inf -@@ -34,7 +34,6 @@ - CacheMaintenanceLib
-
- [Guids]
-- gArmVirtSystemMemorySizeGuid
- gEfiMemoryTypeInformationGuid
-
- [FeaturePcd]
-diff --git a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c -index 9cf43f06c0..cf569bed99 100644 ---- a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c -+++ b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c -@@ -6,12 +6,10 @@ -
- **/
-
--#include <Uefi.h>
--#include <Pi/PiMultiPhase.h>
-+#include <Base.h>
- #include <Library/ArmLib.h>
- #include <Library/BaseMemoryLib.h>
- #include <Library/DebugLib.h>
--#include <Library/HobLib.h>
- #include <Library/MemoryAllocationLib.h>
-
- // Number of Virtual Memory Map Descriptors
-@@ -26,28 +24,6 @@ - #define MACH_VIRT_PERIPH_BASE 0x08000000
- #define MACH_VIRT_PERIPH_SIZE SIZE_128MB
-
--/**
-- Default library constructur that obtains the memory size from a PCD.
--
-- @return Always returns RETURN_SUCCESS
--
--**/
--RETURN_STATUS
--EFIAPI
--QemuVirtMemInfoLibConstructor (
-- VOID
-- )
--{
-- UINT64 Size;
-- VOID *Hob;
--
-- Size = PcdGet64 (PcdSystemMemorySize);
-- Hob = BuildGuidDataHob (&gArmVirtSystemMemorySizeGuid, &Size, sizeof Size);
-- ASSERT (Hob != NULL);
--
-- return RETURN_SUCCESS;
--}
--
- /**
- Return the Virtual Memory Map of your platform
-
-@@ -67,16 +43,9 @@ ArmVirtGetMemoryMap ( - )
- {
- ARM_MEMORY_REGION_DESCRIPTOR *VirtualMemoryTable;
-- VOID *MemorySizeHob;
-
- ASSERT (VirtualMemoryMap != NULL);
-
-- MemorySizeHob = GetFirstGuidHob (&gArmVirtSystemMemorySizeGuid);
-- ASSERT (MemorySizeHob != NULL);
-- if (MemorySizeHob == NULL) {
-- return;
-- }
--
- VirtualMemoryTable = AllocatePool (
- sizeof (ARM_MEMORY_REGION_DESCRIPTOR) *
- MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS
-@@ -90,7 +59,7 @@ ArmVirtGetMemoryMap ( - // System DRAM
- VirtualMemoryTable[0].PhysicalBase = PcdGet64 (PcdSystemMemoryBase);
- VirtualMemoryTable[0].VirtualBase = VirtualMemoryTable[0].PhysicalBase;
-- VirtualMemoryTable[0].Length = *(UINT64 *)GET_GUID_HOB_DATA (MemorySizeHob);
-+ VirtualMemoryTable[0].Length = PcdGet64 (PcdSystemMemorySize);
- VirtualMemoryTable[0].Attributes = ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK;
-
- DEBUG ((
-diff --git a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.inf b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.inf -index 6acad8bbd7..7150de6c10 100644 ---- a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.inf -+++ b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.inf -@@ -14,7 +14,6 @@ - MODULE_TYPE = BASE
- VERSION_STRING = 1.0
- LIBRARY_CLASS = ArmVirtMemInfoLib
-- CONSTRUCTOR = QemuVirtMemInfoLibConstructor
-
- [Sources]
- QemuVirtMemInfoLib.c
-@@ -31,9 +30,7 @@ - BaseMemoryLib
- DebugLib
- MemoryAllocationLib
--
--[Guids]
-- gArmVirtSystemMemorySizeGuid
-+ PcdLib
-
- [Pcd]
- gArmTokenSpaceGuid.PcdFvBaseAddress
-diff --git a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf -index f045e39a41..7ecf6dfbb7 100644 ---- a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf -+++ b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf -@@ -32,16 +32,16 @@ - BaseMemoryLib
- DebugLib
- FdtLib
-+ PcdLib
- MemoryAllocationLib
-
--[Guids]
-- gArmVirtSystemMemorySizeGuid
--
--[FixedPcd]
-+[Pcd]
- gArmTokenSpaceGuid.PcdFdBaseAddress
- gArmTokenSpaceGuid.PcdFvBaseAddress
- gArmTokenSpaceGuid.PcdSystemMemoryBase
- gArmTokenSpaceGuid.PcdSystemMemorySize
-+
-+[FixedPcd]
- gArmTokenSpaceGuid.PcdFdSize
- gArmTokenSpaceGuid.PcdFvSize
- gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress
-diff --git a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLibConstructor.c b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLibConstructor.c -index c47ab82966..33d3597d57 100644 ---- a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLibConstructor.c -+++ b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLibConstructor.c -@@ -6,10 +6,9 @@ -
- **/
-
--#include <Uefi.h>
--#include <Pi/PiMultiPhase.h>
-+#include <Base.h>
- #include <Library/DebugLib.h>
--#include <Library/HobLib.h>
-+#include <Library/PcdLib.h>
- #include <libfdt.h>
-
- RETURN_STATUS
-@@ -18,14 +17,14 @@ QemuVirtMemInfoPeiLibConstructor ( - VOID
- )
- {
-- VOID *DeviceTreeBase;
-- INT32 Node, Prev;
-- UINT64 NewBase, CurBase;
-- UINT64 NewSize, CurSize;
-- CONST CHAR8 *Type;
-- INT32 Len;
-- CONST UINT64 *RegProp;
-- VOID *Hob;
-+ VOID *DeviceTreeBase;
-+ INT32 Node, Prev;
-+ UINT64 NewBase, CurBase;
-+ UINT64 NewSize, CurSize;
-+ CONST CHAR8 *Type;
-+ INT32 Len;
-+ CONST UINT64 *RegProp;
-+ RETURN_STATUS PcdStatus;
-
- NewBase = 0;
- NewSize = 0;
-@@ -87,13 +86,8 @@ QemuVirtMemInfoPeiLibConstructor ( - // Make sure the start of DRAM matches our expectation
- //
- ASSERT (FixedPcdGet64 (PcdSystemMemoryBase) == NewBase);
--
-- Hob = BuildGuidDataHob (
-- &gArmVirtSystemMemorySizeGuid,
-- &NewSize,
-- sizeof NewSize
-- );
-- ASSERT (Hob != NULL);
-+ PcdStatus = PcdSet64S (PcdSystemMemorySize, NewSize);
-+ ASSERT_RETURN_ERROR (PcdStatus);
-
- //
- // We need to make sure that the machine we are running on has at least
diff --git a/meta-arm/meta-arm/recipes-bsp/uefi/files/0002-Revert-ArmVirtPkg-ArmVirtQemu-omit-PCD-PEIM-unless-T.patch b/meta-arm/meta-arm/recipes-bsp/uefi/files/0002-Revert-ArmVirtPkg-ArmVirtQemu-omit-PCD-PEIM-unless-T.patch deleted file mode 100644 index 64e85ab1bf..0000000000 --- a/meta-arm/meta-arm/recipes-bsp/uefi/files/0002-Revert-ArmVirtPkg-ArmVirtQemu-omit-PCD-PEIM-unless-T.patch +++ /dev/null @@ -1,89 +0,0 @@ -From caef501f2c05ba2170d0a449856900919021d6f6 Mon Sep 17 00:00:00 2001 -From: Your Name <you@example.com> -Date: Fri, 10 Mar 2023 18:47:09 +0000 -Subject: [PATCH] Revert "ArmVirtPkg/ArmVirtQemu: omit PCD PEIM unless TPM - support is enabled" - -This reverts commit b6efc505e4d6eb2055a39afd0a1ee67846a1e5f9. - -Upstream-Status: Inappropriate [other] -Signed-off-by: Jon Mason <jon.mason@arm.com> - ---- - ArmVirtPkg/ArmVirtQemu.dsc | 22 +++++----------------- - ArmVirtPkg/ArmVirtQemu.fdf | 2 +- - 2 files changed, 6 insertions(+), 18 deletions(-) - -diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 2e786dad12..0f8157a032 100644 ---- a/ArmVirtPkg/ArmVirtQemu.dsc -+++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -293,15 +293,10 @@ - #
- # TPM2 support
- #
--!if $(TPM2_ENABLE) == TRUE
- gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0
-+!if $(TPM2_ENABLE) == TRUE
- gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
- gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0
--!else
--[PcdsPatchableInModule]
-- # make this PCD patchable instead of dynamic when TPM support is not enabled
-- # this permits setting the PCD in unreachable code without pulling in dynamic PCD support
-- gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0
- !endif
-
- [PcdsDynamicHii]
-@@ -314,13 +309,6 @@ -
- gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5
-
--[LibraryClasses.common.PEI_CORE, LibraryClasses.common.PEIM]
--!if $(TPM2_ENABLE) == TRUE
-- PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
--!else
-- PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
--!endif
--
- ################################################################################
- #
- # Components Section - list of all EDK II Modules needed by this Platform
-@@ -332,6 +320,10 @@ - #
- ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
- MdeModulePkg/Core/Pei/PeiMain.inf
-+ MdeModulePkg/Universal/PCD/Pei/Pcd.inf {
-+ <LibraryClasses>
-+ PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-+ }
- ArmPlatformPkg/PlatformPei/PlatformPeim.inf
- ArmVirtPkg/MemoryInitPei/MemoryInitPeim.inf {
- <LibraryClasses>
-@@ -342,10 +334,6 @@ - ArmPkg/Drivers/CpuPei/CpuPei.inf
-
- !if $(TPM2_ENABLE) == TRUE
-- MdeModulePkg/Universal/PCD/Pei/Pcd.inf {
-- <LibraryClasses>
-- PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-- }
- MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.inf {
- <LibraryClasses>
- ResetSystemLib|ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.inf
-diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf -index 764f652afd..c85e36b185 100644 ---- a/ArmVirtPkg/ArmVirtQemu.fdf -+++ b/ArmVirtPkg/ArmVirtQemu.fdf -@@ -109,10 +109,10 @@ READ_LOCK_STATUS = TRUE - INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf
- INF ArmVirtPkg/MemoryInitPei/MemoryInitPeim.inf
- INF ArmPkg/Drivers/CpuPei/CpuPei.inf
-+ INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
- INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
-
- !if $(TPM2_ENABLE) == TRUE
-- INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
- INF MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.inf
- INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
- INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf
diff --git a/meta-arm/meta-arm/recipes-bsp/uefi/files/default.patch b/meta-arm/meta-arm/recipes-bsp/uefi/files/default.patch deleted file mode 100644 index fca232f02b..0000000000 --- a/meta-arm/meta-arm/recipes-bsp/uefi/files/default.patch +++ /dev/null @@ -1,23 +0,0 @@ -Platform/ARM: fix uninitialized variable FileSize in RunAxf - -Clang 14 detects a potentially uninitialized variable FileSize: - -RunAxf.c:216:11: error: variable 'FileSize' is used uninitialized - whenever 'if' condition is false -RunAxf.c:281:38: note: uninitialized use occurs here -WriteBackDataCacheRange (FileData, FileSize); - ^~~~~~~~ - -Reading the code it doesn't look like this can actually happen, but we -can keep clang happy by initialising FileSize to 0. - -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@arm.com> - -diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c b/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c -index d23739ad38..fba5e0ba30 100644 ---- a/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c -+++ b/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c -@@ -136,1 +136,1 @@ ShellDynCmdRunAxfHandler ( -- UINTN FileSize;
-+ UINTN FileSize = 0;
diff --git a/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Fix-for-issue-245.patch b/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Fix-for-issue-245.patch deleted file mode 100644 index 42bdf7d40e..0000000000 --- a/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Fix-for-issue-245.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 096150fa19014b397a5d8f8d774bb8236ac37679 Mon Sep 17 00:00:00 2001 -From: Shyamanth RH <shyamanth.rh@arm.com> -Date: Wed, 4 Jan 2023 13:08:35 +0530 -Subject: [PATCH] Fix for issue #245 - -* The change fixes the build issue observed in GCC 12.XX. -* Looks like GCC is confusing label to a local variable and hence triggers dangling-pointer error when a label addres is assigned to a pointer. -* Changed branch_to_test from void * pointer to uint64_t datatype since we just need the retrun address of the label while updating the ELR. This should suppress the dangling-pinter warning thrown by GCC 12.XX - -Signed-off-by: Shyamanth RH <shyamanth.rh@arm.com> -Upstream-Status: Backport ---- - test_pool/peripherals/test_d003.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/test_pool/peripherals/test_d003.c b/test_pool/peripherals/test_d003.c -index 9f36e1f..0658a45 100755 ---- a/test_pool/peripherals/test_d003.c -+++ b/test_pool/peripherals/test_d003.c -@@ -30,7 +30,7 @@ - - static uint64_t l_uart_base; - static uint32_t int_id; --static void *branch_to_test; -+static uint64_t branch_to_test; - static uint32_t test_fail; - - static -@@ -40,7 +40,7 @@ esr(uint64_t interrupt_type, void *context) - uint32_t index = val_pe_get_index_mpid(val_pe_get_mpid()); - - /* Update the ELR to point to next instrcution */ -- val_pe_update_elr(context, (uint64_t)branch_to_test); -+ val_pe_update_elr(context, branch_to_test); - - val_print(AVS_PRINT_ERR, "\n Error : Received Sync Exception type %d", interrupt_type); - val_set_status(index, RESULT_FAIL(g_sbsa_level, TEST_NUM, 01)); -@@ -150,7 +150,7 @@ payload(void) - val_pe_install_esr(EXCEPT_AARCH64_SYNCHRONOUS_EXCEPTIONS, esr); - val_pe_install_esr(EXCEPT_AARCH64_SERROR, esr); - -- branch_to_test = &&exception_taken; -+ branch_to_test = (uint64_t)&&exception_taken; - - if (count == 0) { - val_print(AVS_PRINT_WARN, "\n No UART defined by Platform ", 0); diff --git a/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Fix-for-mismatch-in-function-prototype.patch b/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Fix-for-mismatch-in-function-prototype.patch new file mode 100644 index 0000000000..0babf2fc01 --- /dev/null +++ b/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Fix-for-mismatch-in-function-prototype.patch @@ -0,0 +1,31 @@ +From 42cc39fdea21177e82b6cec138c06726242673f7 Mon Sep 17 00:00:00 2001 +From: Srikar Josyula <srikar.josyula@arm.com> +Date: Tue, 25 Jul 2023 12:55:04 +0530 +Subject: [PATCH] Fix for mismatch in function prototype + + - Mismatch between function prototype and definition + causing build failure with GCC 13.1.1 + - Fixed the function prototype for val_get_exerciser_err_info + +Signed-off-by: Srikar Josyula <srikar.josyula@arm.com> + +Upstream-Status: Backport +Signed-off-by: Jon Mason <jon.mason@arm.com> + +--- + val/include/sbsa_avs_exerciser.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/val/include/sbsa_avs_exerciser.h b/val/include/sbsa_avs_exerciser.h +index 4b2c62b089f5..7c0e3d0fb58f 100644 +--- a/val/include/sbsa_avs_exerciser.h ++++ b/val/include/sbsa_avs_exerciser.h +@@ -118,7 +118,7 @@ uint32_t val_exerciser_ops(EXERCISER_OPS ops, uint64_t param, uint32_t instance) + uint32_t val_exerciser_get_data(EXERCISER_DATA_TYPE type, exerciser_data_t *data, uint32_t instance); + uint32_t val_exerciser_execute_tests(uint32_t level); + uint32_t val_exerciser_get_bdf(uint32_t instance); +-uint32_t val_get_exerciser_err_info(uint32_t type); ++uint32_t val_get_exerciser_err_info(EXERCISER_ERROR_CODE type); + + uint32_t e001_entry(void); + uint32_t e002_entry(void); diff --git a/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Fix-function-protype-mismatches.patch b/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Fix-function-protype-mismatches.patch deleted file mode 100644 index f60391447d..0000000000 --- a/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Fix-function-protype-mismatches.patch +++ /dev/null @@ -1,43 +0,0 @@ -From df6006190f112a4ecc54ed0a35d3ea83a2350c73 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 2 Feb 2023 17:37:52 -0800 -Subject: [PATCH] Fix function protype mismatches - -These are flagged by gcc13 -avs_gic.c:241:1: error: conflicting types for 'val_gic_get_info' due to enum/integer mismatch; have 'uint32_t(uint32_t)' {aka 'unsigned int(unsigned int)'} [-Werror=enum-int-mismatch] -| 241 | val_gic_get_info(uint32_t type) -| | ^~~~~~~~~~~~~~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Backport ---- - val/include/val_interface.h | 2 +- - val/src/avs_gic.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/val/include/val_interface.h b/val/include/val_interface.h -index 053fdfa..8814b41 100644 ---- a/val/include/val_interface.h -+++ b/val/include/val_interface.h -@@ -181,7 +181,7 @@ typedef enum { - void val_wd_create_info_table(uint64_t *wd_info_table); - void val_wd_free_info_table(void); - uint32_t val_wd_execute_tests(uint32_t level, uint32_t num_pe); --uint64_t val_wd_get_info(uint32_t index, uint32_t info_type); -+uint64_t val_wd_get_info(uint32_t index, WD_INFO_TYPE_e info_type); - uint32_t val_wd_set_ws0(uint32_t index, uint32_t timeout); - uint64_t val_get_counter_frequency(void); - -diff --git a/val/src/avs_gic.c b/val/src/avs_gic.c -index b37f106..1146a01 100644 ---- a/val/src/avs_gic.c -+++ b/val/src/avs_gic.c -@@ -249,7 +249,7 @@ val_get_cpuif_base(void) - @return 32-bit data - **/ - uint32_t --val_gic_get_info(uint32_t type) -+val_gic_get_info(GIC_INFO_e type) - { - uint32_t rdbase_len; - diff --git a/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Patch-in-the-paths-to-the-SBSA-test-suite.patch b/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Patch-in-the-paths-to-the-SBSA-test-suite.patch index 0c784c6fb5..7b0b9b3880 100644 --- a/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Patch-in-the-paths-to-the-SBSA-test-suite.patch +++ b/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Patch-in-the-paths-to-the-SBSA-test-suite.patch @@ -1,4 +1,4 @@ -From 90d705333521dd85720a17a29abf1aff1612c917 Mon Sep 17 00:00:00 2001 +From 97eb384fcc66326f93813ff14b998bb7336a4422 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@arm.com> Date: Thu, 16 Feb 2023 21:53:25 +0000 Subject: [PATCH] Patch in the paths to the SBSA test suite diff --git a/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs/0003-Enforce-using-good-old-BFD-linker.patch b/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Enforce-using-good-old-BFD-linker.patch index a921481837..154ff0ec04 100644 --- a/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs/0003-Enforce-using-good-old-BFD-linker.patch +++ b/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Enforce-using-good-old-BFD-linker.patch @@ -1,4 +1,4 @@ -From 6673fb1de490575a414de7e4dd9442c921383019 Mon Sep 17 00:00:00 2001 +From 8ce56a02fd722833931d356c372d374845f4c626 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 7 Apr 2021 00:16:07 -0700 Subject: [PATCH] Enforce using good old BFD linker @@ -18,10 +18,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template -index bca09e4648..b775391675 100755 +index 503a6687c1..5cbc5c92a5 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template -@@ -1858,7 +1858,7 @@ DEFINE GCC_ARM_CC_XIPFLAGS = -mno-unaligned-access +@@ -746,7 +746,7 @@ DEFINE GCC_ARM_CC_XIPFLAGS = -mno-unaligned-access DEFINE GCC_AARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -fno-short-enums -fverbose-asm -funsigned-char -ffunction-sections -fdata-sections -Wno-address -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-pic -fno-pie -ffixed-x18
DEFINE GCC_AARCH64_CC_XIPFLAGS = -mstrict-align -mgeneral-regs-only
DEFINE GCC_DLINK_FLAGS_COMMON = -nostdlib --pie
diff --git a/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs_6.1.0.bb b/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.2.bb index 7a29f55626..b6c6468518 100644 --- a/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs_6.1.0.bb +++ b/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.2.bb @@ -1,4 +1,4 @@ -require recipes-bsp/uefi/edk2-firmware_202302.bb +require recipes-bsp/uefi/edk2-firmware_202305.bb PROVIDES:remove = "virtual/bootloader" LICENSE += "& Apache-2.0" @@ -6,15 +6,14 @@ LIC_FILES_CHKSUM += "file://ShellPkg/Application/sbsa-acs/LICENSE.md;md5=2a94494 SRC_URI += "git://github.com/ARM-software/sbsa-acs;destsuffix=edk2/ShellPkg/Application/sbsa-acs;protocol=https;branch=master;name=acs \ git://github.com/tianocore/edk2-libc;destsuffix=edk2/edk2-libc;protocol=https;branch=master;name=libc \ - file://0002-Patch-in-the-paths-to-the-SBSA-test-suite.patch \ - file://0003-Enforce-using-good-old-BFD-linker.patch \ - file://0001-Fix-function-protype-mismatches.patch;patchdir=ShellPkg/Application/sbsa-acs \ - file://0001-Fix-for-issue-245.patch;patchdir=ShellPkg/Application/sbsa-acs \ + file://0001-Patch-in-the-paths-to-the-SBSA-test-suite.patch \ + file://0002-Enforce-using-good-old-BFD-linker.patch \ + file://0001-Fix-for-mismatch-in-function-prototype.patch;patchdir=ShellPkg/Application/sbsa-acs \ " -SRCREV_acs = "7d7a3fe81ad7e6f05143ba17db50107f1ab6c9cd" -SRCREV_libc = "a806ea1062c254bd6e09db7d0f7beb4d14bc3ed0" +SRCREV_acs = "23253befbed2aee7304470fd83b78672488a7fc2" +SRCREV_libc = "d3dea661da9ae4a3421a80905e75a8dc77aa980e" # GCC12 trips on it #see https://src.fedoraproject.org/rpms/edk2/blob/rawhide/f/0032-Basetools-turn-off-gcc12-warning.patch diff --git a/meta-arm/meta-arm/recipes-devtools/fvp/fvp-corstone500.bb b/meta-arm/meta-arm/recipes-devtools/fvp/fvp-corstone500.bb deleted file mode 100644 index c80b94c4c5..0000000000 --- a/meta-arm/meta-arm/recipes-devtools/fvp/fvp-corstone500.bb +++ /dev/null @@ -1,10 +0,0 @@ -require fvp-ecosystem.inc - -MODEL = "Corstone-500" -MODEL_CODE = "FVP_Corstone_500" -PV = "11.12.59" - -SRC_URI[sha256sum] = "26f0fbb52de2ccdb4c7b40b6f4ddb5eabdcb8173775fdd11c9a12173326f8614" - -LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \ - file://license_terms/third_party_licenses.txt;md5=47473b1e04b70938cf0a7ffea8ea4cc3" diff --git a/meta-arm/meta-arm/recipes-devtools/gn/gn_git.bb b/meta-arm/meta-arm/recipes-devtools/gn/gn_git.bb index 4b021bbe4e..5a6f19dbab 100644 --- a/meta-arm/meta-arm/recipes-devtools/gn/gn_git.bb +++ b/meta-arm/meta-arm/recipes-devtools/gn/gn_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d" SRC_URI = "git://gn.googlesource.com/gn;protocol=https;branch=main \ file://0001-Replace-lstat64-stat64-functions-on-linux.patch" SRCREV = "4bd1a77e67958fb7f6739bd4542641646f264e5d" -PV = "0+git${SRCPV}" +PV = "0+git" S = "${WORKDIR}/git" B = "${WORKDIR}/build" diff --git a/meta-arm/meta-arm/recipes-kernel/linux/files/aarch64/0001-arm64-defconfig-remove-CONFIG_COMMON_CLK_NPCM8XX-y.patch b/meta-arm/meta-arm/recipes-kernel/linux/files/aarch64/0001-arm64-defconfig-remove-CONFIG_COMMON_CLK_NPCM8XX-y.patch new file mode 100644 index 0000000000..bff81dfcc6 --- /dev/null +++ b/meta-arm/meta-arm/recipes-kernel/linux/files/aarch64/0001-arm64-defconfig-remove-CONFIG_COMMON_CLK_NPCM8XX-y.patch @@ -0,0 +1,50 @@ +From 94a5e7ffe5855272708a94190820534c4f51bdd8 Mon Sep 17 00:00:00 2001 +From: Mikko Rapeli <mikko.rapeli@linaro.org> +Date: Tue, 15 Aug 2023 10:36:56 +0300 +Subject: [PATCH] arm64: defconfig: remove CONFIG_COMMON_CLK_NPCM8XX=y + +There is no code for this config option and enabling it in defconfig +causes warnings from tools which are detecting unused and obsolete +kernel config flags since the flag will be completely missing from +effective build config after "make olddefconfig". + +Fixes yocto kernel recipe build time warning: + +WARNING: [kernel config]: This BSP contains fragments with warnings: +... +[INFO]: the following symbols were not found in the active +configuration: + - CONFIG_COMMON_CLK_NPCM8XX + +The flag was added with commit 45472f1e5348c7b755b4912f2f529ec81cea044b +v5.19-rc4-15-g45472f1e5348 so 6.1 and 6.4 stable kernel trees are +affected. + +Fixes: 45472f1e5348c7b755b4912f2f529ec81cea044b ("arm64: defconfig: Add Nuvoton NPCM family support") +Cc: stable@kernel.org +Cc: Bruce Ashfield <bruce.ashfield@gmail.com> +Cc: Jon Mason <jon.mason@arm.com> +Cc: Jon Mason <jdmason@kudzu.us> +Cc: Ross Burton <ross@burtonini.com> +Cc: Arnd Bergmann <arnd@arndb.de> +Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org> + +Signed-off-by: Jon Mason <jon.mason@arm.com> +Upstream-Status: Submitted [https://lists.infradead.org/pipermail/linux-arm-kernel/2023-August/859760.html] + +--- + arch/arm64/configs/defconfig | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig +index 0777bcae9104..1cf24537fda2 100644 +--- a/arch/arm64/configs/defconfig ++++ b/arch/arm64/configs/defconfig +@@ -1146,7 +1146,6 @@ CONFIG_COMMON_CLK_S2MPS11=y + CONFIG_COMMON_CLK_PWM=y + CONFIG_COMMON_CLK_RS9_PCIE=y + CONFIG_COMMON_CLK_VC5=y +-CONFIG_COMMON_CLK_NPCM8XX=y + CONFIG_COMMON_CLK_BD718XX=m + CONFIG_CLK_RASPBERRYPI=m + CONFIG_CLK_IMX8MM=y diff --git a/meta-arm/meta-arm/recipes-kernel/linux/files/aarch64/0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch b/meta-arm/meta-arm/recipes-kernel/linux/files/aarch64/0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch deleted file mode 100644 index e4d8936fd7..0000000000 --- a/meta-arm/meta-arm/recipes-kernel/linux/files/aarch64/0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e6a71160cc145e18ab45195abf89884112e02dfb Mon Sep 17 00:00:00 2001 -From: Kees Cook <keescook@chromium.org> -Date: Wed, 18 Jan 2023 12:21:35 -0800 -Subject: [PATCH] gcc-plugins: Reorganize gimple includes for GCC 13 - -The gimple-iterator.h header must be included before gimple-fold.h -starting with GCC 13. Reorganize gimple headers to work for all GCC -versions. - -Reported-by: Palmer Dabbelt <palmer@rivosinc.com> -Acked-by: Palmer Dabbelt <palmer@rivosinc.com> -Link: https://lore.kernel.org/all/20230113173033.4380-1-palmer@rivosinc.com/ -Cc: linux-hardening@vger.kernel.org -Signed-off-by: Kees Cook <keescook@chromium.org> - -Upstream-Status: Backport -Signed-off-by: Jon Mason <jon.mason@arm.com> - ---- - scripts/gcc-plugins/gcc-common.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h -index 9a1895747b15..84c730da36dd 100644 ---- a/scripts/gcc-plugins/gcc-common.h -+++ b/scripts/gcc-plugins/gcc-common.h -@@ -71,7 +71,9 @@ - #include "varasm.h" - #include "stor-layout.h" - #include "internal-fn.h" -+#include "gimple.h" - #include "gimple-expr.h" -+#include "gimple-iterator.h" - #include "gimple-fold.h" - #include "context.h" - #include "tree-ssa-alias.h" -@@ -85,10 +87,8 @@ - #include "tree-eh.h" - #include "stmt.h" - #include "gimplify.h" --#include "gimple.h" - #include "tree-phinodes.h" - #include "tree-cfg.h" --#include "gimple-iterator.h" - #include "gimple-ssa.h" - #include "ssa-iterators.h" - diff --git a/meta-arm/meta-arm/recipes-kernel/linux/files/aarch64/0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch b/meta-arm/meta-arm/recipes-kernel/linux/files/aarch64/0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch deleted file mode 100644 index d5b5363a69..0000000000 --- a/meta-arm/meta-arm/recipes-kernel/linux/files/aarch64/0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 891eeb87cddb0d52bc9eac39afcca5027a660be6 Mon Sep 17 00:00:00 2001 -From: Jon Mason <jdmason@kudzu.us> -Date: Fri, 3 Feb 2023 05:21:07 -0500 -Subject: [PATCH 2/2] Revert "arm64: defconfig: Add Nuvoton NPCM family - support" - -This reverts commit 45472f1e5348c7b755b4912f2f529ec81cea044b - -Signed-off-by: Jon Mason <jon.mason@arm.com> -Upstream-Status: Inappropriate ---- - arch/arm64/configs/defconfig | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig -index 70919b241469..4f09b80a1b96 100644 ---- a/arch/arm64/configs/defconfig -+++ b/arch/arm64/configs/defconfig -@@ -51,7 +51,6 @@ CONFIG_ARCH_MESON=y - CONFIG_ARCH_MVEBU=y - CONFIG_ARCH_NXP=y - CONFIG_ARCH_MXC=y --CONFIG_ARCH_NPCM=y - CONFIG_ARCH_QCOM=y - CONFIG_ARCH_RENESAS=y - CONFIG_ARCH_ROCKCHIP=y -@@ -637,7 +636,6 @@ CONFIG_UNIPHIER_WATCHDOG=y - CONFIG_PM8916_WATCHDOG=m - CONFIG_BCM2835_WDT=y - CONFIG_BCM7038_WDT=m --CONFIG_NPCM7XX_WATCHDOG=y - CONFIG_MFD_ALTERA_SYSMGR=y - CONFIG_MFD_BD9571MWV=y - CONFIG_MFD_AXP20X_I2C=y -@@ -1049,7 +1047,6 @@ CONFIG_COMMON_CLK_FSL_SAI=y - CONFIG_COMMON_CLK_S2MPS11=y - CONFIG_COMMON_CLK_PWM=y - CONFIG_COMMON_CLK_VC5=y --CONFIG_COMMON_CLK_NPCM8XX=y - CONFIG_COMMON_CLK_BD718XX=m - CONFIG_CLK_RASPBERRYPI=m - CONFIG_CLK_IMX8MM=y --- -2.30.2 - diff --git a/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend b/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend index 0a42ce4a5d..9d5266ba22 100644 --- a/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend +++ b/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend @@ -1,5 +1,10 @@ ARMFILESPATHS := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend:aarch64 = "${ARMFILESPATHS}" +SRC_URI:append:aarch64 = " \ + file://0001-arm64-defconfig-remove-CONFIG_COMMON_CLK_NPCM8XX-y.patch \ + " + COMPATIBLE_MACHINE:generic-arm64 = "generic-arm64" FILESEXTRAPATHS:prepend:generic-arm64 = "${ARMFILESPATHS}" SRC_URI:append:generic-arm64 = " \ diff --git a/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto-rt_6.1%.bbappend b/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto-rt_6.1%.bbappend index d0a0ff0e68..94d3398c65 100644 --- a/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto-rt_6.1%.bbappend +++ b/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto-rt_6.1%.bbappend @@ -2,6 +2,4 @@ FILESEXTRAPATHS:prepend:aarch64 = "${ARMFILESPATHS}" SRC_URI:append:aarch64 = " \ file://0001-Revert-arm64-defconfig-Enable-Tegra-MGBE-driver.patch \ - file://0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch \ - file://0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch \ " diff --git a/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend b/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend index d0a0ff0e68..bb9581712b 100644 --- a/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend +++ b/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend @@ -1,7 +1,4 @@ - FILESEXTRAPATHS:prepend:aarch64 = "${ARMFILESPATHS}" SRC_URI:append:aarch64 = " \ file://0001-Revert-arm64-defconfig-Enable-Tegra-MGBE-driver.patch \ - file://0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch \ - file://0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch \ " diff --git a/meta-arm/meta-arm/recipes-security/optee/optee-client/tee-supplicant.service b/meta-arm/meta-arm/recipes-security/optee/optee-client/tee-supplicant.service index c273832d72..6b00df7421 100644 --- a/meta-arm/meta-arm/recipes-security/optee/optee-client/tee-supplicant.service +++ b/meta-arm/meta-arm/recipes-security/optee/optee-client/tee-supplicant.service @@ -1,5 +1,6 @@ [Unit] Description=TEE Supplicant +ConditionPathExistsGlob=/dev/teepriv[0-9]* [Service] User=root diff --git a/meta-arm/meta-arm/recipes-security/trusted-services/trusted-services-src.inc b/meta-arm/meta-arm/recipes-security/trusted-services/trusted-services-src.inc index 2bb4a8a11f..86eb50835f 100644 --- a/meta-arm/meta-arm/recipes-security/trusted-services/trusted-services-src.inc +++ b/meta-arm/meta-arm/recipes-security/trusted-services/trusted-services-src.inc @@ -12,11 +12,11 @@ SRC_URI:append = "\ " #Latest on 2023 April 28 -SRCREV="08b3d39471f4914186bd23793dc920e83b0e3197" +SRCREV_trusted-services = "08b3d39471f4914186bd23793dc920e83b0e3197" LIC_FILES_CHKSUM = "file://${S}/license.rst;md5=ea160bac7f690a069c608516b17997f4" S = "${WORKDIR}/git/trusted-services" -PV ?= "0.0+git${SRCPV}" +PV ?= "0.0+git" # DTC, tag "v1.6.1" SRC_URI += "git://github.com/dgibson/dtc;name=dtc;protocol=https;branch=main;destsuffix=git/dtc" @@ -58,6 +58,8 @@ SRC_URI += "git://github.com/OpenAMP/open-amp.git;name=openamp;protocol=https;br SRCREV_openamp = "347397decaa43372fc4d00f965640ebde042966d" LIC_FILES_CHKSUM += "file://../openamp/LICENSE.md;md5=a8d8cf662ef6bf9936a1e1413585ecbf" +SRCREV_FORMAT = "trusted-services_dtc_mbedtls_nanopb_qcbor_tcose_cpputest_libmetal_openamp" + # TS ships patches for external dependencies that needs to be applied apply_ts_patches() { ( cd ${WORKDIR}/git/qcbor; git stash; git branch -f bf_am; git am ${S}/external/qcbor/*.patch; git reset bf_am ) |