linux: update to 3.12.69, add qemu arm nommu patch

29 files changed, 19 insertions, 31 deletions

diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index ade00b4f1..58f95dd55 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -46,10 +46,10 @@ KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		5661ccb8e45ec290d16d9617056d32f54bdea1357b1b3047c9c4042c78824db2
 endif
 ifeq ($(ADK_TARGET_KERNEL_VERSION_3_12),y)
-KERNEL_FILE_VER:=	3.12.66
+KERNEL_FILE_VER:=	3.12.69
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:=		8c219fd19367423be58a50584d293e593ff0aba65f95db2b08303090f561ca0a
+KERNEL_HASH:=		b5b2753d17e4f95acd7c8b2bd3a6d61a8fe35ff4d9ce6189ae500b096485efdf
 endif
 ifeq ($(ADK_TARGET_KERNEL_VERSION_3_10),y)
 KERNEL_FILE_VER:=	3.10.104
diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion
index a84441ad4..6f999bd91 100644
--- a/target/config/Config.in.kernelversion
+++ b/target/config/Config.in.kernelversion
@@ -85,7 +85,7 @@ config ADK_TARGET_KERNEL_VERSION_3_18
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
 
 config ADK_TARGET_KERNEL_VERSION_3_12
-	bool "3.12.66"
+	bool "3.12.69"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_H8300
@@ -99,7 +99,6 @@ config ADK_TARGET_KERNEL_VERSION_3_12
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
 	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
-	depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU
 	depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2
 	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
