mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] tf-a: Allow to build for multiple platforms
Date: Thu, 24 Sep 2020 11:31:24 +0200	[thread overview]
Message-ID: <20200924093124.15911-1-s.hauer@pengutronix.de> (raw)

A single ptxdist build can be for multiple platforms, so allow to
compile the ARM trusted firmware for multiple platforms as well.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 platforms/tf-a.in |  6 +++---
 rules/tf-a.make   | 28 ++++++++++++++++++----------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/platforms/tf-a.in b/platforms/tf-a.in
index ba04f44be..0936319f1 100644
--- a/platforms/tf-a.in
+++ b/platforms/tf-a.in
@@ -58,11 +58,11 @@ config TF_A_ARM_ARCH_MAJOR
         default 8 if TF_A_ARM_ARCH_MAJOR_8
 
 
-config TF_A_PLATFORM
+config TF_A_PLATFORMS
 	string
-	prompt "TF-A target platform"
+	prompt "TF-A target platforms"
 	help
-	  The TF-A target platform.
+	  A space separated list of TF-A target platforms.
 
 config TF_A_ARM_ARCH_MINOR
 	depends on TF_A_ARM_ARCH_MAJOR_8 || TF_A_ARM_ARCH_MAJOR_8_32_BIT
diff --git a/rules/tf-a.make b/rules/tf-a.make
index 91b2eca9f..843a46776 100644
--- a/rules/tf-a.make
+++ b/rules/tf-a.make
@@ -34,7 +34,7 @@ TF_A_LICENSE	:= BSD-3-Clause AND BSD-2-Clause \
 # Prepare
 # ----------------------------------------------------------------------------
 
-TF_A_PLATFORM		:= $(call remove_quotes, $(PTXCONF_TF_A_PLATFORM))
+TF_A_PLATFORMS		:= $(call remove_quotes, $(PTXCONF_TF_A_PLATFORMS))
 TF_A_ARTIFACTS		:= $(call remove_quotes, $(PTXCONF_TF_A_ARTIFACTS))
 
 TF_A_WRAPPER_BLACKLIST	:= \
@@ -45,7 +45,6 @@ TF_A_MAKE_OPT	:= \
 	-C $(TF_A_DIR) \
 	CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \
 	HOSTCC=$(HOSTCC) \
-	PLAT=$(TF_A_PLATFORM) \
 	DEBUG=0 \
 	ARCH=$(PTXCONF_TF_A_ARCH_STRING) \
 	ARM_ARCH_MAJOR=$(PTXCONF_TF_A_ARM_ARCH_MAJOR) \
@@ -77,18 +76,29 @@ TF_A_CONF_TOOL	:= NO
 
 TF_A_MAKE_ENV	:= $(CROSS_ENV)
 
+$(STATEDIR)/tf-a.compile:
+	@$(call targetinfo)
+
+	@$(foreach plat, $(TF_A_PLATFORMS), \
+		$(call compile, TF_A, \
+		$(TF_A_MAKE_OPT) PLAT=$(plat))$(ptx/nl))
+
+	@$(call touch)
+
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
-TF_A_BUILD_OUTPUT_DIR	:= $(TF_A_BUILDDIR)/$(TF_A_PLATFORM)/release
-TF_A_ARTIFACTS_SRC	 = $(wildcard $(addprefix $(TF_A_BUILD_OUTPUT_DIR)/,$(TF_A_ARTIFACTS)))
+inst_plat = $(foreach artifact, \
+	$(wildcard $(TF_A_BUILDDIR)/$(1)/release/$(TF_A_ARTIFACTS)), \
+	install -v -D -m 644 $(artifact) \
+		$(2)/$(1)-$(notdir $(artifact))$(ptx/nl))
+
+inst_bins = $(foreach plat, $(TF_A_PLATFORMS), $(call inst_plat,$(plat),$(1)))
 
 $(STATEDIR)/tf-a.install:
 	@$(call targetinfo)
-	@$(foreach artifact, $(TF_A_ARTIFACTS_SRC), \
-		install -v -D -m 644 $(artifact) \
-		$(TF_A_PKGDIR)/usr/lib/firmware/$(notdir $(artifact))$(ptx/nl))
+	@$(call inst_bins,$(TF_A_PKGDIR)/usr/lib/firmware)
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
@@ -97,9 +107,7 @@ $(STATEDIR)/tf-a.install:
 
 $(STATEDIR)/tf-a.targetinstall:
 	@$(call targetinfo)
-	@$(foreach artifact, $(TF_A_ARTIFACTS_SRC), \
-		install -v -D -m 644 $(artifact) \
-		$(IMAGEDIR)/$(notdir $(artifact))$(ptx/nl))
+	@$(call inst_bins,$(IMAGEDIR))
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
-- 
2.28.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

             reply	other threads:[~2020-09-24  9:31 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-24  9:31 Sascha Hauer [this message]
2020-09-24 13:55 ` Michael Olbrich
2020-09-25  6:11   ` Sascha Hauer
2020-09-25  7:18     ` Michael Olbrich
2020-09-24 14:44 ` Guillermo Rodriguez Garcia
2020-09-25  6:17   ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200924093124.15911-1-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox