summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-04-29 16:15:34 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-04-29 16:15:34 +0200
commitea63ed9bc4b8912bb08661e5bce309b528060a37 (patch)
tree366950d837922045fdae65ef1d418b9dc6f4a67f
parentfb0cea762bb21c9d5253da5e3d33e474ae93ed58 (diff)
parentac9121f91dc94bbe7949f46abb541960c4d84054 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--Config.in8
-rw-r--r--mk/kernel-ver.mk10
-rw-r--r--mk/modules.mk76
-rw-r--r--package/busybox/patches/012-find-posix.patch12
-rw-r--r--target/linux/patches/3.5.7/brcm.patch467
-rw-r--r--target/linux/patches/3.5.7/bsd-compatibility.patch2512
-rw-r--r--target/linux/patches/3.5.7/mmc-host.patch36
-rw-r--r--target/linux/patches/3.5.7/module-alloc-size-check.patch21
-rw-r--r--target/linux/patches/3.5.7/startup.patch20
-rw-r--r--target/linux/patches/3.6.3/bsd-compatibility.patch2512
-rw-r--r--target/linux/patches/3.6.3/cris-etrax.patch12
-rw-r--r--target/linux/patches/3.6.3/defaults.patch22
-rw-r--r--target/linux/patches/3.6.3/gemalto.patch11
-rw-r--r--target/linux/patches/3.6.3/lemote-rfkill.patch21
-rw-r--r--target/linux/patches/3.6.3/mmc-host.patch36
-rw-r--r--target/linux/patches/3.6.3/module-alloc-size-check.patch21
-rw-r--r--target/linux/patches/3.6.3/mtd-rootfs.patch26
-rw-r--r--target/linux/patches/3.6.3/non-static.patch33
-rw-r--r--target/linux/patches/3.6.3/startup.patch20
-rw-r--r--target/linux/patches/3.6.3/usb-defaults-off.patch20
-rw-r--r--target/linux/patches/3.6.3/uuid.patch263
-rw-r--r--target/linux/patches/3.6.3/vga-cons-default-off.patch12
-rw-r--r--target/linux/patches/3.6.3/wlan-cf.patch11
-rw-r--r--target/linux/patches/3.6.3/zlib-inflate.patch12
-rw-r--r--target/linux/patches/3.7.3/cris-etrax.patch12
-rw-r--r--target/linux/patches/3.7.3/defaults.patch22
-rw-r--r--target/linux/patches/3.7.3/gemalto.patch11
-rw-r--r--target/linux/patches/3.7.3/lemote-rfkill.patch21
-rw-r--r--target/linux/patches/3.7.3/mmc-host.patch36
-rw-r--r--target/linux/patches/3.7.3/module-alloc-size-check.patch21
-rw-r--r--target/linux/patches/3.7.3/mtd-rootfs.patch26
-rw-r--r--target/linux/patches/3.7.3/non-static.patch33
-rw-r--r--target/linux/patches/3.7.3/usb-defaults-off.patch20
-rw-r--r--target/linux/patches/3.7.3/uuid.patch263
-rw-r--r--target/linux/patches/3.7.3/vga-cons-default-off.patch12
-rw-r--r--target/linux/patches/3.7.3/wlan-cf.patch11
-rw-r--r--target/linux/patches/3.7.3/zlib-inflate.patch12
-rw-r--r--target/linux/patches/3.8.10/bsd-compatibility.patch (renamed from target/linux/patches/3.7.3/bsd-compatibility.patch)0
-rw-r--r--target/linux/patches/3.8.10/cris-etrax.patch (renamed from target/linux/patches/3.5.7/cris-etrax.patch)0
-rw-r--r--target/linux/patches/3.8.10/defaults.patch (renamed from target/linux/patches/3.5.7/defaults.patch)0
-rw-r--r--target/linux/patches/3.8.10/disable-netfilter.patch (renamed from target/linux/patches/3.7.3/disable-netfilter.patch)0
-rw-r--r--target/linux/patches/3.8.10/gemalto.patch (renamed from target/linux/patches/3.5.7/gemalto.patch)0
-rw-r--r--target/linux/patches/3.8.10/lemote-rfkill.patch (renamed from target/linux/patches/3.5.7/lemote-rfkill.patch)0
-rw-r--r--target/linux/patches/3.8.10/mtd-rootfs.patch (renamed from target/linux/patches/3.5.7/mtd-rootfs.patch)0
-rw-r--r--target/linux/patches/3.8.10/non-static.patch (renamed from target/linux/patches/3.5.7/non-static.patch)0
-rw-r--r--target/linux/patches/3.8.10/startup.patch (renamed from target/linux/patches/3.7.3/startup.patch)0
-rw-r--r--target/linux/patches/3.8.10/usb-defaults-off.patch (renamed from target/linux/patches/3.5.7/usb-defaults-off.patch)0
-rw-r--r--target/linux/patches/3.8.10/uuid.patch (renamed from target/linux/patches/3.5.7/uuid.patch)0
-rw-r--r--target/linux/patches/3.8.10/vga-cons-default-off.patch (renamed from target/linux/patches/3.5.7/vga-cons-default-off.patch)0
-rw-r--r--target/linux/patches/3.8.10/wlan-cf.patch (renamed from target/linux/patches/3.5.7/wlan-cf.patch)0
-rw-r--r--target/linux/patches/3.8.10/zlib-inflate.patch (renamed from target/linux/patches/3.5.7/zlib-inflate.patch)0
-rw-r--r--target/linux/patches/3.8.6/bsd-compatibility.patch2568
-rw-r--r--target/linux/patches/3.8.6/cris-etrax.patch12
-rw-r--r--target/linux/patches/3.8.6/defaults.patch22
-rw-r--r--target/linux/patches/3.8.6/disable-netfilter.patch160
-rw-r--r--target/linux/patches/3.8.6/gemalto.patch11
-rw-r--r--target/linux/patches/3.8.6/lemote-rfkill.patch21
-rw-r--r--target/linux/patches/3.8.6/mtd-rootfs.patch26
-rw-r--r--target/linux/patches/3.8.6/non-static.patch33
-rw-r--r--target/linux/patches/3.8.6/startup.patch22
-rw-r--r--target/linux/patches/3.8.6/usb-defaults-off.patch20
-rw-r--r--target/linux/patches/3.8.6/uuid.patch263
-rw-r--r--target/linux/patches/3.8.6/vga-cons-default-off.patch12
-rw-r--r--target/linux/patches/3.8.6/wlan-cf.patch11
-rw-r--r--target/linux/patches/3.8.6/zlib-inflate.patch12
-rw-r--r--toolchain/kernel-headers/patches/3.5.7/aufs2.patch238
-rw-r--r--toolchain/kernel-headers/patches/3.5.7/etrax-header.patch94
-rw-r--r--toolchain/kernel-headers/patches/3.5.7/linux-gcc-check.patch18
-rw-r--r--toolchain/kernel-headers/patches/3.6.3/aufs2.patch238
-rw-r--r--toolchain/kernel-headers/patches/3.6.3/cleankernel.patch11
-rw-r--r--toolchain/kernel-headers/patches/3.6.3/etrax-header.patch94
-rw-r--r--toolchain/kernel-headers/patches/3.6.3/linux-gcc-check.patch18
-rw-r--r--toolchain/kernel-headers/patches/3.6.3/microperl.patch24
-rw-r--r--toolchain/kernel-headers/patches/3.6.3/mkpiggy.patch28
-rw-r--r--toolchain/kernel-headers/patches/3.6.3/relocs.patch3131
-rw-r--r--toolchain/kernel-headers/patches/3.6.3/sortext.patch22
-rw-r--r--toolchain/kernel-headers/patches/3.7.3/cleankernel.patch11
-rw-r--r--toolchain/kernel-headers/patches/3.7.3/cris-header.patch22
-rw-r--r--toolchain/kernel-headers/patches/3.7.3/etrax-header.patch64
-rw-r--r--toolchain/kernel-headers/patches/3.7.3/microperl.patch24
-rw-r--r--toolchain/kernel-headers/patches/3.7.3/mkpiggy.patch28
-rw-r--r--toolchain/kernel-headers/patches/3.7.3/relocs.patch3131
-rw-r--r--toolchain/kernel-headers/patches/3.7.3/sortext.patch22
-rw-r--r--toolchain/kernel-headers/patches/3.8.10/cleankernel.patch (renamed from toolchain/kernel-headers/patches/3.5.7/cleankernel.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.8.10/microperl.patch (renamed from toolchain/kernel-headers/patches/3.5.7/microperl.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.8.10/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.5.7/mkpiggy.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.8.10/relocs.patch (renamed from toolchain/kernel-headers/patches/3.5.7/relocs.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.8.10/sortext.patch (renamed from toolchain/kernel-headers/patches/3.5.7/sortext.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.8.6/cleankernel.patch11
-rw-r--r--toolchain/kernel-headers/patches/3.8.6/microperl.patch24
-rw-r--r--toolchain/kernel-headers/patches/3.8.6/mkpiggy.patch28
-rw-r--r--toolchain/kernel-headers/patches/3.8.6/relocs.patch3131
-rw-r--r--toolchain/kernel-headers/patches/3.8.6/sortext.patch22
93 files changed, 63 insertions, 20258 deletions
diff --git a/Config.in b/Config.in
index d5fdee590..e2aa4820f 100644
--- a/Config.in
+++ b/Config.in
@@ -95,7 +95,7 @@ prompt "Kernel Version"
depends on ADK_TOOLCHAIN_ONLY
config ADK_KERNEL_VERSION_TOOLCHAIN
- prompt "3.8.2"
+ prompt "3.8.10"
boolean
depends on ADK_TOOLCHAIN_ONLY
@@ -106,8 +106,8 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_
choice
prompt "Kernel Version"
-config ADK_KERNEL_VERSION_3_8_6
- prompt "3.8.6"
+config ADK_KERNEL_VERSION_3_8_10
+ prompt "3.8.10"
boolean
config ADK_KERNEL_VERSION_3_4_41
@@ -118,7 +118,7 @@ endchoice
config ADK_KERNEL_VERSION
string
- default "3.8.6" if ADK_KERNEL_VERSION_3_8_6
+ default "3.8.10" if ADK_KERNEL_VERSION_3_8_10
default "3.4.41" if ADK_KERNEL_VERSION_3_4_41
help
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 852fde275..7764296bc 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -1,14 +1,14 @@
ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y)
-KERNEL_VERSION:= 3.8.6
+KERNEL_VERSION:= 3.8.10
KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
KERNEL_RELEASE:= 1
-KERNEL_MD5SUM:= 0587d693653dc5e67e3d280278100d1d
+KERNEL_MD5SUM:= 3d5fb6d9add9cce7725bbe9b139c8d6e
endif
-ifeq ($(ADK_KERNEL_VERSION_3_8_6),y)
-KERNEL_VERSION:= 3.8.6
+ifeq ($(ADK_KERNEL_VERSION_3_8_10),y)
+KERNEL_VERSION:= 3.8.10
KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
KERNEL_RELEASE:= 1
-KERNEL_MD5SUM:= 0934e6b31931c1832e48a28bd35ef27f
+KERNEL_MD5SUM:= 3d5fb6d9add9cce7725bbe9b139c8d6e
endif
ifeq ($(ADK_KERNEL_VERSION_3_4_41),y)
KERNEL_VERSION:= 3.4.41
diff --git a/mk/modules.mk b/mk/modules.mk
index b526dd596..3a0466061 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -805,37 +805,41 @@ $(eval $(call KMOD_template,CRYPTO_DEV_GEODE,crypto-dev-geode,\
# $(MODULES_DIR)/kernel/drivers/crypto/hifn_795x \
#,20, crypto-manager2))
-#$(eval $(call KMOD_template,CRYPTO_ALGAPI2,crypto-algapi2,\
-# $(MODULES_DIR)/kernel/crypto/crypto_algapi \
-#,02))
-
-#$(eval $(call KMOD_template,CRYPTO_PCOMP2,crypto-pcomp2,\
-# $(MODULES_DIR)/kernel/crypto/pcompress \
-#,03))
-
-#$(eval $(call KMOD_template,CRYPTO_AEAD2,crypto-aead2,\
-# $(MODULES_DIR)/kernel/crypto/aead \
-#,03))
-
-#$(eval $(call KMOD_template,CRYPTO_HASH2,crypto-hash2,\
-# $(MODULES_DIR)/kernel/crypto/crypto_hash \
-#,04))
-
-#$(eval $(call KMOD_template,CRYPTO_BLKCIPHER2,crypto-blkcipher2,\
-# $(MODULES_DIR)/kernel/crypto/crypto_wq \
-# $(MODULES_DIR)/kernel/crypto/crypto_blkcipher \
-#,05))
-
-#$(eval $(call KMOD_template,CRYPTO_RNG2,crypto-rng2,\
-# $(MODULES_DIR)/kernel/crypto/rng \
-# $(MODULES_DIR)/kernel/crypto/krng \
-#,06))
-
-#$(eval $(call KMOD_template,CRYPTO_MANAGER2,crypto-manager2,\
-# $(MODULES_DIR)/kernel/crypto/cryptomgr \
-# $(MODULES_DIR)/kernel/crypto/eseqiv \
-# $(MODULES_DIR)/kernel/crypto/chainiv \
-#,07))
+ifeq ($(KERNEL_BASE),3)
+ifeq ($(KERNEL_MAJ),4)
+$(eval $(call KMOD_template,CRYPTO_ALGAPI2,crypto-algapi2,\
+ $(MODULES_DIR)/kernel/crypto/crypto_algapi \
+,02))
+
+$(eval $(call KMOD_template,CRYPTO_PCOMP2,crypto-pcomp2,\
+ $(MODULES_DIR)/kernel/crypto/pcompress \
+,03))
+
+$(eval $(call KMOD_template,CRYPTO_AEAD2,crypto-aead2,\
+ $(MODULES_DIR)/kernel/crypto/aead \
+,03))
+
+$(eval $(call KMOD_template,CRYPTO_HASH2,crypto-hash2,\
+ $(MODULES_DIR)/kernel/crypto/crypto_hash \
+,04))
+
+$(eval $(call KMOD_template,CRYPTO_BLKCIPHER2,crypto-blkcipher2,\
+ $(MODULES_DIR)/kernel/crypto/crypto_wq \
+ $(MODULES_DIR)/kernel/crypto/crypto_blkcipher \
+,05))
+
+$(eval $(call KMOD_template,CRYPTO_RNG2,crypto-rng2,\
+ $(MODULES_DIR)/kernel/crypto/rng \
+ $(MODULES_DIR)/kernel/crypto/krng \
+,06))
+
+$(eval $(call KMOD_template,CRYPTO_MANAGER2,crypto-manager2,\
+ $(MODULES_DIR)/kernel/crypto/cryptomgr \
+ $(MODULES_DIR)/kernel/crypto/eseqiv \
+ $(MODULES_DIR)/kernel/crypto/chainiv \
+,07))
+endif
+endif
$(eval $(call KMOD_template,CRYPTO_AUTHENC,crypto-authenc,\
$(MODULES_DIR)/kernel/crypto/authenc \
@@ -931,9 +935,13 @@ $(eval $(call KMOD_template,CRYPTO_SERPENT,crypto-serpent,\
$(MODULES_DIR)/kernel/crypto/serpent_generic \
,11))
-#$(eval $(call KMOD_template,CRYPTO_AES,crypto-aes,\
-# $(MODULES_DIR)/kernel/crypto/aes_generic \
-#,10))
+ifeq ($(KERNEL_BASE),3)
+ifeq ($(KERNEL_MAJ),4)
+$(eval $(call KMOD_template,CRYPTO_AES,crypto-aes,\
+ $(MODULES_DIR)/kernel/crypto/aes_generic \
+,10))
+endif
+endif
$(eval $(call KMOD_template,CRYPTO_AES_586,crypto-aes-586,\
$(MODULES_DIR)/kernel/arch/x86/crypto/aes-i586 \
diff --git a/package/busybox/patches/012-find-posix.patch b/package/busybox/patches/012-find-posix.patch
new file mode 100644
index 000000000..70484fbe4
--- /dev/null
+++ b/package/busybox/patches/012-find-posix.patch
@@ -0,0 +1,12 @@
+diff -Nur busybox-1.20.2.orig/scripts/gen_build_files.sh busybox-1.20.2/scripts/gen_build_files.sh
+--- busybox-1.20.2.orig/scripts/gen_build_files.sh 2012-06-26 13:35:45.000000000 +0000
++++ busybox-1.20.2/scripts/gen_build_files.sh 2013-04-29 12:18:26.089999426 +0000
+@@ -61,7 +61,7 @@
+
+ # (Re)generate */Kbuild and */Config.in
+ # We skip .dotdirs - makes git/svn/etc users happier
+-{ cd -- "$srctree" && find . -type d -not '(' -name '.?*' -prune ')'; } \
++{ cd -- "$srctree" && find . -type d ! '(' -name '.?*' -prune ')'; } \
+ | while read -r d; do
+ d="${d#./}"
+
diff --git a/target/linux/patches/3.5.7/brcm.patch b/target/linux/patches/3.5.7/brcm.patch
deleted file mode 100644
index a94b2302d..000000000
--- a/target/linux/patches/3.5.7/brcm.patch
+++ /dev/null
@@ -1,467 +0,0 @@
-diff -Nur linux-3.5.orig//arch/mips/bcm47xx/Makefile linux-3.5/arch/mips/bcm47xx/Makefile
---- linux-3.5.orig//arch/mips/bcm47xx/Makefile 2012-07-21 22:58:29.000000000 +0200
-+++ linux-3.5/arch/mips/bcm47xx/Makefile 2012-07-31 11:01:24.000000000 +0200
-@@ -3,5 +3,4 @@
- # under Linux.
- #
-
--obj-y += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o sprom.o
--obj-$(CONFIG_BCM47XX_SSB) += wgt634u.o
-+obj-y += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o sprom.o platform.o
-diff -Nur linux-3.5.orig//arch/mips/bcm47xx/platform.c linux-3.5/arch/mips/bcm47xx/platform.c
---- linux-3.5.orig//arch/mips/bcm47xx/platform.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5/arch/mips/bcm47xx/platform.c 2012-07-31 23:56:35.000000000 +0200
-@@ -0,0 +1,146 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License. See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2010, 2011 Waldemar Brodkorb <wbx@openadk.org>
-+ * Copyright © 2007, 2011 Thorsten Glaser <tg@freewrt.org>
-+ */
-+
-+#include <linux/platform_device.h>
-+#include <linux/module.h>
-+#include <linux/mtd/physmap.h>
-+#include <linux/ssb/ssb.h>
-+
-+#include <asm/mach-bcm47xx/bcm47xx.h>
-+#include <asm/mach-bcm47xx/nvram.h>
-+
-+#define CFGFS_FLASH_SIZE (128 * 1024)
-+
-+static struct mtd_partition bcm47xx_partitions[] = {
-+#define SLOT_CFE 0
-+ {
-+ .name = "cfe",
-+ .offset = 0,
-+ .size = BCM47XX_OVERRIDE_CFESIZE,
-+ .mask_flags = MTD_WRITEABLE /* force read-only */
-+ },
-+#define SLOT_LINUX 1
-+ {
-+ .name = "linux",
-+ .offset = 0,
-+ .size = 0,
-+ },
-+#define SLOT_ROOTFS 2
-+ {
-+ .name = "rootfs",
-+ .offset = 0,
-+ .size = 0,
-+ },
-+#define SLOT_CFGFS 3
-+ {
-+ .name = "cfgfs",
-+ .offset = 0,
-+ .size = 0,
-+ },
-+#define SLOT_NVRAM 4
-+ {
-+ .name = "nvram",
-+ .offset = 0,
-+ .size = 0,
-+ },
-+};
-+
-+static struct physmap_flash_data bcm47xx_flash_data = {
-+ .parts = bcm47xx_partitions,
-+ .nr_parts = ARRAY_SIZE(bcm47xx_partitions)
-+};
-+
-+static struct resource bcm47xx_flash_resource = {
-+ .flags = IORESOURCE_MEM,
-+};
-+
-+static struct platform_device bcm47xx_flash = {
-+ .name = "physmap-flash",
-+ .id = 0,
-+ .dev = { .platform_data = &bcm47xx_flash_data, },
-+ .resource = &bcm47xx_flash_resource,
-+ .num_resources = 1,
-+};
-+
-+static struct platform_device *bcm47xx_devices[] __initdata = {
-+ &bcm47xx_flash,
-+};
-+
-+struct bcm47xx_trx_header {
-+#define BCM47XX_TRX_MAGIC 0x30524448
-+ u32 magic;
-+ u32 len;
-+ u32 crc32;
-+ u32 flag_version;
-+ u32 offsets[3];
-+};
-+
-+#define UPTODOWN(slot, psize) do { \
-+ posn -= psize; left -= psize; \
-+ bcm47xx_partitions[slot].offset = posn; \
-+ bcm47xx_partitions[slot].size = psize; \
-+} while (/* CONSTCOND */ 0)
-+
-+static int __init bcm47xx_register_devices(void)