diff --git a/target/linux/patches/3.12.66/bsd-compatibility.patch b/target/linux/patches/3.12.69/bsd-compatibility.patch
index b954b658f..b954b658f 100644
--- a/target/linux/patches/3.12.66/bsd-compatibility.patch
+++ b/target/linux/patches/3.12.69/bsd-compatibility.patch
diff --git a/target/linux/patches/3.12.66/cleankernel.patch b/target/linux/patches/3.12.69/cleankernel.patch
index d8c055dc3..d8c055dc3 100644
--- a/target/linux/patches/3.12.66/cleankernel.patch
+++ b/target/linux/patches/3.12.69/cleankernel.patch
diff --git a/target/linux/patches/3.12.66/defaults.patch b/target/linux/patches/3.12.69/defaults.patch
index 6cdca084e..6cdca084e 100644
--- a/target/linux/patches/3.12.66/defaults.patch
+++ b/target/linux/patches/3.12.69/defaults.patch
diff --git a/target/linux/patches/3.12.66/disable-netfilter.patch b/target/linux/patches/3.12.69/disable-netfilter.patch
index 7b1ca013a..7b1ca013a 100644
--- a/target/linux/patches/3.12.66/disable-netfilter.patch
+++ b/target/linux/patches/3.12.69/disable-netfilter.patch
diff --git a/target/linux/patches/3.12.66/export-symbol-for-exmap.patch b/target/linux/patches/3.12.69/export-symbol-for-exmap.patch
index 4f0fc8449..4f0fc8449 100644
--- a/target/linux/patches/3.12.66/export-symbol-for-exmap.patch
+++ b/target/linux/patches/3.12.69/export-symbol-for-exmap.patch
diff --git a/target/linux/patches/3.12.66/gemalto.patch b/target/linux/patches/3.12.69/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.12.66/gemalto.patch
+++ b/target/linux/patches/3.12.69/gemalto.patch
diff --git a/target/linux/patches/3.12.66/lemote-rfkill.patch b/target/linux/patches/3.12.69/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.12.66/lemote-rfkill.patch
+++ b/target/linux/patches/3.12.69/lemote-rfkill.patch
diff --git a/target/linux/patches/3.12.66/microblaze-ethernet.patch b/target/linux/patches/3.12.69/microblaze-ethernet.patch
index 742ab477e..742ab477e 100644
--- a/target/linux/patches/3.12.66/microblaze-ethernet.patch
+++ b/target/linux/patches/3.12.69/microblaze-ethernet.patch
diff --git a/target/linux/patches/3.12.66/microblaze-setup.patch b/target/linux/patches/3.12.69/microblaze-setup.patch
index 43815f274..43815f274 100644
--- a/target/linux/patches/3.12.66/microblaze-setup.patch
+++ b/target/linux/patches/3.12.69/microblaze-setup.patch
diff --git a/target/linux/patches/3.12.66/mips-lzo-fix.patch b/target/linux/patches/3.12.69/mips-lzo-fix.patch
index 0740bdc6a..0740bdc6a 100644
--- a/target/linux/patches/3.12.66/mips-lzo-fix.patch
+++ b/target/linux/patches/3.12.69/mips-lzo-fix.patch
diff --git a/target/linux/patches/3.12.66/mkpiggy.patch b/target/linux/patches/3.12.69/mkpiggy.patch
index d4e815cd2..d4e815cd2 100644
--- a/target/linux/patches/3.12.66/mkpiggy.patch
+++ b/target/linux/patches/3.12.69/mkpiggy.patch
diff --git a/target/linux/patches/3.12.66/mtd-rootfs.patch b/target/linux/patches/3.12.69/mtd-rootfs.patch
index 775d5fc80..775d5fc80 100644
--- a/target/linux/patches/3.12.66/mtd-rootfs.patch
+++ b/target/linux/patches/3.12.69/mtd-rootfs.patch
diff --git a/target/linux/patches/3.12.66/non-static.patch b/target/linux/patches/3.12.69/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.12.66/non-static.patch
+++ b/target/linux/patches/3.12.69/non-static.patch
diff --git a/target/linux/patches/3.12.66/ppc64-missing-zlib.patch b/target/linux/patches/3.12.69/ppc64-missing-zlib.patch
index c6e0616be..c6e0616be 100644
--- a/target/linux/patches/3.12.66/ppc64-missing-zlib.patch
+++ b/target/linux/patches/3.12.69/ppc64-missing-zlib.patch
diff --git a/target/linux/patches/3.12.66/regmap-bool.patch b/target/linux/patches/3.12.69/regmap-bool.patch
index c3fd9a318..c3fd9a318 100644
--- a/target/linux/patches/3.12.66/regmap-bool.patch
+++ b/target/linux/patches/3.12.69/regmap-bool.patch
diff --git a/target/linux/patches/3.12.66/relocs.patch b/target/linux/patches/3.12.69/relocs.patch
index 649b9e73e..649b9e73e 100644
--- a/target/linux/patches/3.12.66/relocs.patch
+++ b/target/linux/patches/3.12.69/relocs.patch
diff --git a/target/linux/patches/3.12.66/sgidefs.patch b/target/linux/patches/3.12.69/sgidefs.patch
index f00a284d9..f00a284d9 100644
--- a/target/linux/patches/3.12.66/sgidefs.patch
+++ b/target/linux/patches/3.12.69/sgidefs.patch
diff --git a/target/linux/patches/3.12.66/sortext.patch b/target/linux/patches/3.12.69/sortext.patch
index 8fd4e1d6b..8fd4e1d6b 100644
--- a/target/linux/patches/3.12.66/sortext.patch
+++ b/target/linux/patches/3.12.69/sortext.patch
diff --git a/target/linux/patches/3.12.66/startup.patch b/target/linux/patches/3.12.69/startup.patch
index 4cd477da1..4cd477da1 100644
--- a/target/linux/patches/3.12.66/startup.patch
+++ b/target/linux/patches/3.12.69/startup.patch
diff --git a/target/linux/patches/3.12.66/usb-defaults-off.patch b/target/linux/patches/3.12.69/usb-defaults-off.patch
index 54dff2bd4..54dff2bd4 100644
--- a/target/linux/patches/3.12.66/usb-defaults-off.patch
+++ b/target/linux/patches/3.12.69/usb-defaults-off.patch
diff --git a/target/linux/patches/3.12.69/versatile-nommu.patch b/target/linux/patches/3.12.69/versatile-nommu.patch
new file mode 100644
index 000000000..a4b99ad54
--- /dev/null
+++ b/target/linux/patches/3.12.69/versatile-nommu.patch
@@ -0,0 +1,16 @@
+diff -Nur linux-3.12.69.orig/arch/arm/mach-versatile/include/mach/hardware.h linux-3.12.69/arch/arm/mach-versatile/include/mach/hardware.h
+--- linux-3.12.69.orig/arch/arm/mach-versatile/include/mach/hardware.h	2016-12-13 20:52:06.000000000 +0100
++++ linux-3.12.69/arch/arm/mach-versatile/include/mach/hardware.h	2016-12-27 14:28:35.896220019 +0100
+@@ -30,8 +30,12 @@
+ #define VERSATILE_PCI_VIRT_BASE		(void __iomem *)0xe8000000ul
+ #define VERSATILE_PCI_CFG_VIRT_BASE	(void __iomem *)0xe9000000ul
+ 
++#ifdef CONFIG_MMU
+ /* macro to get at MMIO space when running virtually */
+ #define IO_ADDRESS(x)		(((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000)
++#else
++#define IO_ADDRESS(x)		(x)
++#endif
+ 
+ #define __io_address(n)		((void __iomem __force *)IO_ADDRESS(n))
+ 
diff --git a/target/linux/patches/3.12.66/wlan-cf.patch b/target/linux/patches/3.12.69/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.12.66/wlan-cf.patch
+++ b/target/linux/patches/3.12.69/wlan-cf.patch
diff --git a/target/linux/patches/3.12.66/xargs.patch b/target/linux/patches/3.12.69/xargs.patch
index 2c7b3df59..2c7b3df59 100644
--- a/target/linux/patches/3.12.66/xargs.patch
+++ b/target/linux/patches/3.12.69/xargs.patch
diff --git a/target/linux/patches/3.12.66/yaffs2.patch b/target/linux/patches/3.12.69/yaffs2.patch
index 306814439..306814439 100644
--- a/target/linux/patches/3.12.66/yaffs2.patch
+++ b/target/linux/patches/3.12.69/yaffs2.patch
diff --git a/target/linux/patches/3.12.66/zlib-inflate.patch b/target/linux/patches/3.12.69/zlib-inflate.patch
index 58e1f6d21..58e1f6d21 100644
--- a/target/linux/patches/3.12.66/zlib-inflate.patch
+++ b/target/linux/patches/3.12.69/zlib-inflate.patch
diff --git a/target/mips/mikrotik-rb532/patches/3.12.66/rb532-cfgfs.patch b/target/mips/mikrotik-rb532/patches/3.12.66/rb532-cfgfs.patch
deleted file mode 100644
index 36ce30d91..000000000
--- a/target/mips/mikrotik-rb532/patches/3.12.66/rb532-cfgfs.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur linux-3.14.5.orig/arch/mips/rb532/devices.c linux-3.14.5/arch/mips/rb532/devices.c
---- linux-3.14.5.orig/arch/mips/rb532/devices.c	2014-05-31 21:34:37.000000000 +0200
-+++ linux-3.14.5/arch/mips/rb532/devices.c	2014-06-04 17:40:36.318731659 +0200
-@@ -191,7 +191,11 @@
- 	}, {
- 		.name = "rootfs",
- 		.offset = MTDPART_OFS_NXTBLK,
--		.size = MTDPART_SIZ_FULL,
-+		.size = 108 * 1024 * 1024,
-+	}, {
-+		.name = "cfgfs",
-+		.offset = MTDPART_OFS_NXTBLK,
-+		.size = 16 * 1024 * 1024,
- 	}
- };
- 
diff --git a/target/mips/mikrotik-rb532/patches/3.12.66/rb532-pci.patch b/target/mips/mikrotik-rb532/patches/3.12.66/rb532-pci.patch
deleted file mode 100644
index adfa652b5..000000000
--- a/target/mips/mikrotik-rb532/patches/3.12.66/rb532-pci.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur linux-3.14.3.orig/arch/mips/pci/pci-rc32434.c linux-3.14.3/arch/mips/pci/pci-rc32434.c
---- linux-3.14.3.orig/arch/mips/pci/pci-rc32434.c	2014-05-06 16:59:58.000000000 +0200
-+++ linux-3.14.3/arch/mips/pci/pci-rc32434.c	2014-05-13 17:15:48.000000000 +0200
-@@ -53,7 +53,6 @@
- 	.start = 0x50000000,
- 	.end = 0x5FFFFFFF,
- 	.flags = IORESOURCE_MEM,
--	.parent = &rc32434_res_pci_mem1,
- 	.sibling = NULL,
- 	.child = &rc32434_res_pci_mem2
- };