From 1a533159519142753b79b2efcc8ea1d4146fe14b Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sat, 14 Oct 2017 13:24:07 -0700 Subject: 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 --- ...10-Revert-fdt-Makefile-Build-python-libfdt-library-if-n.patch | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'package/boot/uboot-sunxi/patches/210-Revert-fdt-Makefile-Build-python-libfdt-library-if-n.patch') 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 - -- cgit v1.2.3