From: Tom Rini Date: Wed, 17 May 2017 18:06:08 +0000 (-0400) Subject: scripts/Makefile.lib: Always have ...-u-boot.dtsi be able to override X-Git-Tag: v2017.07-rc1~252 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7452946e7f3742b3ff1cb4a50603e7492aceea88;p=u-boot 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 Cc: Simon Glass Signed-off-by: Tom Rini Tested-by: Jean-Jacques Hiblot Reviewed-by: Simon Glass --- 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) \