From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 11 Dec 2025 10:38:35 +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 1vTd87-00AFMl-21 for lore@lore.pengutronix.de; Thu, 11 Dec 2025 10:38:35 +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 1vTd86-0002vC-Q6; Thu, 11 Dec 2025 10:38:34 +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 1vTd85-0002uh-Bo; Thu, 11 Dec 2025 10:38:33 +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 1vTd85-0056cM-0a; Thu, 11 Dec 2025 10:38:33 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1vTd85-00000006CS6-0Ro5; Thu, 11 Dec 2025 10:38:33 +0100 From: Michael Olbrich To: distrokit@pengutronix.de Date: Thu, 11 Dec 2025 10:38:22 +0100 Message-ID: <20251211093822.1440080-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH] tf-a-stm32mp13: sync with tf-a upstream rule 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: Michael Olbrich 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 As a side effect, this fixes devpkg usage. Signed-off-by: Michael Olbrich --- .../platform-v7a/rules/tf-a-stm32mp13.make | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/configs/platform-v7a/rules/tf-a-stm32mp13.make b/configs/platform-v7a/rules/tf-a-stm32mp13.make index 7bfd70c66553..e91269988a4e 100644 --- a/configs/platform-v7a/rules/tf-a-stm32mp13.make +++ b/configs/platform-v7a/rules/tf-a-stm32mp13.make @@ -40,7 +40,6 @@ TF_A_STM32MP13_ARTIFACTS := tf-a-*.stm32 fdts/*-fw-config.dtb TF_A_STM32MP13_WRAPPER_BLACKLIST := \ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) -TF_A_STM32MP13_PATH := PATH=$(CROSS_PATH) TF_A_STM32MP13_MAKE_OPT := \ -C $(TF_A_STM32MP13_DIR) \ CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \ @@ -74,17 +73,17 @@ $(STATEDIR)/tf-a-stm32mp13.compile: # Install # ---------------------------------------------------------------------------- +TF_A_STM32MP13_BINDIR := $(TF_A_STM32MP13_BUILD_DIR)/$(1)/$(if $(filter DEBUG=1,$(TF_A_STM32MP13_MAKE_OPT)),debug,release) + tf-a-stm32mp13/inst_plat = $(foreach artifact, \ $(foreach pattern, $(TF_A_STM32MP13_ARTIFACTS), \ - $(wildcard $(TF_A_STM32MP13_BUILD_DIR)/$(1)/$(if $(filter DEBUG=1,TF_A_STM32MP13_MAKE_OPT),debug,release)/$(pattern))), \ + $(wildcard $(addprefix $(TF_A_STM32MP13_BINDIR)/, $(pattern)))), \ install -v -D -m 644 $(artifact) \ - $(2)/$(1)-$(notdir $(artifact))$(ptx/nl)) - -tf-a-stm32mp13/inst_bins = $(foreach plat, $(TF_A_STM32MP13_PLATFORMS), $(call tf-a-stm32mp13/inst_plat,$(plat),$(1))) + $(TF_A_STM32MP13_PKGDIR)/usr/lib/firmware/$(1)-$(notdir $(artifact))$(ptx/nl)) $(STATEDIR)/tf-a-stm32mp13.install: @$(call targetinfo) - @$(call tf-a-stm32mp13/inst_bins,$(TF_A_STM32MP13_PKGDIR)/usr/lib/firmware) + @$(foreach plat, $(TF_A_STM32MP13_PLATFORMS), $(call tf-a-stm32mp13/inst_plat,$(plat),$(1))) @$(call touch) # ---------------------------------------------------------------------------- @@ -93,16 +92,8 @@ $(STATEDIR)/tf-a-stm32mp13.install: $(STATEDIR)/tf-a-stm32mp13.targetinstall: @$(call targetinfo) - @$(call tf-a-stm32mp13/inst_bins,$(IMAGEDIR)) + @$(foreach artifact, $(wildcard $(TF_A_STM32MP13_PKGDIR)/usr/lib/firmware/*), \ + $(call ptx/image-install, TF_A_STM32MP13, $(artifact))$(ptx/nl)) @$(call touch) -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- - -$(STATEDIR)/tf-a-stm32mp13.clean: - @$(call targetinfo) - @rm -vf $(addprefix $(IMAGEDIR)/, $(notdir $(TF_A_STM32MP13_ARTIFACTS_SRC))) - @$(call clean_pkg, TF_A_STM32MP13) - # vim: syntax=make -- 2.47.3