From: Sumit Garg <sumit.garg@linaro.org>
To: u-boot@lists.denx.de, u-boot-amlogic@groups.io,
u-boot-custodians@lists.denx.de
Cc: trini@konsulko.com, sjg@chromium.org, robh+dt@kernel.org,
krzysztof.kozlowski+dt@linaro.org, conor@kernel.org,
neil.armstrong@linaro.org, caleb.connolly@linaro.org,
ff@shokubai.tech, daniel.thompson@linaro.org,
dgilmore@fedoraproject.org, pbrobinson@gmail.com,
ilias.apalodimas@linaro.org, b.galvani@gmail.com,
xypron.glpk@gmx.de, michal.simek@amd.com, seanga2@gmail.com,
rasmus.villemoes@prevas.dk, peng.fan@nxp.com,
jh80.chung@samsung.com, rfried.dev@gmail.com, marex@denx.de,
mibodhi@gmail.com, bb@ti.com, mark.kettenis@xs4all.nl,
festevam@gmail.com, nm@ti.com, andre.przywara@arm.com,
ijc@hellion.org.uk, paul.barker.ct@bp.renesas.com,
Sumit Garg <sumit.garg@linaro.org>
Subject: [PATCH v6 03/11] scripts/Makefile.lib: Statically define *-u-boot.dtsi files location
Date: Thu, 22 Feb 2024 15:05:59 +0530 [thread overview]
Message-ID: <20240222093607.3085545-4-sumit.garg@linaro.org> (raw)
In-Reply-To: <20240222093607.3085545-1-sumit.garg@linaro.org>
Allow u-boot to build DTB from a different directory tree such that
*-u-boot.dtsi files can be included from a common location. Currently
that location is arch/$(ARCH)/dts/, so statically define that common
location.
This is needed for platform owners to start building DTB files from
devicetree-rebasing directory but still being able to include
*-u-boot.dtsi files.
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
---
Changes in v6:
- Incorporate fix for sandbox CI failure.
Changes in v5:
- None
Changes in v4:
- Incorporate fix to resolve rk3399 migration issue reported by Simon.
Changes in v3:
- Picked up review tags
Changes in v2:
- s/UBOOT_DTSI_LOC/u_boot_dtsi_loc/
scripts/Makefile.lib | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index f82b3169e874..9e38d75443c9 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -159,18 +159,20 @@ cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(UBOOTINCLUDE) \
ld_flags = $(KBUILD_LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F))
# Try these files in order to find the U-Boot-specific .dtsi include file
-u_boot_dtsi_options = $(strip $(wildcard $(dir $<)$(basename $(notdir $<))-u-boot.dtsi) \
- $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi) \
- $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi) \
- $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi) \
- $(wildcard $(dir $<)u-boot.dtsi))
+u_boot_dtsi_loc = $(srctree)/arch/$(ARCH)/dts/
+
+u_boot_dtsi_options = $(strip $(wildcard $(u_boot_dtsi_loc)$(basename $(notdir $<))-u-boot.dtsi) \
+ $(wildcard $(u_boot_dtsi_loc)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi) \
+ $(wildcard $(u_boot_dtsi_loc)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi) \
+ $(wildcard $(u_boot_dtsi_loc)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi) \
+ $(wildcard $(u_boot_dtsi_loc)u-boot.dtsi))
u_boot_dtsi_options_raw = $(warning Automatic .dtsi inclusion: options: \
- $(dir $<)$(basename $(notdir $<))-u-boot.dtsi \
- $(dir $<)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi \
- $(dir $<)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi \
- $(dir $<)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi \
- $(dir $<)u-boot.dtsi ... \
+ $(u_boot_dtsi_loc)$(basename $(notdir $<))-u-boot.dtsi \
+ $(u_boot_dtsi_loc)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi \
+ $(u_boot_dtsi_loc)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi \
+ $(u_boot_dtsi_loc)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi \
+ $(u_boot_dtsi_loc)u-boot.dtsi ... \
found: $(if $(u_boot_dtsi_options),"$(u_boot_dtsi_options)",nothing!))
# Uncomment for debugging
@@ -190,6 +192,7 @@ dtsi_include_list += $(CONFIG_DEVICE_TREE_INCLUDES)
dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \
$(UBOOTINCLUDE) \
-I$(dir $<) \
+ -I$(u_boot_dtsi_loc) \
-I$(srctree)/arch/$(ARCH)/dts/include \
-I$(srctree)/include \
-D__ASSEMBLY__ \
@@ -328,7 +331,7 @@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
echo '$(pound)include "$(f)"' >> $(pre-tmp);) \
$(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $(pre-tmp) ; \
$(DTC) -O dtb -o $@ -b 0 \
- -i $(dir $<) $(DTC_FLAGS) \
+ -i $(dir $<) -i $(u_boot_dtsi_loc) $(DTC_FLAGS) \
-d $(depfile).dtc.tmp $(dtc-tmp) || \
(echo "Check $(shell pwd)/$(pre-tmp) for errors" && false) \
; \
@@ -350,12 +353,13 @@ capsule_esl_input_file=$(srctree)/lib/efi_loader/capsule_esl.dtsi.in
capsule_esl_dtsi = .capsule_esl.dtsi
capsule_esl_path=$(abspath $(srctree)/$(subst $(quote),,$(CONFIG_EFI_CAPSULE_ESL_FILE)))
+dtsi_include_list_deps := $(addprefix $(u_boot_dtsi_loc),$(subst $(quote),,$(dtsi_include_list)))
+
ifdef CONFIG_EFI_CAPSULE_AUTHENTICATE
dtsi_include_list += $(capsule_esl_dtsi)
+dtsi_include_list_deps += $(obj)/$(capsule_esl_dtsi)
endif
-dtsi_include_list_deps = $(addprefix $(obj)/,$(subst $(quote),,$(dtsi_include_list)))
-
ifneq ($(CHECK_DTBS),)
DT_CHECKER ?= dt-validate
DT_CHECKER_FLAGS ?= $(if $(DT_SCHEMA_FILES),-l $(DT_SCHEMA_FILES),-m)
--
2.34.1
next prev parent reply other threads:[~2024-02-26 8:49 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-22 9:35 [PATCH v6 00/11] An effort to bring DT bindings compliance within U-Boot Sumit Garg
2024-02-22 9:35 ` [PATCH v6 01/11] CI: Exclude devicetree-rebasing subtree for CONFIG checks Sumit Garg
2024-02-22 9:35 ` [PATCH v6 02/11] Makefile: Add support for DT bindings schema checks Sumit Garg
2024-02-22 9:35 ` Sumit Garg [this message]
2024-02-22 9:36 ` [PATCH v6 04/11] Makefile: Allow upstream DT subtree to provide DT includes Sumit Garg
2024-02-22 9:36 ` [PATCH v6 05/11] dts: Add alternative location for upstream DTB builds Sumit Garg
2024-02-22 9:36 ` [PATCH v6 06/11] dts: Add script to uprev dts/upstream subtree Sumit Garg
2024-02-22 9:36 ` [PATCH v6 07/11] doc: devicetree: Align documentation to use Kconfig options Sumit Garg
2024-02-22 9:36 ` [PATCH v6 08/11] doc: devicetree: Updates for devicetree-rebasing subtree Sumit Garg
[not found] ` <2776f554-c19f-4974-aa9e-87279a6dfbfc@bp.renesas.com>
2024-02-28 9:20 ` Sumit Garg
2024-02-22 9:36 ` [PATCH v6 09/11] MAINTAINERS: Add myself as devicetree-rebasing maintainer Sumit Garg
2024-02-22 9:36 ` [PATCH v6 10/11] dts: meson-gxbb: Switch to using upstream DT Sumit Garg
2024-02-22 9:36 ` [PATCH v6 11/11] dts: meson-gxbb: Drop redundant devicetree files Sumit Garg
2024-03-01 6:17 ` [PATCH v6 00/11] An effort to bring DT bindings compliance within U-Boot Sumit Garg
2024-03-01 12:57 ` Tom Rini
2024-03-01 13:30 ` Sumit Garg
2024-03-01 13:48 ` neil.armstrong
2024-03-01 14:53 ` Sumit Garg
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=20240222093607.3085545-4-sumit.garg@linaro.org \
--to=sumit.garg@linaro.org \
--cc=andre.przywara@arm.com \
--cc=b.galvani@gmail.com \
--cc=bb@ti.com \
--cc=caleb.connolly@linaro.org \
--cc=conor@kernel.org \
--cc=daniel.thompson@linaro.org \
--cc=dgilmore@fedoraproject.org \
--cc=festevam@gmail.com \
--cc=ff@shokubai.tech \
--cc=ijc@hellion.org.uk \
--cc=ilias.apalodimas@linaro.org \
--cc=jh80.chung@samsung.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=marex@denx.de \
--cc=mark.kettenis@xs4all.nl \
--cc=mibodhi@gmail.com \
--cc=michal.simek@amd.com \
--cc=neil.armstrong@linaro.org \
--cc=nm@ti.com \
--cc=paul.barker.ct@bp.renesas.com \
--cc=pbrobinson@gmail.com \
--cc=peng.fan@nxp.com \
--cc=rasmus.villemoes@prevas.dk \
--cc=rfried.dev@gmail.com \
--cc=robh+dt@kernel.org \
--cc=seanga2@gmail.com \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot-amlogic@groups.io \
--cc=u-boot-custodians@lists.denx.de \
--cc=u-boot@lists.denx.de \
--cc=xypron.glpk@gmx.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).