diff options
-rw-r--r-- | Config.in | 6 | ||||
-rw-r--r-- | mk/kernel-ver.mk | 6 | ||||
-rw-r--r-- | package/openssl/Makefile | 4 | ||||
-rw-r--r-- | target/linux/config/Config.in.netfilter.ip4 | 4 | ||||
-rw-r--r-- | target/linux/patches/3.13.5/bsd-compatibility.patch (renamed from target/linux/patches/3.13.3/bsd-compatibility.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.13.5/defaults.patch (renamed from target/linux/patches/3.13.3/defaults.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.13.5/disable-netfilter.patch (renamed from target/linux/patches/3.13.3/disable-netfilter.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.13.5/export-symbol-for-exmap.patch (renamed from target/linux/patches/3.13.3/export-symbol-for-exmap.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.13.5/gemalto.patch (renamed from target/linux/patches/3.13.3/gemalto.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.13.5/lemote-rfkill.patch (renamed from target/linux/patches/3.13.3/lemote-rfkill.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.13.5/microblaze-axi.patch | 11 | ||||
-rw-r--r-- | target/linux/patches/3.13.5/microblaze-ethernet.patch (renamed from target/linux/patches/3.13.3/microblaze-ethernet.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.13.5/microblaze-setup.patch (renamed from target/linux/patches/3.13.3/microblaze-setup.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.13.5/mtd-rootfs.patch (renamed from target/linux/patches/3.13.3/mtd-rootfs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.13.5/non-static.patch (renamed from target/linux/patches/3.13.3/non-static.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.13.5/ppc64-missing-zlib.patch (renamed from target/linux/patches/3.13.3/ppc64-missing-zlib.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.13.5/raspberry.patch (renamed from target/linux/patches/3.13.3/raspberry.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.13.5/startup.patch (renamed from target/linux/patches/3.13.3/startup.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.13.5/uuid.patch (renamed from target/linux/patches/3.13.3/uuid.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.13.5/vga-cons-default-off.patch (renamed from target/linux/patches/3.13.3/vga-cons-default-off.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.13.5/wlan-cf.patch (renamed from target/linux/patches/3.13.3/wlan-cf.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.13.5/xargs.patch (renamed from target/linux/patches/3.13.3/xargs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.13.5/zlib-inflate.patch (renamed from target/linux/patches/3.13.3/zlib-inflate.patch) | 0 | ||||
-rw-r--r-- | target/microblaze/sys-available/qemu-microblazeel | 1 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.13.5/cleankernel.patch (renamed from toolchain/kernel-headers/patches/3.13.3/cleankernel.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.13.5/microperl.patch (renamed from toolchain/kernel-headers/patches/3.13.3/microperl.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.13.5/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.13.3/mkpiggy.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.13.5/relocs.patch (renamed from toolchain/kernel-headers/patches/3.13.3/relocs.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.13.5/sgidefs.patch (renamed from toolchain/kernel-headers/patches/3.13.3/sgidefs.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.13.5/sortext.patch (renamed from toolchain/kernel-headers/patches/3.13.3/sortext.patch) | 0 |
30 files changed, 24 insertions, 8 deletions
@@ -109,8 +109,8 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_ choice prompt "Kernel Version" -config ADK_KERNEL_VERSION_3_13_3 - prompt "3.13.3" +config ADK_KERNEL_VERSION_3_13_5 + prompt "3.13.5" boolean config ADK_KERNEL_VERSION_3_12_11 @@ -129,7 +129,7 @@ endchoice config ADK_KERNEL_VERSION string - default "3.13.3" if ADK_KERNEL_VERSION_3_13_3 + default "3.13.5" if ADK_KERNEL_VERSION_3_13_5 default "3.12.11" if ADK_KERNEL_VERSION_3_12_11 default "3.11.10" if ADK_KERNEL_VERSION_3_11_10 default "3.4.71" if ADK_KERNEL_VERSION_3_4_71 diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index bc4da699b..74a15884e 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -4,11 +4,11 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= c5b0775d187bc79992bae17ae781de1e endif -ifeq ($(ADK_KERNEL_VERSION_3_13_3),y) -KERNEL_VERSION:= 3.13.3 +ifeq ($(ADK_KERNEL_VERSION_3_13_5),y) +KERNEL_VERSION:= 3.13.5 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= ad98a0c623a124a25dab86406ddc7119 +KERNEL_MD5SUM:= b9fa20262a7ecbbc3277aa2ee10412da endif ifeq ($(ADK_KERNEL_VERSION_3_12_11),y) KERNEL_VERSION:= 3.12.11 diff --git a/package/openssl/Makefile b/package/openssl/Makefile index b364b368f..027a74611 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -45,6 +45,10 @@ ifneq ($(ADK_PACKAGE_LIBOPENSSL_WITH_CRYPTODEV),) OPENSSL_OPTIONS+= -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS endif +ifeq ($(ADK_LINUX_MICROBLAZE),y) +TARGET_CFLAGS:= $(subst g3,g,$(TARGET_CFLAGS)) +endif + ifeq ($(ADK_LINUX_X86_64),y) CONFIG:= linux-embedded-x86_64 TARGET_CFLAGS:= $(subst g3,g,$(TARGET_CFLAGS)) 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. diff --git a/toolchain/kernel-headers/patches/3.13.3/cleankernel.patch b/toolchain/kernel-headers/patches/3.13.5/cleankernel.patch index d8c055dc3..d8c055dc3 100644 --- a/toolchain/kernel-headers/patches/3.13.3/cleankernel.patch +++ b/toolchain/kernel-headers/patches/3.13.5/cleankernel.patch diff --git a/toolchain/kernel-headers/patches/3.13.3/microperl.patch b/toolchain/kernel-headers/patches/3.13.5/microperl.patch index 298d96593..298d96593 100644 --- a/toolchain/kernel-headers/patches/3.13.3/microperl.patch +++ b/toolchain/kernel-headers/patches/3.13.5/microperl.patch diff --git a/toolchain/kernel-headers/patches/3.13.3/mkpiggy.patch b/toolchain/kernel-headers/patches/3.13.5/mkpiggy.patch index 751678b74..751678b74 100644 --- a/toolchain/kernel-headers/patches/3.13.3/mkpiggy.patch +++ b/toolchain/kernel-headers/patches/3.13.5/mkpiggy.patch diff --git a/toolchain/kernel-headers/patches/3.13.3/relocs.patch b/toolchain/kernel-headers/patches/3.13.5/relocs.patch index 649b9e73e..649b9e73e 100644 --- a/toolchain/kernel-headers/patches/3.13.3/relocs.patch +++ b/toolchain/kernel-headers/patches/3.13.5/relocs.patch diff --git a/toolchain/kernel-headers/patches/3.13.3/sgidefs.patch b/toolchain/kernel-headers/patches/3.13.5/sgidefs.patch index f00a284d9..f00a284d9 100644 --- a/toolchain/kernel-headers/patches/3.13.3/sgidefs.patch +++ b/toolchain/kernel-headers/patches/3.13.5/sgidefs.patch diff --git a/toolchain/kernel-headers/patches/3.13.3/sortext.patch b/toolchain/kernel-headers/patches/3.13.5/sortext.patch index 8fd4e1d6b..8fd4e1d6b 100644 --- a/toolchain/kernel-headers/patches/3.13.3/sortext.patch +++ b/toolchain/kernel-headers/patches/3.13.5/sortext.patch |