| Message ID | 20240408212843.95871-1-j-humphreys@ti.com |
|---|---|
| State | Accepted |
| Commit | d31ff219a8331db96e8556e91a351566cafc6509 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Makefile.lib: find capsule ESL dtsi file with CONFIG_OF_UPSTREAM | expand |
On Mon, 08 Apr 2024 16:28:43 -0500, Jonathan Humphreys wrote: > When CONFIG_OF_UPSTREAM is enabled, DTS files are in SOC subdirectories (vs the > top level dts directory), but when CONFIG_EFI_CAPSULE_AUTHENTICATE is enabled, > the dynamically created dtsi file containing the capsule ESL DT node is in the > parent directory. This results in a build failure because the #include inserted > in the DTS file is local to the current directory. Update Makefile to have the > DT preprocessing of #includes search in the parent (dts top level) directory > too. > > [...] Applied to u-boot/master, thanks!
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 12857316c58..62f87517c09 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -334,7 +334,7 @@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ (cat $< > $(pre-tmp)); \ $(foreach f,$(subst $(quote),,$(dtsi_include_list)), \ echo '$(pound)include "$(f)"' >> $(pre-tmp);) \ - $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $(pre-tmp) ; \ + $(HOSTCC) -E $(dtc_cpp_flags) -I$(obj) -x assembler-with-cpp -o $(dtc-tmp) $(pre-tmp) ; \ $(DTC) -O dtb -o $@ -b 0 \ -i $(dir $<) -i $(u_boot_dtsi_loc) $(DTC_FLAGS) \ -d $(depfile).dtc.tmp $(dtc-tmp) || \
When CONFIG_OF_UPSTREAM is enabled, DTS files are in SOC subdirectories (vs the top level dts directory), but when CONFIG_EFI_CAPSULE_AUTHENTICATE is enabled, the dynamically created dtsi file containing the capsule ESL DT node is in the parent directory. This results in a build failure because the #include inserted in the DTS file is local to the current directory. Update Makefile to have the DT preprocessing of #includes search in the parent (dts top level) directory too. Signed-off-by: Jonathan Humphreys <j-humphreys@ti.com> --- scripts/Makefile.lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)