From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 18 Mar 2026 12:15:08 +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 1w2ork-002ARk-1u for lore@lore.pengutronix.de; Wed, 18 Mar 2026 12:15:08 +0100 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1w2ork-0006Jn-F8; Wed, 18 Mar 2026 12:15:08 +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 1w2orU-0006Ir-HA; Wed, 18 Mar 2026 12:14:52 +0100 Received: from dude04.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::ac] helo=dude04) 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 1w2orU-000tlQ-14; Wed, 18 Mar 2026 12:14:52 +0100 Received: from rhi by dude04 with local (Exim 4.98.2) (envelope-from ) id 1w2orU-00000003XEm-18dI; Wed, 18 Mar 2026 12:14:52 +0100 From: Roland Hieber To: ptxdist@pengutronix.de Date: Wed, 18 Mar 2026 12:14:04 +0100 Message-ID: <20260318111403.842617-2-rhi@pengutronix.de> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Mail-Followup-To: Roland Hieber , ptxdist@pengutronix.de Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH] host-tf-a: fix build with v2.14 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Roland Hieber Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false TF-A >= v2.14 now tries to detect an ARM toolchain early in the Makefile and errors out if it cannot find one before even evaluating the 'fiptool' recipe. Even though we only use the host toolchain to build fiptool, set the same build environment as for the tf-a recipe to make it work again. HOST_TF_A is usually only selected by images, not by TF_A directly, so make sure that we can use TF_A_* variables with an additional 'select' in the platformconfig menu. (This problem only happens on build hosts without an aarch64-linux-gnu-* toolchain installed in /usr/bin/, to which TF-A defaults when no ARCH is set. However PTXdist includes the selected_toolchain in PATH when building host-tf-a, so a matching cross toolchain can always be found.) Signed-off-by: Roland Hieber --- platforms/host-tf-a.in | 1 + rules/host-tf-a.make | 4 +++- rules/tf-a.make | 8 +++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/platforms/host-tf-a.in b/platforms/host-tf-a.in index f8fd15c48937..9a77c7e8ddc3 100644 --- a/platforms/host-tf-a.in +++ b/platforms/host-tf-a.in @@ -4,5 +4,6 @@ config HOST_TF_A tristate default y if ALLYES && TF_A select HOST_OPENSSL + select TF_A if BUILDTIME help This provides fiptool diff --git a/rules/host-tf-a.make b/rules/host-tf-a.make index 38f0006428e1..5b8045feefdf 100644 --- a/rules/host-tf-a.make +++ b/rules/host-tf-a.make @@ -10,7 +10,9 @@ # HOST_PACKAGES-$(PTXCONF_HOST_TF_A) += host-tf-a -HOST_TF_A_MAKE_OPT = fiptool +HOST_TF_A_MAKE_OPT = \ + $(TF_A_SHARED_OPT) \ + fiptool $(STATEDIR)/host-tf-a.install: @$(call targetinfo) diff --git a/rules/tf-a.make b/rules/tf-a.make index 6347112fcf1c..89b53d695775 100644 --- a/rules/tf-a.make +++ b/rules/tf-a.make @@ -45,13 +45,15 @@ TF_A_WRAPPER_BLACKLIST := \ TF_A_EXTRA_ARGS := $(call remove_quotes,$(PTXCONF_TF_A_EXTRA_ARGS)) TF_A_BINDIR = $(TF_A_BUILD_DIR)/$(1)/$(if $(filter DEBUG=1,$(TF_A_EXTRA_ARGS)),debug,release) TF_A_BINDIR_BOARD = $(TF_A_BUILD_DIR)/$(1)/*/$(if $(filter DEBUG=1,$(TF_A_EXTRA_ARGS)),debug,release) -TF_A_MAKE_OPT := \ - -C $(TF_A_DIR) \ +TF_A_SHARED_OPT := \ CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \ HOSTCC=$(HOSTCC) \ ARCH=$(PTXCONF_TF_A_ARCH_STRING) \ ARM_ARCH_MAJOR=$(PTXCONF_TF_A_ARM_ARCH_MAJOR) \ - BUILD_STRING=$(PTXCONF_TF_A_VERSION) \ + BUILD_STRING=$(PTXCONF_TF_A_VERSION) +TF_A_MAKE_OPT := \ + -C $(TF_A_DIR) \ + $(TF_A_SHARED_OPT) \ $(TF_A_EXTRA_ARGS) \ all -- 2.47.3