public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com>
To: u-boot@lists.denx.de
Subject: [PATCH 3/3] Makefile: Add (default) DEVICE_TREE to SPL FIT
Date: Tue,  9 Feb 2021 15:41:55 -0300	[thread overview]
Message-ID: <20210209184155.1306281-4-klaus@linux.vnet.ibm.com> (raw)
In-Reply-To: <20210209184155.1306281-1-klaus@linux.vnet.ibm.com>

U-boot allows the default device tree to be overridden from
the build environment using the DEVICE_TREE variable.

Make sure that we include it in the SPL FIT mkimage build step.

This also fixes a broken image in case CONFIG_OF_LIST and
CONFIG_OF_OVERLAY_LIST are unset (i.e., expected to be supplied
by the DEVICE_TREE env var).

Signed-off-by: Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com>
---

 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index ebbedb1fb1..116d03947a 100644
--- a/Makefile
+++ b/Makefile
@@ -1386,6 +1386,7 @@ MKIMAGEFLAGS_u-boot.img = -f auto -A $(ARCH) -T firmware -C none -O u-boot \
 	-a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \
 	-p $(CONFIG_FIT_EXTERNAL_OFFSET) \
 	-n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" -E \
+	$(patsubst %,-b arch/$(ARCH)/dts/%.dtb,$(subst ",,$(DEVICE_TREE))) \
 	$(patsubst %,-b arch/$(ARCH)/dts/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) \
 	$(patsubst %,-b arch/$(ARCH)/dts/%.dtbo,$(subst ",,$(CONFIG_OF_OVERLAY_LIST)))
 else
-- 
2.25.1

  parent reply	other threads:[~2021-02-09 18:41 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-09 18:41 [PATCH 0/3] Misc fixes for SPL_FIT_SIGNATURE builds Klaus Heinrich Kiwi
2021-02-09 18:41 ` [PATCH 1/3] Kconfig: SPL_FIT_SIGNATURE selects FIT_SIGNATURE Klaus Heinrich Kiwi
2021-02-25 13:25   ` Tom Rini
2021-02-09 18:41 ` [PATCH 2/3] Kconfig: SPL_FIT_SIGNATURE requires SPL_LOAD_FIT Klaus Heinrich Kiwi
2021-02-25 13:25   ` Tom Rini
2021-02-09 18:41 ` Klaus Heinrich Kiwi [this message]
2021-02-25 13:25   ` [PATCH 3/3] Makefile: Add (default) DEVICE_TREE to SPL FIT Tom Rini

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=20210209184155.1306281-4-klaus@linux.vnet.ibm.com \
    --to=klaus@linux.vnet.ibm.com \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox