From af63cdf87ad76177fb7180e5fb57ec6f949fbb98 Mon Sep 17 00:00:00 2001
From: Imre Kaloz <kaloz@openwrt.org>
Date: Thu, 13 Feb 2014 13:27:14 +0000
Subject: upgrade 3.13 targets to 3.13.2, refresh patches

Signed-off-by: Imre Kaloz <kaloz@openwrt.org

SVN-Revision: 39582
---
 target/linux/mxs/patches-3.13/200-duckbill.patch | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'target/linux/mxs/patches-3.13/200-duckbill.patch')

diff --git a/target/linux/mxs/patches-3.13/200-duckbill.patch b/target/linux/mxs/patches-3.13/200-duckbill.patch
index c58d9684e5..f4fda0261f 100644
--- a/target/linux/mxs/patches-3.13/200-duckbill.patch
+++ b/target/linux/mxs/patches-3.13/200-duckbill.patch
@@ -1,7 +1,6 @@
-diff -ruN old/arch/arm/boot/dts/Makefile new/arch/arm/boot/dts/Makefile
---- old/arch/arm/boot/dts/Makefile	2014-02-05 13:08:14.000000000 +0100
-+++ new/arch/arm/boot/dts/Makefile	2014-02-05 13:12:40.493773522 +0100
-@@ -164,6 +164,7 @@
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -164,6 +164,7 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb
  	imx28-cfa10057.dtb \
  	imx28-cfa10058.dtb \
  	imx28-evk.dtb \
@@ -9,10 +8,9 @@ diff -ruN old/arch/arm/boot/dts/Makefile new/arch/arm/boot/dts/Makefile
  	imx28-m28cu3.dtb \
  	imx28-m28evk.dtb \
  	imx28-sps1.dtb \
-diff -ruN old/arch/arm/mach-mxs/mach-mxs.c new/arch/arm/mach-mxs/mach-mxs.c
---- old/arch/arm/mach-mxs/mach-mxs.c	2014-02-05 13:08:14.000000000 +0100
-+++ new/arch/arm/mach-mxs/mach-mxs.c	2014-02-05 13:13:27.121772897 +0100
-@@ -157,6 +157,7 @@
+--- a/arch/arm/mach-mxs/mach-mxs.c
++++ b/arch/arm/mach-mxs/mach-mxs.c
+@@ -157,6 +157,7 @@ enum mac_oui {
  	OUI_FSL,
  	OUI_DENX,
  	OUI_CRYSTALFONTZ,
@@ -20,7 +18,7 @@ diff -ruN old/arch/arm/mach-mxs/mach-mxs.c new/arch/arm/mach-mxs/mach-mxs.c
  };
  
  static void __init update_fec_mac_prop(enum mac_oui oui)
-@@ -211,6 +212,11 @@
+@@ -211,6 +212,11 @@ static void __init update_fec_mac_prop(e
  			macaddr[1] = 0xb9;
  			macaddr[2] = 0xe1;
  			break;
@@ -32,7 +30,7 @@ diff -ruN old/arch/arm/mach-mxs/mach-mxs.c new/arch/arm/mach-mxs/mach-mxs.c
  		}
  		val = ocotp[i];
  		macaddr[3] = (val >> 16) & 0xff;
-@@ -426,6 +432,11 @@
+@@ -426,6 +432,11 @@ static int __init mxs_restart_init(void)
  	return 0;
  }
  
@@ -44,7 +42,7 @@ diff -ruN old/arch/arm/mach-mxs/mach-mxs.c new/arch/arm/mach-mxs/mach-mxs.c
  static void __init mxs_machine_init(void)
  {
  	struct device_node *root;
-@@ -464,6 +475,8 @@
+@@ -464,6 +475,8 @@ static void __init mxs_machine_init(void
  		crystalfontz_init();
  	else if (of_machine_is_compatible("msr,m28cu3"))
  		m28cu3_init();
-- 
cgit v1.2.3