* [DistroKit] [PATCH 0/3] tf-a-stm32mp13 cleanup
@ 2024-05-03 10:58 Michael Olbrich
2024-05-03 10:58 ` [DistroKit] [PATCH 1/3] tf-a-stm32mp13: align variables Michael Olbrich
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Michael Olbrich @ 2024-05-03 10:58 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich, Ahmad Fatoum
Hi,
A bit of cleanup and fixes. Otherwise the downloads fails and building
break if PTXCONF_SETUP_DEPRECATED_FATAL is enabled.
Michael
Michael Olbrich (3):
tf-a-stm32mp13: align variables
tf-a-stm32mp13: use _URL and _SOURCE from tf-a
tf-a-stm32mp13: don't use _BUILDDIR
.../platform-v7a/rules/tf-a-stm32mp13.make | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
--
2.39.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [DistroKit] [PATCH 1/3] tf-a-stm32mp13: align variables
2024-05-03 10:58 [DistroKit] [PATCH 0/3] tf-a-stm32mp13 cleanup Michael Olbrich
@ 2024-05-03 10:58 ` Michael Olbrich
2024-05-27 16:19 ` Robert Schwebel
2024-05-03 10:58 ` [DistroKit] [PATCH 2/3] tf-a-stm32mp13: use _URL and _SOURCE from tf-a Michael Olbrich
2024-05-03 10:58 ` [DistroKit] [PATCH 3/3] tf-a-stm32mp13: don't use _BUILDDIR Michael Olbrich
2 siblings, 1 reply; 9+ messages in thread
From: Michael Olbrich @ 2024-05-03 10:58 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich, Ahmad Fatoum
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
configs/platform-v7a/rules/tf-a-stm32mp13.make | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/configs/platform-v7a/rules/tf-a-stm32mp13.make b/configs/platform-v7a/rules/tf-a-stm32mp13.make
index 36feb25e6e76..d8a7e92de073 100644
--- a/configs/platform-v7a/rules/tf-a-stm32mp13.make
+++ b/configs/platform-v7a/rules/tf-a-stm32mp13.make
@@ -15,16 +15,16 @@ PACKAGES-$(PTXCONF_TF_A_STM32MP13) += tf-a-stm32mp13
#
# Paths and names
#
-TF_A_STM32MP13_VERSION := $(call ptx/config-version, PTXCONF_TF_A)
-TF_A_STM32MP13_MD5 := $(call ptx/config-md5, PTXCONF_TF_A)
-TF_A_STM32MP13 := tf-a-stm32mp13-$(TF_A_STM32MP13_VERSION)
-TF_A_STM32MP13_SUFFIX := tar.gz
-TF_A_STM32MP13_URL := https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/$(TF_A_STM32MP13_VERSION).$(TF_A_STM32MP13_SUFFIX)
-TF_A_STM32MP13_SOURCE := $(SRCDIR)/$(TF_A_STM32MP13).$(TF_A_STM32MP13_SUFFIX)
-TF_A_STM32MP13_DIR := $(BUILDDIR)/$(TF_A_STM32MP13)
-TF_A_STM32MP13_BUILDDIR := $(TF_A_STM32MP13_DIR)/build
+TF_A_STM32MP13_VERSION := $(call ptx/config-version, PTXCONF_TF_A)
+TF_A_STM32MP13_MD5 := $(call ptx/config-md5, PTXCONF_TF_A)
+TF_A_STM32MP13 := tf-a-stm32mp13-$(TF_A_STM32MP13_VERSION)
+TF_A_STM32MP13_SUFFIX := tar.gz
+TF_A_STM32MP13_URL := https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/$(TF_A_STM32MP13_VERSION).$(TF_A_STM32MP13_SUFFIX)
+TF_A_STM32MP13_SOURCE := $(SRCDIR)/$(TF_A_STM32MP13).$(TF_A_STM32MP13_SUFFIX)
+TF_A_STM32MP13_DIR := $(BUILDDIR)/$(TF_A_STM32MP13)
+TF_A_STM32MP13_BUILDDIR := $(TF_A_STM32MP13_DIR)/build
TF_A_STM32MP13_BUILD_OOT := YES
-TF_A_STM32MP13_LICENSE := BSD-3-Clause AND BSD-2-Clause \
+TF_A_STM32MP13_LICENSE := BSD-3-Clause AND BSD-2-Clause \
AND (GPL-2.0-or-later OR BSD-2-Clause) \
AND (NCSA OR MIT) \
AND Zlib \
--
2.39.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [DistroKit] [PATCH 2/3] tf-a-stm32mp13: use _URL and _SOURCE from tf-a
2024-05-03 10:58 [DistroKit] [PATCH 0/3] tf-a-stm32mp13 cleanup Michael Olbrich
2024-05-03 10:58 ` [DistroKit] [PATCH 1/3] tf-a-stm32mp13: align variables Michael Olbrich
@ 2024-05-03 10:58 ` Michael Olbrich
2024-05-03 11:53 ` Alexander Dahl
2024-05-27 16:20 ` Robert Schwebel
2024-05-03 10:58 ` [DistroKit] [PATCH 3/3] tf-a-stm32mp13: don't use _BUILDDIR Michael Olbrich
2 siblings, 2 replies; 9+ messages in thread
From: Michael Olbrich @ 2024-05-03 10:58 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich, Ahmad Fatoum
It's already the same source since version and md5 a shared. So make
sure the exact same file is used and downloaded only once.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
configs/platform-v7a/rules/tf-a-stm32mp13.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configs/platform-v7a/rules/tf-a-stm32mp13.make b/configs/platform-v7a/rules/tf-a-stm32mp13.make
index d8a7e92de073..137dc8de3204 100644
--- a/configs/platform-v7a/rules/tf-a-stm32mp13.make
+++ b/configs/platform-v7a/rules/tf-a-stm32mp13.make
@@ -19,8 +19,8 @@ TF_A_STM32MP13_VERSION := $(call ptx/config-version, PTXCONF_TF_A)
TF_A_STM32MP13_MD5 := $(call ptx/config-md5, PTXCONF_TF_A)
TF_A_STM32MP13 := tf-a-stm32mp13-$(TF_A_STM32MP13_VERSION)
TF_A_STM32MP13_SUFFIX := tar.gz
-TF_A_STM32MP13_URL := https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/$(TF_A_STM32MP13_VERSION).$(TF_A_STM32MP13_SUFFIX)
-TF_A_STM32MP13_SOURCE := $(SRCDIR)/$(TF_A_STM32MP13).$(TF_A_STM32MP13_SUFFIX)
+TF_A_STM32MP13_URL = $(TF_A_URL)
+TF_A_STM32MP13_SOURCE = $(TF_A_SOURCE)
TF_A_STM32MP13_DIR := $(BUILDDIR)/$(TF_A_STM32MP13)
TF_A_STM32MP13_BUILDDIR := $(TF_A_STM32MP13_DIR)/build
TF_A_STM32MP13_BUILD_OOT := YES
--
2.39.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [DistroKit] [PATCH 3/3] tf-a-stm32mp13: don't use _BUILDDIR
2024-05-03 10:58 [DistroKit] [PATCH 0/3] tf-a-stm32mp13 cleanup Michael Olbrich
2024-05-03 10:58 ` [DistroKit] [PATCH 1/3] tf-a-stm32mp13: align variables Michael Olbrich
2024-05-03 10:58 ` [DistroKit] [PATCH 2/3] tf-a-stm32mp13: use _URL and _SOURCE from tf-a Michael Olbrich
@ 2024-05-03 10:58 ` Michael Olbrich
2024-05-27 16:20 ` Robert Schwebel
2 siblings, 1 reply; 9+ messages in thread
From: Michael Olbrich @ 2024-05-03 10:58 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich, Ahmad Fatoum
Thise variable name has a special meaning and is deprecated. Use
_BUILD_DIR instead.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
configs/platform-v7a/rules/tf-a-stm32mp13.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configs/platform-v7a/rules/tf-a-stm32mp13.make b/configs/platform-v7a/rules/tf-a-stm32mp13.make
index 137dc8de3204..c404cde890bb 100644
--- a/configs/platform-v7a/rules/tf-a-stm32mp13.make
+++ b/configs/platform-v7a/rules/tf-a-stm32mp13.make
@@ -22,7 +22,7 @@ TF_A_STM32MP13_SUFFIX := tar.gz
TF_A_STM32MP13_URL = $(TF_A_URL)
TF_A_STM32MP13_SOURCE = $(TF_A_SOURCE)
TF_A_STM32MP13_DIR := $(BUILDDIR)/$(TF_A_STM32MP13)
-TF_A_STM32MP13_BUILDDIR := $(TF_A_STM32MP13_DIR)/build
+TF_A_STM32MP13_BUILD_DIR := $(TF_A_STM32MP13_DIR)/build
TF_A_STM32MP13_BUILD_OOT := YES
TF_A_STM32MP13_LICENSE := BSD-3-Clause AND BSD-2-Clause \
AND (GPL-2.0-or-later OR BSD-2-Clause) \
@@ -78,7 +78,7 @@ $(STATEDIR)/tf-a-stm32mp13.compile:
tf-a-stm32mp13/inst_plat = $(foreach artifact, \
$(foreach pattern, $(TF_A_STM32MP13_ARTIFACTS), \
- $(wildcard $(TF_A_STM32MP13_BUILDDIR)/$(1)/$(if $(filter DEBUG=1,TF_A_STM32MP13_MAKE_OPT),debug,release)/$(pattern))), \
+ $(wildcard $(TF_A_STM32MP13_BUILD_DIR)/$(1)/$(if $(filter DEBUG=1,TF_A_STM32MP13_MAKE_OPT),debug,release)/$(pattern))), \
install -v -D -m 644 $(artifact) \
$(2)/$(1)-$(notdir $(artifact))$(ptx/nl))
--
2.39.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [DistroKit] [PATCH 2/3] tf-a-stm32mp13: use _URL and _SOURCE from tf-a
2024-05-03 10:58 ` [DistroKit] [PATCH 2/3] tf-a-stm32mp13: use _URL and _SOURCE from tf-a Michael Olbrich
@ 2024-05-03 11:53 ` Alexander Dahl
2024-05-03 12:06 ` Michael Olbrich
2024-05-27 16:20 ` Robert Schwebel
1 sibling, 1 reply; 9+ messages in thread
From: Alexander Dahl @ 2024-05-03 11:53 UTC (permalink / raw)
To: Michael Olbrich; +Cc: distrokit, Ahmad Fatoum
Hei hei,
Am Fri, May 03, 2024 at 12:58:43PM +0200 schrieb Michael Olbrich:
> It's already the same source since version and md5 a shared. So make
> sure the exact same file is used and downloaded only once.
>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ---
> configs/platform-v7a/rules/tf-a-stm32mp13.make | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/configs/platform-v7a/rules/tf-a-stm32mp13.make b/configs/platform-v7a/rules/tf-a-stm32mp13.make
> index d8a7e92de073..137dc8de3204 100644
> --- a/configs/platform-v7a/rules/tf-a-stm32mp13.make
> +++ b/configs/platform-v7a/rules/tf-a-stm32mp13.make
> @@ -19,8 +19,8 @@ TF_A_STM32MP13_VERSION := $(call ptx/config-version, PTXCONF_TF_A)
> TF_A_STM32MP13_MD5 := $(call ptx/config-md5, PTXCONF_TF_A)
> TF_A_STM32MP13 := tf-a-stm32mp13-$(TF_A_STM32MP13_VERSION)
> TF_A_STM32MP13_SUFFIX := tar.gz
> -TF_A_STM32MP13_URL := https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/$(TF_A_STM32MP13_VERSION).$(TF_A_STM32MP13_SUFFIX)
> -TF_A_STM32MP13_SOURCE := $(SRCDIR)/$(TF_A_STM32MP13).$(TF_A_STM32MP13_SUFFIX)
> +TF_A_STM32MP13_URL = $(TF_A_URL)
> +TF_A_STM32MP13_SOURCE = $(TF_A_SOURCE)
As stated before: this does only work if TF_A is enabled in
platformconfig. It will still break if TF_A_STM32MP13 is enabled, but TF_A
is not. (This was already broken in that way before this change.)
Greets
Alex
> TF_A_STM32MP13_DIR := $(BUILDDIR)/$(TF_A_STM32MP13)
> TF_A_STM32MP13_BUILDDIR := $(TF_A_STM32MP13_DIR)/build
> TF_A_STM32MP13_BUILD_OOT := YES
> --
> 2.39.2
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [DistroKit] [PATCH 2/3] tf-a-stm32mp13: use _URL and _SOURCE from tf-a
2024-05-03 11:53 ` Alexander Dahl
@ 2024-05-03 12:06 ` Michael Olbrich
0 siblings, 0 replies; 9+ messages in thread
From: Michael Olbrich @ 2024-05-03 12:06 UTC (permalink / raw)
To: distrokit, Ahmad Fatoum
On Fri, May 03, 2024 at 01:53:30PM +0200, Alexander Dahl wrote:
> Hei hei,
>
> Am Fri, May 03, 2024 at 12:58:43PM +0200 schrieb Michael Olbrich:
> > It's already the same source since version and md5 a shared. So make
> > sure the exact same file is used and downloaded only once.
> >
> > Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> > ---
> > configs/platform-v7a/rules/tf-a-stm32mp13.make | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/configs/platform-v7a/rules/tf-a-stm32mp13.make b/configs/platform-v7a/rules/tf-a-stm32mp13.make
> > index d8a7e92de073..137dc8de3204 100644
> > --- a/configs/platform-v7a/rules/tf-a-stm32mp13.make
> > +++ b/configs/platform-v7a/rules/tf-a-stm32mp13.make
> > @@ -19,8 +19,8 @@ TF_A_STM32MP13_VERSION := $(call ptx/config-version, PTXCONF_TF_A)
> > TF_A_STM32MP13_MD5 := $(call ptx/config-md5, PTXCONF_TF_A)
> > TF_A_STM32MP13 := tf-a-stm32mp13-$(TF_A_STM32MP13_VERSION)
> > TF_A_STM32MP13_SUFFIX := tar.gz
> > -TF_A_STM32MP13_URL := https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/$(TF_A_STM32MP13_VERSION).$(TF_A_STM32MP13_SUFFIX)
> > -TF_A_STM32MP13_SOURCE := $(SRCDIR)/$(TF_A_STM32MP13).$(TF_A_STM32MP13_SUFFIX)
> > +TF_A_STM32MP13_URL = $(TF_A_URL)
> > +TF_A_STM32MP13_SOURCE = $(TF_A_SOURCE)
>
> As stated before: this does only work if TF_A is enabled in
> platformconfig. It will still break if TF_A_STM32MP13 is enabled, but TF_A
> is not. (This was already broken in that way before this change.)
But the tf-a version use also reused, so it already breaks right now. This
is nothing new. We should either share it all on nothing.
Michael
>
> Greets
> Alex
>
> > TF_A_STM32MP13_DIR := $(BUILDDIR)/$(TF_A_STM32MP13)
> > TF_A_STM32MP13_BUILDDIR := $(TF_A_STM32MP13_DIR)/build
> > TF_A_STM32MP13_BUILD_OOT := YES
> > --
> > 2.39.2
> >
> >
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [DistroKit] [PATCH 1/3] tf-a-stm32mp13: align variables
2024-05-03 10:58 ` [DistroKit] [PATCH 1/3] tf-a-stm32mp13: align variables Michael Olbrich
@ 2024-05-27 16:19 ` Robert Schwebel
0 siblings, 0 replies; 9+ messages in thread
From: Robert Schwebel @ 2024-05-27 16:19 UTC (permalink / raw)
To: Michael Olbrich; +Cc: distrokit, Ahmad Fatoum
applied to next
On Fri, May 03, 2024 at 12:58:42PM +0200, Michael Olbrich wrote:
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ---
> configs/platform-v7a/rules/tf-a-stm32mp13.make | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/configs/platform-v7a/rules/tf-a-stm32mp13.make b/configs/platform-v7a/rules/tf-a-stm32mp13.make
> index 36feb25e6e76..d8a7e92de073 100644
> --- a/configs/platform-v7a/rules/tf-a-stm32mp13.make
> +++ b/configs/platform-v7a/rules/tf-a-stm32mp13.make
> @@ -15,16 +15,16 @@ PACKAGES-$(PTXCONF_TF_A_STM32MP13) += tf-a-stm32mp13
> #
> # Paths and names
> #
> -TF_A_STM32MP13_VERSION := $(call ptx/config-version, PTXCONF_TF_A)
> -TF_A_STM32MP13_MD5 := $(call ptx/config-md5, PTXCONF_TF_A)
> -TF_A_STM32MP13 := tf-a-stm32mp13-$(TF_A_STM32MP13_VERSION)
> -TF_A_STM32MP13_SUFFIX := tar.gz
> -TF_A_STM32MP13_URL := https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/$(TF_A_STM32MP13_VERSION).$(TF_A_STM32MP13_SUFFIX)
> -TF_A_STM32MP13_SOURCE := $(SRCDIR)/$(TF_A_STM32MP13).$(TF_A_STM32MP13_SUFFIX)
> -TF_A_STM32MP13_DIR := $(BUILDDIR)/$(TF_A_STM32MP13)
> -TF_A_STM32MP13_BUILDDIR := $(TF_A_STM32MP13_DIR)/build
> +TF_A_STM32MP13_VERSION := $(call ptx/config-version, PTXCONF_TF_A)
> +TF_A_STM32MP13_MD5 := $(call ptx/config-md5, PTXCONF_TF_A)
> +TF_A_STM32MP13 := tf-a-stm32mp13-$(TF_A_STM32MP13_VERSION)
> +TF_A_STM32MP13_SUFFIX := tar.gz
> +TF_A_STM32MP13_URL := https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/$(TF_A_STM32MP13_VERSION).$(TF_A_STM32MP13_SUFFIX)
> +TF_A_STM32MP13_SOURCE := $(SRCDIR)/$(TF_A_STM32MP13).$(TF_A_STM32MP13_SUFFIX)
> +TF_A_STM32MP13_DIR := $(BUILDDIR)/$(TF_A_STM32MP13)
> +TF_A_STM32MP13_BUILDDIR := $(TF_A_STM32MP13_DIR)/build
> TF_A_STM32MP13_BUILD_OOT := YES
> -TF_A_STM32MP13_LICENSE := BSD-3-Clause AND BSD-2-Clause \
> +TF_A_STM32MP13_LICENSE := BSD-3-Clause AND BSD-2-Clause \
> AND (GPL-2.0-or-later OR BSD-2-Clause) \
> AND (NCSA OR MIT) \
> AND Zlib \
> --
> 2.39.2
>
>
>
--
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] 9+ messages in thread
* Re: [DistroKit] [PATCH 2/3] tf-a-stm32mp13: use _URL and _SOURCE from tf-a
2024-05-03 10:58 ` [DistroKit] [PATCH 2/3] tf-a-stm32mp13: use _URL and _SOURCE from tf-a Michael Olbrich
2024-05-03 11:53 ` Alexander Dahl
@ 2024-05-27 16:20 ` Robert Schwebel
1 sibling, 0 replies; 9+ messages in thread
From: Robert Schwebel @ 2024-05-27 16:20 UTC (permalink / raw)
To: Michael Olbrich; +Cc: distrokit, Ahmad Fatoum
applied to next
On Fri, May 03, 2024 at 12:58:43PM +0200, Michael Olbrich wrote:
> It's already the same source since version and md5 a shared. So make
> sure the exact same file is used and downloaded only once.
>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ---
> configs/platform-v7a/rules/tf-a-stm32mp13.make | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/configs/platform-v7a/rules/tf-a-stm32mp13.make b/configs/platform-v7a/rules/tf-a-stm32mp13.make
> index d8a7e92de073..137dc8de3204 100644
> --- a/configs/platform-v7a/rules/tf-a-stm32mp13.make
> +++ b/configs/platform-v7a/rules/tf-a-stm32mp13.make
> @@ -19,8 +19,8 @@ TF_A_STM32MP13_VERSION := $(call ptx/config-version, PTXCONF_TF_A)
> TF_A_STM32MP13_MD5 := $(call ptx/config-md5, PTXCONF_TF_A)
> TF_A_STM32MP13 := tf-a-stm32mp13-$(TF_A_STM32MP13_VERSION)
> TF_A_STM32MP13_SUFFIX := tar.gz
> -TF_A_STM32MP13_URL := https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/$(TF_A_STM32MP13_VERSION).$(TF_A_STM32MP13_SUFFIX)
> -TF_A_STM32MP13_SOURCE := $(SRCDIR)/$(TF_A_STM32MP13).$(TF_A_STM32MP13_SUFFIX)
> +TF_A_STM32MP13_URL = $(TF_A_URL)
> +TF_A_STM32MP13_SOURCE = $(TF_A_SOURCE)
> TF_A_STM32MP13_DIR := $(BUILDDIR)/$(TF_A_STM32MP13)
> TF_A_STM32MP13_BUILDDIR := $(TF_A_STM32MP13_DIR)/build
> TF_A_STM32MP13_BUILD_OOT := YES
> --
> 2.39.2
>
>
>
--
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] 9+ messages in thread
* Re: [DistroKit] [PATCH 3/3] tf-a-stm32mp13: don't use _BUILDDIR
2024-05-03 10:58 ` [DistroKit] [PATCH 3/3] tf-a-stm32mp13: don't use _BUILDDIR Michael Olbrich
@ 2024-05-27 16:20 ` Robert Schwebel
0 siblings, 0 replies; 9+ messages in thread
From: Robert Schwebel @ 2024-05-27 16:20 UTC (permalink / raw)
To: Michael Olbrich; +Cc: distrokit, Ahmad Fatoum
applied to next
On Fri, May 03, 2024 at 12:58:44PM +0200, Michael Olbrich wrote:
> Thise variable name has a special meaning and is deprecated. Use
> _BUILD_DIR instead.
>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ---
> configs/platform-v7a/rules/tf-a-stm32mp13.make | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/configs/platform-v7a/rules/tf-a-stm32mp13.make b/configs/platform-v7a/rules/tf-a-stm32mp13.make
> index 137dc8de3204..c404cde890bb 100644
> --- a/configs/platform-v7a/rules/tf-a-stm32mp13.make
> +++ b/configs/platform-v7a/rules/tf-a-stm32mp13.make
> @@ -22,7 +22,7 @@ TF_A_STM32MP13_SUFFIX := tar.gz
> TF_A_STM32MP13_URL = $(TF_A_URL)
> TF_A_STM32MP13_SOURCE = $(TF_A_SOURCE)
> TF_A_STM32MP13_DIR := $(BUILDDIR)/$(TF_A_STM32MP13)
> -TF_A_STM32MP13_BUILDDIR := $(TF_A_STM32MP13_DIR)/build
> +TF_A_STM32MP13_BUILD_DIR := $(TF_A_STM32MP13_DIR)/build
> TF_A_STM32MP13_BUILD_OOT := YES
> TF_A_STM32MP13_LICENSE := BSD-3-Clause AND BSD-2-Clause \
> AND (GPL-2.0-or-later OR BSD-2-Clause) \
> @@ -78,7 +78,7 @@ $(STATEDIR)/tf-a-stm32mp13.compile:
>
> tf-a-stm32mp13/inst_plat = $(foreach artifact, \
> $(foreach pattern, $(TF_A_STM32MP13_ARTIFACTS), \
> - $(wildcard $(TF_A_STM32MP13_BUILDDIR)/$(1)/$(if $(filter DEBUG=1,TF_A_STM32MP13_MAKE_OPT),debug,release)/$(pattern))), \
> + $(wildcard $(TF_A_STM32MP13_BUILD_DIR)/$(1)/$(if $(filter DEBUG=1,TF_A_STM32MP13_MAKE_OPT),debug,release)/$(pattern))), \
> install -v -D -m 644 $(artifact) \
> $(2)/$(1)-$(notdir $(artifact))$(ptx/nl))
>
> --
> 2.39.2
>
>
>
--
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] 9+ messages in thread
end of thread, other threads:[~2024-05-27 16:20 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-03 10:58 [DistroKit] [PATCH 0/3] tf-a-stm32mp13 cleanup Michael Olbrich
2024-05-03 10:58 ` [DistroKit] [PATCH 1/3] tf-a-stm32mp13: align variables Michael Olbrich
2024-05-27 16:19 ` Robert Schwebel
2024-05-03 10:58 ` [DistroKit] [PATCH 2/3] tf-a-stm32mp13: use _URL and _SOURCE from tf-a Michael Olbrich
2024-05-03 11:53 ` Alexander Dahl
2024-05-03 12:06 ` Michael Olbrich
2024-05-27 16:20 ` Robert Schwebel
2024-05-03 10:58 ` [DistroKit] [PATCH 3/3] tf-a-stm32mp13: don't use _BUILDDIR Michael Olbrich
2024-05-27 16:20 ` Robert Schwebel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox