All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [PATCH v2 12/21] Makefile: Pass new entry args to binman
Date: Mon, 15 Mar 2021 20:26:17 +1300	[thread overview]
Message-ID: <20210315072627.2101110-13-sjg@chromium.org> (raw)
In-Reply-To: <20210315072627.2101110-1-sjg@chromium.org>

To support the use of 'expanded' entries, binman needs to be told whether
SPL and TPL have a devicetree and whether they need BSS padding. Add these
to the Makefile.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

(no changes since v1)

 Makefile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Makefile b/Makefile
index 655de412e9a..07e43a6b09f 100644
--- a/Makefile
+++ b/Makefile
@@ -1332,6 +1332,11 @@ u-boot.ldr:	u-boot
 # Use 'make BINMAN_DEBUG=1' to enable debugging
 # Use 'make BINMAN_VERBOSE=3' to set vebosity level
 default_dt := $(if $(DEVICE_TREE),$(DEVICE_TREE),$(CONFIG_DEFAULT_DEVICE_TREE))
+
+# Tell binman whether we have a devicetree for SPL and TPL
+have_spl_dt := $(if $(CONFIG_SPL_OF_PLATDATA),,$(CONFIG_SPL_OF_CONTROL))
+have_tpl_dt := $(if $(CONFIG_TPL_OF_PLATDATA),,$(CONFIG_TPL_OF_CONTROL))
+
 quiet_cmd_binman = BINMAN  $@
 cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \
                 --toolpath $(objtree)/tools \
@@ -1342,6 +1347,9 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \
 		-a atf-bl31-path=${BL31} \
 		-a default-dt=$(default_dt) \
 		-a scp-path=$(SCP) \
+		-a spl-bss-pad=$(if $(CONFIG_SPL_SEPARATE_BSS),,1) \
+		-a tpl-bss-pad=$(if $(CONFIG_TPL_SEPARATE_BSS),,1) \
+		-a spl-dtb=$(have_spl_dt) -a tpl-dtb=$(have_tpl_dt) \
 		$(BINMAN_$(@F))
 
 OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihex
-- 
2.31.0.rc2.261.g7f71774620-goog

  parent reply	other threads:[~2021-03-15  7:26 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-15  7:26 [PATCH v2 00/21] binman: Support devicetree update in all entries Simon Glass
2021-03-15  7:26 ` [PATCH v2 01/21] binman: Allow extracting to current directory Simon Glass
2021-03-15  7:26 ` [PATCH v2 02/21] binman: Document ExpandEntries() in the base class Simon Glass
2021-03-15  7:26 ` [PATCH v2 03/21] binman: Update entry help for files-align Simon Glass
2021-03-15  7:26 ` [PATCH v2 04/21] binman: Tidy up underscores in entry documentation Simon Glass
2021-03-15  7:26 ` [PATCH v2 05/21] binman: Correct the documentation for u-boot-spl-bss-pad Simon Glass
2021-03-15  7:26 ` [PATCH v2 06/21] binman: Add support for u-boot-tpl-nodtb Simon Glass
2021-03-15  7:26 ` [PATCH v2 07/21] binman: Add support for u-boot-tpl-bss-bad Simon Glass
2021-03-15  7:26 ` [PATCH v2 08/21] binman: Allow using an an 'expanded' entry type Simon Glass
2021-03-15  7:26 ` [PATCH v2 09/21] binman: Allow a way to select expanded entries Simon Glass
2021-03-15  7:26 ` [PATCH v2 10/21] binman: Plumb expanded entries through fully Simon Glass
2021-03-15  7:26 ` [PATCH v2 11/21] binman: Automatically expand phase binaries into sections Simon Glass
2021-03-15  7:26 ` Simon Glass [this message]
2021-03-15  7:26 ` [PATCH v2 13/21] x86: Make use of binman expanded entries Simon Glass
2021-03-15  7:26 ` [PATCH v2 14/21] x86: dts: Drop unused CONFIG_SPL Simon Glass
2021-03-15  7:26 ` [PATCH v2 15/21] doc: Move UEFI under develop/ Simon Glass
2021-03-17  7:46   ` Heinrich Schuchardt
2021-03-18  6:36     ` Simon Glass
2021-03-15  7:26 ` [PATCH v2 16/21] doc: Move driver model docs " Simon Glass
2021-03-15  7:26 ` [PATCH v2 17/21] binman: doc: Add documentation to htmldocs Simon Glass
2021-03-15  7:26 ` [PATCH v2 18/21] binman: Rearrange documentation into headings Simon Glass
2021-03-15  7:26 ` [PATCH v2 19/21] binman: Incorporate entry documentation Simon Glass
2021-03-15  7:26 ` [PATCH v2 20/21] binman: Drop repetitive heading for each entry Simon Glass
2021-03-15  7:26 ` [PATCH v2 21/21] binman: Update various pieces of the documentation Simon Glass
2021-03-17  1:29 ` Simon Glass
2021-03-17  1:29 ` [PATCH v2 20/21] binman: Drop repetitive heading for each entry Simon Glass
2021-03-17  1:29 ` [PATCH v2 19/21] binman: Incorporate entry documentation Simon Glass
2021-03-17  1:29 ` [PATCH v2 18/21] binman: Rearrange documentation into headings Simon Glass
2021-03-17  1:29 ` [PATCH v2 17/21] binman: doc: Add documentation to htmldocs Simon Glass
2021-03-17  1:29 ` [PATCH v2 16/21] doc: Move driver model docs under develop/ Simon Glass
2021-03-17  1:29 ` [PATCH v2 15/21] doc: Move UEFI " Simon Glass
2021-03-17  1:29 ` [PATCH v2 14/21] x86: dts: Drop unused CONFIG_SPL Simon Glass
2021-03-17  1:29 ` [PATCH v2 13/21] x86: Make use of binman expanded entries Simon Glass
2021-03-17  1:29 ` [PATCH v2 12/21] Makefile: Pass new entry args to binman Simon Glass
2021-03-17  1:29 ` [PATCH v2 11/21] binman: Automatically expand phase binaries into sections Simon Glass
2021-03-17  1:29 ` [PATCH v2 10/21] binman: Plumb expanded entries through fully Simon Glass
2021-03-17  1:29 ` [PATCH v2 09/21] binman: Allow a way to select expanded entries Simon Glass
2021-03-17  1:29 ` [PATCH v2 08/21] binman: Allow using an an 'expanded' entry type Simon Glass
2021-03-17  1:30 ` [PATCH v2 07/21] binman: Add support for u-boot-tpl-bss-bad Simon Glass
2021-03-17  1:30 ` [PATCH v2 06/21] binman: Add support for u-boot-tpl-nodtb Simon Glass
2021-03-17  1:30 ` [PATCH v2 05/21] binman: Correct the documentation for u-boot-spl-bss-pad Simon Glass
2021-03-17  1:30 ` [PATCH v2 04/21] binman: Tidy up underscores in entry documentation Simon Glass
2021-03-17  1:30 ` [PATCH v2 03/21] binman: Update entry help for files-align Simon Glass
2021-03-17  1:30 ` [PATCH v2 02/21] binman: Document ExpandEntries() in the base class Simon Glass
2021-03-17  1:30 ` [PATCH v2 01/21] binman: Allow extracting to current directory Simon Glass

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=20210315072627.2101110-13-sjg@chromium.org \
    --to=sjg@chromium.org \
    --cc=u-boot@lists.denx.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.