diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-17 14:06:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-18 17:17:01 -0400 |
| commit | 7452946e7f3742b3ff1cb4a50603e7492aceea88 (patch) | |
| tree | f6b887f940dc43fc18618be52378c4c074a78ec8 /scripts/Makefile.lib | |
| parent | fa8967cfbaed5582ba987756fa9f0470a9affbf4 (diff) | |
| download | u-boot-7452946e7f3742b3ff1cb4a50603e7492aceea88.tar.gz u-boot-7452946e7f3742b3ff1cb4a50603e7492aceea88.tar.bz2 u-boot-7452946e7f3742b3ff1cb4a50603e7492aceea88.zip | |
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>
Diffstat (limited to 'scripts/Makefile.lib')
| -rw-r--r-- | scripts/Makefile.lib | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 23be324369..774aa89a3f 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -308,10 +308,10 @@ $(obj)/%.dtb.S: $(obj)/%.dtb quiet_cmd_dtc = DTC $@ # Modified for U-Boot -# Bring in any U-Boot-specific include after the '/dts-v1/;' header +# Bring in any U-Boot-specific include at the end of the file cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ cat $< $(if $(u_boot_dtsi),\ - | sed '/^\/ {$$/{x;s%$$%\#include \"$(u_boot_dtsi)\"%;G;}') | \ + | sed "$$ a\#include \"$(u_boot_dtsi)\"") | \ $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) - ; \ $(DTC) -O dtb -o $@ -b 0 \ -i $(dir $<) $(DTC_FLAGS) \ |