linux: update to 3.12.69, add qemu arm nommu patch

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

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

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))
+ 

target/mips/mikrotik-rb532/patches/3.12.66/rb532-cfgfs.patch

@@ -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,
- 	}
- };
- 

target/mips/mikrotik-rb532/patches/3.12.66/rb532-pci.patch

@@ -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
- };