Merge branch 'master' of git+ssh://openadk.org/git/openadk

21 files changed, 14 insertions, 2 deletions

diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index 287cea222..e2bc1b1b2 100644
--- a/target/linux/config/Config.in.netfilter.ip4
+++ b/target/linux/config/Config.in.netfilter.ip4
@@ -39,7 +39,7 @@ config ADK_KPACKAGE_KMOD_FULL_NAT
 	select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_71
 	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_10
 	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_11
-	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_3
+	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_5
 
 config ADK_KPACKAGE_KMOD_NF_NAT
 	tristate 'Full NAT'
@@ -54,7 +54,7 @@ config ADK_KPACKAGE_KMOD_NF_NAT_IPV4
 	tristate 'Full NAT'
 	depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
 	depends on ADK_KERNEL_VERSION_3_11_10 || ADK_KERNEL_VERSION_3_12_11 \
-		|| ADK_KERNEL_VERSION_3_13_3
+		|| ADK_KERNEL_VERSION_3_13_5
 	help
 	  The Full NAT option allows masquerading, port forwarding and other
 	  forms of full Network Address Port Translation.  It is controlled by
diff --git a/target/linux/patches/3.13.3/bsd-compatibility.patch b/target/linux/patches/3.13.5/bsd-compatibility.patch
index b954b658f..b954b658f 100644
--- a/target/linux/patches/3.13.3/bsd-compatibility.patch
+++ b/target/linux/patches/3.13.5/bsd-compatibility.patch
diff --git a/target/linux/patches/3.13.3/defaults.patch b/target/linux/patches/3.13.5/defaults.patch
index 6cdca084e..6cdca084e 100644
--- a/target/linux/patches/3.13.3/defaults.patch
+++ b/target/linux/patches/3.13.5/defaults.patch
diff --git a/target/linux/patches/3.13.3/disable-netfilter.patch b/target/linux/patches/3.13.5/disable-netfilter.patch
index 7b1ca013a..7b1ca013a 100644
--- a/target/linux/patches/3.13.3/disable-netfilter.patch
+++ b/target/linux/patches/3.13.5/disable-netfilter.patch
diff --git a/target/linux/patches/3.13.3/export-symbol-for-exmap.patch b/target/linux/patches/3.13.5/export-symbol-for-exmap.patch
index 4f0fc8449..4f0fc8449 100644
--- a/target/linux/patches/3.13.3/export-symbol-for-exmap.patch
+++ b/target/linux/patches/3.13.5/export-symbol-for-exmap.patch
diff --git a/target/linux/patches/3.13.3/gemalto.patch b/target/linux/patches/3.13.5/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.13.3/gemalto.patch
+++ b/target/linux/patches/3.13.5/gemalto.patch
diff --git a/target/linux/patches/3.13.3/lemote-rfkill.patch b/target/linux/patches/3.13.5/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.13.3/lemote-rfkill.patch
+++ b/target/linux/patches/3.13.5/lemote-rfkill.patch
diff --git a/target/linux/patches/3.13.5/microblaze-axi.patch b/target/linux/patches/3.13.5/microblaze-axi.patch
new file mode 100644
index 000000000..1a4b17d8c
--- /dev/null
+++ b/target/linux/patches/3.13.5/microblaze-axi.patch
@@ -0,0 +1,11 @@
+diff -Nur linux-3.13.3.orig/drivers/net/ethernet/xilinx/xilinx_axienet_main.c linux-3.13.3/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+--- linux-3.13.3.orig/drivers/net/ethernet/xilinx/xilinx_axienet_main.c	2014-02-13 23:00:14.000000000 +0100
++++ linux-3.13.3/drivers/net/ethernet/xilinx/xilinx_axienet_main.c	2014-02-24 08:03:57.000000000 +0100
+@@ -25,6 +25,7 @@
+ #include <linux/init.h>
+ #include <linux/module.h>
+ #include <linux/netdevice.h>
++#include <linux/of_irq.h>
+ #include <linux/of_mdio.h>
+ #include <linux/of_platform.h>
+ #include <linux/of_address.h>
diff --git a/target/linux/patches/3.13.3/microblaze-ethernet.patch b/target/linux/patches/3.13.5/microblaze-ethernet.patch
index 742ab477e..742ab477e 100644
--- a/target/linux/patches/3.13.3/microblaze-ethernet.patch
+++ b/target/linux/patches/3.13.5/microblaze-ethernet.patch
diff --git a/target/linux/patches/3.13.3/microblaze-setup.patch b/target/linux/patches/3.13.5/microblaze-setup.patch
index 43815f274..43815f274 100644
--- a/target/linux/patches/3.13.3/microblaze-setup.patch
+++ b/target/linux/patches/3.13.5/microblaze-setup.patch
diff --git a/target/linux/patches/3.13.3/mtd-rootfs.patch b/target/linux/patches/3.13.5/mtd-rootfs.patch
index 775d5fc80..775d5fc80 100644
--- a/target/linux/patches/3.13.3/mtd-rootfs.patch
+++ b/target/linux/patches/3.13.5/mtd-rootfs.patch
diff --git a/target/linux/patches/3.13.3/non-static.patch b/target/linux/patches/3.13.5/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.13.3/non-static.patch
+++ b/target/linux/patches/3.13.5/non-static.patch
diff --git a/target/linux/patches/3.13.3/ppc64-missing-zlib.patch b/target/linux/patches/3.13.5/ppc64-missing-zlib.patch
index c6e0616be..c6e0616be 100644
--- a/target/linux/patches/3.13.3/ppc64-missing-zlib.patch
+++ b/target/linux/patches/3.13.5/ppc64-missing-zlib.patch
diff --git a/target/linux/patches/3.13.3/raspberry.patch b/target/linux/patches/3.13.5/raspberry.patch
index 777a04436..777a04436 100644
--- a/target/linux/patches/3.13.3/raspberry.patch
+++ b/target/linux/patches/3.13.5/raspberry.patch
diff --git a/target/linux/patches/3.13.3/startup.patch b/target/linux/patches/3.13.5/startup.patch
index bfe3ae6ec..bfe3ae6ec 100644
--- a/target/linux/patches/3.13.3/startup.patch
+++ b/target/linux/patches/3.13.5/startup.patch
diff --git a/target/linux/patches/3.13.3/uuid.patch b/target/linux/patches/3.13.5/uuid.patch
index ca23accdf..ca23accdf 100644
--- a/target/linux/patches/3.13.3/uuid.patch
+++ b/target/linux/patches/3.13.5/uuid.patch
diff --git a/target/linux/patches/3.13.3/vga-cons-default-off.patch b/target/linux/patches/3.13.5/vga-cons-default-off.patch
index 08a57f783..08a57f783 100644
--- a/target/linux/patches/3.13.3/vga-cons-default-off.patch
+++ b/target/linux/patches/3.13.5/vga-cons-default-off.patch
diff --git a/target/linux/patches/3.13.3/wlan-cf.patch b/target/linux/patches/3.13.5/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.13.3/wlan-cf.patch
+++ b/target/linux/patches/3.13.5/wlan-cf.patch
diff --git a/target/linux/patches/3.13.3/xargs.patch b/target/linux/patches/3.13.5/xargs.patch
index 2c7b3df59..2c7b3df59 100644
--- a/target/linux/patches/3.13.3/xargs.patch
+++ b/target/linux/patches/3.13.5/xargs.patch
diff --git a/target/linux/patches/3.13.3/zlib-inflate.patch b/target/linux/patches/3.13.5/zlib-inflate.patch
index 58e1f6d21..58e1f6d21 100644
--- a/target/linux/patches/3.13.3/zlib-inflate.patch
+++ b/target/linux/patches/3.13.5/zlib-inflate.patch
diff --git a/target/microblaze/sys-available/qemu-microblazeel b/target/microblaze/sys-available/qemu-microblazeel
index a577d340a..085718e63 100644
--- a/target/microblaze/sys-available/qemu-microblazeel
+++ b/target/microblaze/sys-available/qemu-microblazeel
@@ -7,6 +7,7 @@ config ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_KERNEL_LINUXBIN
 	select ADK_USE_KERNEL_MINICONFIG
+	select ADK_TOOLCHAIN_GCC_SJLJ
 	help
 	 Qemu support for microblaze little endian architecture.