* [DistroKit] [PATCH] tf-a-stm32mp13: sync with tf-a upstream rule
@ 2025-12-11 9:38 Michael Olbrich
2025-12-11 10:00 ` Robert Schwebel
2025-12-11 12:10 ` [DistroKit] [PATCH] fixup! " Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Michael Olbrich @ 2025-12-11 9:38 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich
As a side effect, this fixes devpkg usage.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
.../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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [DistroKit] [PATCH] tf-a-stm32mp13: sync with tf-a upstream rule
2025-12-11 9:38 [DistroKit] [PATCH] tf-a-stm32mp13: sync with tf-a upstream rule Michael Olbrich
@ 2025-12-11 10:00 ` Robert Schwebel
2025-12-11 12:10 ` [DistroKit] [PATCH] fixup! " Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Robert Schwebel @ 2025-12-11 10:00 UTC (permalink / raw)
To: Michael Olbrich; +Cc: distrokit
Applied to next.
On Thu, Dec 11, 2025 at 10:38:22AM +0100, Michael Olbrich wrote:
> As a side effect, this fixes devpkg usage.
>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ---
> .../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
>
>
>
--
Pengutronix e.K. | Dipl.-Ing. Robert Schwebel |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
^ permalink raw reply [flat|nested] 4+ messages in thread
* [DistroKit] [PATCH] fixup! tf-a-stm32mp13: sync with tf-a upstream rule
2025-12-11 9:38 [DistroKit] [PATCH] tf-a-stm32mp13: sync with tf-a upstream rule Michael Olbrich
2025-12-11 10:00 ` Robert Schwebel
@ 2025-12-11 12:10 ` Michael Olbrich
2025-12-11 13:02 ` Robert Schwebel
1 sibling, 1 reply; 4+ messages in thread
From: Michael Olbrich @ 2025-12-11 12:10 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich
---
The '$(1)' is not resolved correctly without this and no files are
installed.
configs/platform-v7a/rules/tf-a-stm32mp13.make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/platform-v7a/rules/tf-a-stm32mp13.make b/configs/platform-v7a/rules/tf-a-stm32mp13.make
index e91269988a4e..7de7b84bee2c 100644
--- a/configs/platform-v7a/rules/tf-a-stm32mp13.make
+++ b/configs/platform-v7a/rules/tf-a-stm32mp13.make
@@ -73,7 +73,7 @@ $(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_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), \
--
2.47.3
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [DistroKit] [PATCH] fixup! tf-a-stm32mp13: sync with tf-a upstream rule
2025-12-11 12:10 ` [DistroKit] [PATCH] fixup! " Michael Olbrich
@ 2025-12-11 13:02 ` Robert Schwebel
0 siblings, 0 replies; 4+ messages in thread
From: Robert Schwebel @ 2025-12-11 13:02 UTC (permalink / raw)
To: Michael Olbrich; +Cc: distrokit
squashed
On Thu, Dec 11, 2025 at 01:10:53PM +0100, Michael Olbrich wrote:
> ---
>
> The '$(1)' is not resolved correctly without this and no files are
> installed.
>
> configs/platform-v7a/rules/tf-a-stm32mp13.make | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/configs/platform-v7a/rules/tf-a-stm32mp13.make b/configs/platform-v7a/rules/tf-a-stm32mp13.make
> index e91269988a4e..7de7b84bee2c 100644
> --- a/configs/platform-v7a/rules/tf-a-stm32mp13.make
> +++ b/configs/platform-v7a/rules/tf-a-stm32mp13.make
> @@ -73,7 +73,7 @@ $(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_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), \
> --
> 2.47.3
>
>
>
--
Pengutronix e.K. | Dipl.-Ing. Robert Schwebel |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-12-11 13:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-12-11 9:38 [DistroKit] [PATCH] tf-a-stm32mp13: sync with tf-a upstream rule Michael Olbrich
2025-12-11 10:00 ` Robert Schwebel
2025-12-11 12:10 ` [DistroKit] [PATCH] fixup! " Michael Olbrich
2025-12-11 13:02 ` Robert Schwebel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox