8f68caf8fd9312c14900694afc7e4a573f3971af
[openwrt/openwrt.git] / package / boot / uboot-sunxi / patches / 211-Revert-scripts-Makefile.lib-Always-have-.-u-boot.dts.patch
1 From cdee74ad13e933631caf7f544c319d8e981c6063 Mon Sep 17 00:00:00 2001
2 From: Hauke Mehrtens <hauke@hauke-m.de>
3 Date: Thu, 20 Jul 2017 19:49:25 +0200
4 Subject: [PATCH 211/213] Revert "scripts/Makefile.lib: Always have
5 ...-u-boot.dtsi be able to override"
6
7 This reverts commit 7452946e7f3742b3ff1cb4a50603e7492aceea88.
8 ---
9 scripts/Makefile.lib | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
13 index 80ddb08474..66f8dcbe07 100644
14 --- a/scripts/Makefile.lib
15 +++ b/scripts/Makefile.lib
16 @@ -306,10 +306,10 @@ $(obj)/%.dtb.S: $(obj)/%.dtb
17
18 quiet_cmd_dtc = DTC $@
19 # Modified for U-Boot
20 -# Bring in any U-Boot-specific include at the end of the file
21 +# Bring in any U-Boot-specific include after the '/dts-v1/;' header
22 cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
23 cat $< $(if $(u_boot_dtsi),\
24 - | sed "$$ a\#include \"$(u_boot_dtsi)\"") | \
25 + | sed '/^\/ {$$/{x;s%$$%\#include \"$(u_boot_dtsi)\"%;G;}') | \
26 $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) - ; \
27 $(DTC) -O dtb -o $@ -b 0 \
28 -i $(dir $<) $(DTC_FLAGS) \
29 --
30 2.11.0
31