diff options
| author | Zoltan HERPAI <wigyori@uid0.hu> | 2018-02-16 11:40:34 +0100 |
|---|---|---|
| committer | Zoltan HERPAI <wigyori@uid0.hu> | 2018-02-16 12:17:15 +0100 |
| commit | 94ef87f49dbada855ce9b2a00b2bd62ffa509336 (patch) | |
| tree | 3603204ad906a5aeeea268dab416135fe4d3aa96 /package/boot/uboot-sunxi/patches/211-Revert-scripts-Makefile.lib-Always-have-.-u-boot.dts.patch | |
| parent | 4bc1ebbd88a2aef177a7d4c36c8cd5fbf7cf0bd0 (diff) | |
| download | upstream-94ef87f49dbada855ce9b2a00b2bd62ffa509336.tar.gz upstream-94ef87f49dbada855ce9b2a00b2bd62ffa509336.tar.bz2 upstream-94ef87f49dbada855ce9b2a00b2bd62ffa509336.zip | |
Revert "uboot-sunxi: bump to 2017.11"
This reverts commit 805f756d6e4ff5061380baf5e262aec72abcf195.
Move back to 2017.07 until we move sunxi to GCC7.
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.patch | 26 |
1 files changed, 26 insertions, 0 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 new file mode 100644 index 0000000000..d40238d3a4 --- /dev/null +++ b/package/boot/uboot-sunxi/patches/211-Revert-scripts-Makefile.lib-Always-have-.-u-boot.dts.patch @@ -0,0 +1,26 @@ +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) \ |