From mboxrd@z Thu Jan 1 00:00:00 1970 From: Klaus Heinrich Kiwi Date: Tue, 9 Feb 2021 15:41:55 -0300 Subject: [PATCH 3/3] Makefile: Add (default) DEVICE_TREE to SPL FIT In-Reply-To: <20210209184155.1306281-1-klaus@linux.vnet.ibm.com> References: <20210209184155.1306281-1-klaus@linux.vnet.ibm.com> Message-ID: <20210209184155.1306281-4-klaus@linux.vnet.ibm.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 --- 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