Commit 7452946e7f3742b3ff1cb4a50603e7492aceea88
1 parent
fa8967cfba
Exists in
smarc_8mq_lf_v2020.04
and in
17 other branches
scripts/Makefile.lib: Always have ...-u-boot.dtsi be able to override
The intention of having a -u-boot.dtsi file is to be able to make changes to the provided upstream dts files as well as to be able to add nodes. Change the logic for adding the file from making it the last included file at the top of the dts to being included at the end of the file. Cc: Jean-Jacques Hiblot <jjhiblot@ti.com> Cc: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Rini <trini@konsulko.com> Tested-by: Jean-Jacques Hiblot <jjhiblot@ti.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff
scripts/Makefile.lib
| ... | ... | @@ -308,10 +308,10 @@ |
| 308 | 308 | |
| 309 | 309 | quiet_cmd_dtc = DTC $@ |
| 310 | 310 | # Modified for U-Boot |
| 311 | -# Bring in any U-Boot-specific include after the '/dts-v1/;' header | |
| 311 | +# Bring in any U-Boot-specific include at the end of the file | |
| 312 | 312 | cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ |
| 313 | 313 | cat $< $(if $(u_boot_dtsi),\ |
| 314 | - | sed '/^\/ {$$/{x;s%$$%\#include \"$(u_boot_dtsi)\"%;G;}') | \ | |
| 314 | + | sed "$$ a\#include \"$(u_boot_dtsi)\"") | \ | |
| 315 | 315 | $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) - ; \ |
| 316 | 316 | $(DTC) -O dtb -o $@ -b 0 \ |
| 317 | 317 | -i $(dir $<) $(DTC_FLAGS) \ |