aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-sunxi/patches/210-Revert-fdt-Makefile-Build-python-libfdt-library-if-n.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2017-10-14 13:24:07 -0700
committerFlorian Fainelli <f.fainelli@gmail.com>2017-10-23 18:42:25 -0700
commit1a533159519142753b79b2efcc8ea1d4146fe14b (patch)
treefe1489baec794f9ad7b9d824ee36609c38df2e8a /package/boot/uboot-sunxi/patches/210-Revert-fdt-Makefile-Build-python-libfdt-library-if-n.patch
parent7f0a32e21ca9edaa5607b98724e1eca05c8c50ba (diff)
downloadupstream-1a533159519142753b79b2efcc8ea1d4146fe14b.tar.gz
upstream-1a533159519142753b79b2efcc8ea1d4146fe14b.tar.bz2
upstream-1a533159519142753b79b2efcc8ea1d4146fe14b.zip
uboot-sunxi: Backport fix for stale CONFIG_SUNXIG_GMAC references
This backports the upstream commit fixing stale references to CONFIG_SUNXI_GMAC which have been later replaced by CONFIG_SUN7I_GMAC. This fixes the designware MAC pinmuxing on e.g: Lamobo R1. Refresh patches while we are at it. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'package/boot/uboot-sunxi/patches/210-Revert-fdt-Makefile-Build-python-libfdt-library-if-n.patch')
-rw-r--r--package/boot/uboot-sunxi/patches/210-Revert-fdt-Makefile-Build-python-libfdt-library-if-n.patch9
1 files changed, 1 insertions, 8 deletions
diff --git a/package/boot/uboot-sunxi/patches/210-Revert-fdt-Makefile-Build-python-libfdt-library-if-n.patch b/package/boot/uboot-sunxi/patches/210-Revert-fdt-Makefile-Build-python-libfdt-library-if-n.patch
index dcf16c716f..25edf5104c 100644
--- a/package/boot/uboot-sunxi/patches/210-Revert-fdt-Makefile-Build-python-libfdt-library-if-n.patch
+++ b/package/boot/uboot-sunxi/patches/210-Revert-fdt-Makefile-Build-python-libfdt-library-if-n.patch
@@ -10,8 +10,6 @@ This reverts commit e38ffc42674fedc750ca895046be0bd983b56dd5.
scripts/Makefile.spl | 17 ++++-------------
2 files changed, 6 insertions(+), 28 deletions(-)
-diff --git a/Makefile b/Makefile
-index 119ad49eec..071efa8926 100644
--- a/Makefile
+++ b/Makefile
@@ -1116,7 +1116,7 @@ cmd_ldr = $(LD) $(LDFLAGS_$(@F)) \
@@ -33,7 +31,7 @@ index 119ad49eec..071efa8926 100644
$(call if_changed,binman)
endif
-@@ -1355,18 +1354,6 @@ $(version_h): include/config/uboot.release FORCE
+@@ -1355,18 +1354,6 @@ $(version_h): include/config/uboot.relea
$(timestamp_h): $(srctree)/Makefile FORCE
$(call filechk,timestamp.h)
@@ -52,8 +50,6 @@ index 119ad49eec..071efa8926 100644
# ---------------------------------------------------------------------------
quiet_cmd_cpp_lds = LDS $@
cmd_cpp_lds = $(CPP) -Wp,-MD,$(depfile) $(cpp_flags) $(LDPPFLAGS) \
-diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
-index ac3c2c7f13..135706f21d 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -257,12 +257,14 @@ PHONY += dts_dir
@@ -91,6 +87,3 @@ index ac3c2c7f13..135706f21d 100644
PHONY += FORCE
FORCE:
---
-2.11.0
-