From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 09 Dec 2024 20:49:33 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tKjl6-0065oq-1j for lore@lore.pengutronix.de; Mon, 09 Dec 2024 20:49:33 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1tKjl6-0001bz-Hs; Mon, 09 Dec 2024 20:49:32 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tKjl4-0001bS-Jl; Mon, 09 Dec 2024 20:49:30 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tKjl3-002ZFa-28; Mon, 09 Dec 2024 20:49:30 +0100 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1tKjk8-00BERp-0m; Mon, 09 Dec 2024 20:48:32 +0100 From: Ahmad Fatoum To: distrokit@pengutronix.de Date: Mon, 9 Dec 2024 20:48:30 +0100 Message-Id: <20241209194831.2677114-11-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241209194831.2677114-1-a.fatoum@pengutronix.de> References: <20241209194831.2677114-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH v2 10/11] v7a: tf-a: update v2.10 -> v2.12 X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ahmad Fatoum Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Like done for v8a, let's bring TF-A for v7a up to date as well. This needs a slight adjustment beyond updating the platformconfig: The build system has been reworked in the new TF-A versions and specifying our own CC or AS variables now breaks the build[1]. This has been fixed in PTXdist already, but as we have a second TF-A recipe for the STM32MP13, we must apply the change there as well. [1]: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/27163 [2]: https://git.pengutronix.de/cgit/ptxdist/commit/rules/tf-a.make?id=341428f78 Signed-off-by: Ahmad Fatoum --- configs/platform-v7a/platformconfig | 4 ++-- configs/platform-v7a/rules/tf-a-stm32mp13.make | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig index 789cc8978459..c3acafd25fc9 100644 --- a/configs/platform-v7a/platformconfig +++ b/configs/platform-v7a/platformconfig @@ -206,8 +206,8 @@ PTXCONF_OPTEE_CFG="CFG_TEE_CORE_LOG_LEVEL=2 CFG_WITH_PAGER=n CFG_GP_SOCKETS=n CF PTXCONF_TF_A_STM32MP13=y PTXCONF_TF_A=y PTXCONF_TF_A_URL="https://github.com/ARM-software/arm-trusted-firmware/archive/refs/tags" -PTXCONF_TF_A_VERSION="v2.10" -PTXCONF_TF_A_MD5="641f42080967e05d687ef2fa9f8f3bc3 179042745d57dc03cb44063d43dc5301" +PTXCONF_TF_A_VERSION="v2.12" +PTXCONF_TF_A_MD5="dea016f3707117c7935a8a26433a1e46" PTXCONF_TF_A_ARCH_STRING="aarch32" PTXCONF_TF_A_ARM_ARCH_MAJOR_7=y # PTXCONF_TF_A_ARM_ARCH_MAJOR_8_32_BIT is not set diff --git a/configs/platform-v7a/rules/tf-a-stm32mp13.make b/configs/platform-v7a/rules/tf-a-stm32mp13.make index c404cde890bb..7bfd70c66553 100644 --- a/configs/platform-v7a/rules/tf-a-stm32mp13.make +++ b/configs/platform-v7a/rules/tf-a-stm32mp13.make @@ -61,8 +61,6 @@ TF_A_STM32MP13_CONF_TOOL := NO # Compile # ---------------------------------------------------------------------------- -TF_A_STM32MP13_MAKE_ENV := $(CROSS_ENV) - $(STATEDIR)/tf-a-stm32mp13.compile: @$(call targetinfo) -- 2.39.5