summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/kernel-ver.mk12
-rw-r--r--target/config/Config.in.kernelversion8
-rw-r--r--target/linux/patches/2.6.32.70/cris-header.patch (renamed from target/linux/patches/2.6.32.69/cris-header.patch)0
-rw-r--r--target/linux/patches/2.6.32.70/cris-initramfs.patch (renamed from target/linux/patches/2.6.32.69/cris-initramfs.patch)0
-rw-r--r--target/linux/patches/3.2.77/sparc-aout.patch (renamed from target/linux/patches/3.2.69/sparc-aout.patch)0
-rw-r--r--target/mips/systems/qemu-mips4
6 files changed, 13 insertions, 11 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 34616fa2b..a044ac493 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -67,15 +67,15 @@ KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
KERNEL_HASH:= 3bc608bc722755128f14ab4a31b973789e23753d6ac8db417498d0f9911ce7d0
endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_3_2_74),y)
-KERNEL_FILE_VER:= 3.2.74
+ifeq ($(ADK_TARGET_KERNEL_VERSION_3_2_77),y)
+KERNEL_FILE_VER:= 3.2.77
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:= 9271c9b72f70cc57a414c8de93e1eeaab48dfd7a2d147d24a116e8f49b17ed75
+KERNEL_HASH:= ce34dac6df719b3bcd99d1380bddf354a0319ae27326a4e10e556a0c5a3df18f
endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_2_6_32_69),y)
-KERNEL_FILE_VER:= 2.6.32.69
+ifeq ($(ADK_TARGET_KERNEL_VERSION_2_6_32_70),y)
+KERNEL_FILE_VER:= 2.6.32.70
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:= 3412b1ae5e8f7a5266a602fb3022e802091c10595c6ecf4a790214a833bf034d
+KERNEL_HASH:= d7d0ee4588711d4f85ed67b65d447b4bbbe215e600a771fb87a62524b6341c43
endif
diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion
index 1d893d48f..2b758d9c9 100644
--- a/target/config/Config.in.kernelversion
+++ b/target/config/Config.in.kernelversion
@@ -101,8 +101,8 @@ config ADK_TARGET_KERNEL_VERSION_3_4_110
depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
select ADK_TARGET_KERNEL_VERSION_3_4
-config ADK_TARGET_KERNEL_VERSION_3_2_74
- bool "3.2.74"
+config ADK_TARGET_KERNEL_VERSION_3_2_77
+ bool "3.2.77"
depends on !ADK_TARGET_ARCH_ARC
depends on !ADK_TARGET_ARCH_BFIN
depends on !ADK_TARGET_ARCH_H8300
@@ -115,8 +115,8 @@ config ADK_TARGET_KERNEL_VERSION_3_2_74
depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
select ADK_TARGET_KERNEL_VERSION_3_2
-config ADK_TARGET_KERNEL_VERSION_2_6_32_69
- bool "2.6.32.69"
+config ADK_TARGET_KERNEL_VERSION_2_6_32_70
+ bool "2.6.32.70"
depends on !ADK_TARGET_ARCH_ARC
depends on !ADK_TARGET_ARCH_BFIN
depends on !ADK_TARGET_ARCH_H8300
diff --git a/target/linux/patches/2.6.32.69/cris-header.patch b/target/linux/patches/2.6.32.70/cris-header.patch
index 1645d519c..1645d519c 100644
--- a/target/linux/patches/2.6.32.69/cris-header.patch
+++ b/target/linux/patches/2.6.32.70/cris-header.patch
diff --git a/target/linux/patches/2.6.32.69/cris-initramfs.patch b/target/linux/patches/2.6.32.70/cris-initramfs.patch
index b709e705e..b709e705e 100644
--- a/target/linux/patches/2.6.32.69/cris-initramfs.patch
+++ b/target/linux/patches/2.6.32.70/cris-initramfs.patch
diff --git a/target/linux/patches/3.2.69/sparc-aout.patch b/target/linux/patches/3.2.77/sparc-aout.patch
index 6ad252479..6ad252479 100644
--- a/target/linux/patches/3.2.69/sparc-aout.patch
+++ b/target/linux/patches/3.2.77/sparc-aout.patch
diff --git a/target/mips/systems/qemu-mips b/target/mips/systems/qemu-mips
index 898d6959d..462e0c45d 100644
--- a/target/mips/systems/qemu-mips
+++ b/target/mips/systems/qemu-mips
@@ -1,7 +1,9 @@
config ADK_TARGET_SYSTEM_QEMU_MIPS
bool "Qemu Emulator"
select ADK_TARGET_QEMU
- select ADK_TARGET_KERNEL_VMLINUZ
+ select ADK_TARGET_KERNEL_VMLINUZ if ADK_TARGET_KERNEL_VERSION_4_4
+ select ADK_TARGET_KERNEL_VMLINUZ if ADK_TARGET_KERNEL_VERSION_4_3
+ select ADK_TARGET_KERNEL_VMLINUZ if ADK_TARGET_KERNEL_VERSION_4_1
select ADK_TARGET_KERNEL_WITH_COMPRESSION
help
Qemu support for MIPS architecture.