uboot-sunxi: Backport fix for stale CONFIG_SUNXIG_GMAC references
[openwrt/openwrt.git] / package / boot / uboot-sunxi / patches / 213-Revert-sunxi-Use-binman-for-sunxi-boards.patch
1 From cf1defd80b7594f6f2721ab2dacffe48522abfca Mon Sep 17 00:00:00 2001
2 From: Hauke Mehrtens <hauke@hauke-m.de>
3 Date: Thu, 20 Jul 2017 19:51:01 +0200
4 Subject: [PATCH 213/213] Revert "sunxi: Use binman for sunxi boards"
5
6 This reverts commit 61b994a386eb6f631dc1c2194d4cce9b1a43542c.
7 ---
8 Makefile | 6 ++++--
9 arch/arm/dts/sunxi-u-boot.dtsi | 14 --------------
10 scripts/Makefile.lib | 4 ++--
11 3 files changed, 6 insertions(+), 18 deletions(-)
12 delete mode 100644 arch/arm/dts/sunxi-u-boot.dtsi
13
14 --- a/Makefile
15 +++ b/Makefile
16 @@ -1125,8 +1125,10 @@ u-boot-x86-16bit.bin: u-boot FORCE
17 endif
18
19 ifneq ($(CONFIG_ARCH_SUNXI),)
20 -u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.img u-boot.dtb FORCE
21 - $(call if_changed,binman)
22 +OBJCOPYFLAGS_u-boot-sunxi-with-spl.bin = -I binary -O binary \
23 + --pad-to=$(CONFIG_SPL_PAD_TO) --gap-fill=0xff
24 +u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.img FORCE
25 + $(call if_changed,pad_cat)
26 endif
27
28 ifneq ($(CONFIG_TEGRA),)
29 --- a/arch/arm/dts/sunxi-u-boot.dtsi
30 +++ /dev/null
31 @@ -1,14 +0,0 @@
32 -#include <config.h>
33 -
34 -/ {
35 - binman {
36 - filename = "u-boot-sunxi-with-spl.bin";
37 - pad-byte = <0xff>;
38 - blob {
39 - filename = "spl/sunxi-spl.bin";
40 - };
41 - u-boot-img {
42 - pos = <CONFIG_SPL_PAD_TO>;
43 - };
44 - };
45 -};
46 --- a/scripts/Makefile.lib
47 +++ b/scripts/Makefile.lib
48 @@ -308,8 +308,8 @@ quiet_cmd_dtc = DTC $@
49 # Modified for U-Boot
50 # Bring in any U-Boot-specific include after the '/dts-v1/;' header
51 cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
52 - cat $< $(if $(u_boot_dtsi),\
53 - | sed 's%^/ {$$%\#include \"$(u_boot_dtsi)\"\n&%') | \
54 + cat $< $(if $(u-boot-dtsi),\
55 + | sed 's%^/ {$$%\#include \"$(u-boot-dtsi)\"\n&%') | \
56 $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) - ; \
57 $(DTC) -O dtb -o $@ -b 0 \
58 -i $(dir $<) $(DTC_FLAGS) \