diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2017-10-14 13:24:07 -0700 |
|---|---|---|
| committer | Florian Fainelli <f.fainelli@gmail.com> | 2017-10-23 18:42:25 -0700 |
| commit | 1a533159519142753b79b2efcc8ea1d4146fe14b (patch) | |
| tree | fe1489baec794f9ad7b9d824ee36609c38df2e8a /package/boot/uboot-sunxi/patches/213-Revert-sunxi-Use-binman-for-sunxi-boards.patch | |
| parent | 7f0a32e21ca9edaa5607b98724e1eca05c8c50ba (diff) | |
| download | upstream-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/213-Revert-sunxi-Use-binman-for-sunxi-boards.patch')
| -rw-r--r-- | package/boot/uboot-sunxi/patches/213-Revert-sunxi-Use-binman-for-sunxi-boards.patch | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/package/boot/uboot-sunxi/patches/213-Revert-sunxi-Use-binman-for-sunxi-boards.patch b/package/boot/uboot-sunxi/patches/213-Revert-sunxi-Use-binman-for-sunxi-boards.patch index a3e529c2af..6f75259a76 100644 --- a/package/boot/uboot-sunxi/patches/213-Revert-sunxi-Use-binman-for-sunxi-boards.patch +++ b/package/boot/uboot-sunxi/patches/213-Revert-sunxi-Use-binman-for-sunxi-boards.patch @@ -11,8 +11,6 @@ This reverts commit 61b994a386eb6f631dc1c2194d4cce9b1a43542c. 3 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 arch/arm/dts/sunxi-u-boot.dtsi -diff --git a/Makefile b/Makefile -index 071efa8926..5349621baf 100644 --- a/Makefile +++ b/Makefile @@ -1125,8 +1125,10 @@ u-boot-x86-16bit.bin: u-boot FORCE @@ -28,9 +26,6 @@ index 071efa8926..5349621baf 100644 endif ifneq ($(CONFIG_TEGRA),) -diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi -deleted file mode 100644 -index 5adfd9bca2..0000000000 --- a/arch/arm/dts/sunxi-u-boot.dtsi +++ /dev/null @@ -1,14 +0,0 @@ @@ -48,8 +43,6 @@ index 5adfd9bca2..0000000000 - }; - }; -}; -diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 54bcb166b0..6246265c91 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -308,8 +308,8 @@ quiet_cmd_dtc = DTC $@ @@ -63,6 +56,3 @@ index 54bcb166b0..6246265c91 100644 $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) - ; \ $(DTC) -O dtb -o $@ -b 0 \ -i $(dir $<) $(DTC_FLAGS) \ --- -2.11.0 - |