X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fboot%2Fuboot-sunxi%2Fpatches%2F213-Revert-sunxi-Use-binman-for-sunxi-boards.patch;fp=package%2Fboot%2Fuboot-sunxi%2Fpatches%2F213-Revert-sunxi-Use-binman-for-sunxi-boards.patch;h=6f75259a763b3dba70664e4870f719a26b77f871;hb=1a533159519142753b79b2efcc8ea1d4146fe14b;hp=a3e529c2afca6bbaa34cd53db96ebf27e0ae73ea;hpb=7f0a32e21ca9edaa5607b98724e1eca05c8c50ba;p=openwrt%2Fstaging%2Fwigyori.git

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
-