aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-sunxi/patches/211-Revert-scripts-Makefile.lib-Always-have-.-u-boot.dts.patch
diff options
context:
space:
mode:
authorZoltan HERPAI <wigyori@uid0.hu>2018-02-05 17:02:49 +0100
committerZoltan HERPAI <wigyori@uid0.hu>2018-03-21 17:07:06 +0100
commit7e1e29de757b23de7befc54e2bfc01e60b903170 (patch)
tree1440e39f8d1127e0365c18dc3ab2c2c0306ffea8 /package/boot/uboot-sunxi/patches/211-Revert-scripts-Makefile.lib-Always-have-.-u-boot.dts.patch
parentbfc6514e948cd357191c115ac4dac4fc11937ac4 (diff)
downloadupstream-7e1e29de757b23de7befc54e2bfc01e60b903170.tar.gz
upstream-7e1e29de757b23de7befc54e2bfc01e60b903170.tar.bz2
upstream-7e1e29de757b23de7befc54e2bfc01e60b903170.zip
uboot-sunxi: bump again to 2017.11
Runtime-tested on: - Pine64 (A64) - Orange Pi 2 (H3) - Bananapro (A20) - Olimex A20-Micro (A20) - Pcduino v3 (A20) - Pcduino v2 (A10) Compile-tested on: - all A8/A7/A53 boards Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
Diffstat (limited to 'package/boot/uboot-sunxi/patches/211-Revert-scripts-Makefile.lib-Always-have-.-u-boot.dts.patch')
-rw-r--r--package/boot/uboot-sunxi/patches/211-Revert-scripts-Makefile.lib-Always-have-.-u-boot.dts.patch26
1 files changed, 0 insertions, 26 deletions
diff --git a/package/boot/uboot-sunxi/patches/211-Revert-scripts-Makefile.lib-Always-have-.-u-boot.dts.patch b/package/boot/uboot-sunxi/patches/211-Revert-scripts-Makefile.lib-Always-have-.-u-boot.dts.patch
deleted file mode 100644
index d40238d3a4..0000000000
--- a/package/boot/uboot-sunxi/patches/211-Revert-scripts-Makefile.lib-Always-have-.-u-boot.dts.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From cdee74ad13e933631caf7f544c319d8e981c6063 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Thu, 20 Jul 2017 19:49:25 +0200
-Subject: [PATCH 211/213] Revert "scripts/Makefile.lib: Always have
- ...-u-boot.dtsi be able to override"
-
-This reverts commit 7452946e7f3742b3ff1cb4a50603e7492aceea88.
----
- scripts/Makefile.lib | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -306,10 +306,10 @@ $(obj)/%.dtb.S: $(obj)/%.dtb
-
- quiet_cmd_dtc = DTC $@
- # Modified for U-Boot
--# Bring in any U-Boot-specific include at the end of the file
-+# Bring in any U-Boot-specific include after the '/dts-v1/;' header
- cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
- cat $< $(if $(u_boot_dtsi),\
-- | sed "$$ a\#include \"$(u_boot_dtsi)\"") | \
-+ | sed '/^\/ {$$/{x;s%$$%\#include \"$(u_boot_dtsi)\"%;G;}') | \
- $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) - ; \
- $(DTC) -O dtb -o $@ -b 0 \
- -i $(dir $<) $(DTC_FLAGS) \