main/linux-grsec: arm build fixes and changes

fix spi-nor build on arm
add some more arm boards

3 files changed, 295 insertions, 19 deletions

diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 8f91487a40..863506e68f 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -20,6 +20,7 @@ source="http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz
 	http://dev.alpinelinux.org/~tteras/grsec/grsecurity-3.1-3.18.11-201504051405-alpine.patch
 
 	fix-memory-map-for-PIE-applications.patch
+	fix-spi-nor-namespace-clash.patch
 	imx6q-no-unclocked-sleep.patch
 
 	kernelconfig.x86
@@ -168,23 +169,26 @@ md5sums="9e854df51ca3fef8bfe566dbd7b89241  linux-3.18.tar.xz
 ac5c93edbc9385793ccc33f4ced85950  patch-3.18.11.xz
 65f35409fb43e0dbceb991e4e35464d9  grsecurity-3.1-3.18.11-201504051405-alpine.patch
 c6a4ae7e8ca6159e1631545515805216  fix-memory-map-for-PIE-applications.patch
+b0337a2a9abed17c37eae5db332522d2  fix-spi-nor-namespace-clash.patch
 1a307fc1d63231bf01d22493a4f14378  imx6q-no-unclocked-sleep.patch
 d487c7dd7e28a7698367ff714b68bd67  kernelconfig.x86
 688dd08f9922f808fc8ace62aa199ab7  kernelconfig.x86_64
-053247394129c69a97d81dfdfd8de5b9  kernelconfig.armhf"
+b76320f7372e32f37e4f528922942aad  kernelconfig.armhf"
 sha256sums="becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd  linux-3.18.tar.xz
 e4c44f887f507b2470a5c2f1c286a38fec6e84c4d433c929981abab7b83f80d5  patch-3.18.11.xz
 02b84adad6299db774013728dc4cffb95b31903b209c78fa88dcf8b1f60a0469  grsecurity-3.1-3.18.11-201504051405-alpine.patch
 500f3577310be52e87b9fecdc2e9c4ca43210fd97d69089f9005d484563f74c7  fix-memory-map-for-PIE-applications.patch
+01279cfb93273d99670c56e2465957ecde3d03693beeb929a743f03afa0b7bdc  fix-spi-nor-namespace-clash.patch
 21179fbb22a5b74af0a609350ae1a170e232908572b201d02e791d2ce0a685d3  imx6q-no-unclocked-sleep.patch
 3cdcbad352ac4e76e8802c6860fc87a168219bfbe3e2d5d475fb4171aaa5fd94  kernelconfig.x86
 519a8c925216feeeaea2b2524297b07a2eab8f05e92d7506ced5d5e0ce60246b  kernelconfig.x86_64
-55512f2fae546d4fca88cfd5111193e732172888bbc268df7bff4ef32dfbd663  kernelconfig.armhf"
+1728a69d2dd8176eb6c491d728f17a6a157d2e329e09523c7c1931533e835ea6  kernelconfig.armhf"
 sha512sums="2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009  linux-3.18.tar.xz
 cc4ac5d341ca4e9d71ef1ba45a839b18947e3e7ffdc7f7efe2c211c95483518a1983bc3637edd607e0631f14c1cc9bfb9164926261d2cf5c2bb2eb91206f43b9  patch-3.18.11.xz
 0b9b265b5b633d99eef1adf0e8284e72ee9355d6348835b15bfb8661caf96ac82d37593ef3658a0ccd47b64520195bf6c93840c1edcbc92f8ef00a8524a08e4b  grsecurity-3.1-3.18.11-201504051405-alpine.patch
 4665c56ae1bbac311f9205d64918e84ee8b01d47d6e2396ff6b8adfb10aada7f7254531ce62e31edbb65c2a54a830f09ad05d314dfcd75d6272f4068945ad7c7  fix-memory-map-for-PIE-applications.patch
+4e3aeb70712f9838afea75fe9e6c1389414d833a89286ea55441d6a8d54ce74b0e39b565721e3153443af0a614bff57c767251b7e5b81faa5e0784eddfcd2164  fix-spi-nor-namespace-clash.patch
 87d1ad59732f265a5b0db54490dc1762c14ea4b868e7eb1aedc3ce57b48046de7bbc08cf5cfcf6f1380fa84063b0edb16ba3d5e3c5670be9bbb229275c88b221  imx6q-no-unclocked-sleep.patch
 fcc7c293643b543b594f0a8c039a779101f0b131c89303adffb69cfe33a88ba65bb0a25dfcf64a59cf69621320cf5c39c92144d81e4f8edd86c8b285eed8d0a7  kernelconfig.x86
 056e84168b72a61b71447a4e601c356baa2215496344a2771f7fe38680288a22230730ac44c9f454dbcc8ab0b2a48c6dc3a7072bca3e50bed94e44cbe513e30e  kernelconfig.x86_64
-75840645e436726dc32a33f98dfaee745a7ed3cf9006dfdcd54fc5c59cd8a5d2a63d4f898ab7feae011bfb2e5053741fcc5af946462da32b78ed7bc3e679beff  kernelconfig.armhf"
+001c1db7b95e9d024d49310df69ff68186e5aed04bb4643af4e29ffd0c8c43cc45316ecde6e6d92bdf5980804b650bd7cdc0793a50c78f3adfa98d30edc4380f  kernelconfig.armhf"
diff --git a/main/linux-grsec/fix-spi-nor-namespace-clash.patch b/main/linux-grsec/fix-spi-nor-namespace-clash.patch
new file mode 100644
index 0000000000..9f09238b1e
--- /dev/null
+++ b/main/linux-grsec/fix-spi-nor-namespace-clash.patch
@@ -0,0 +1,101 @@
+grsec patch includes <linux/fs.h> which defines READ and WRITE.
+Remove the macro hackery, and use the proper #define names for
+macro invocations so there's no surprises.
+
+--- linux-3.18/drivers/mtd/spi-nor/fsl-quadspi.c.orig
++++ linux-3.18/drivers/mtd/spi-nor/fsl-quadspi.c
+@@ -166,8 +166,8 @@
+ 
+ /* Macros for constructing the LUT register. */
+ #define LUT0(ins, pad, opr)						\
+-		(((opr) << OPRND0_SHIFT) | ((LUT_##pad) << PAD0_SHIFT) | \
+-		((LUT_##ins) << INSTR0_SHIFT))
++		(((opr) << OPRND0_SHIFT) | ((pad) << PAD0_SHIFT) | \
++		((ins) << INSTR0_SHIFT))
+ 
+ #define LUT1(ins, pad, opr)	(LUT0(ins, pad, opr) << OPRND1_SHIFT)
+ 
+@@ -304,14 +304,14 @@
+ 		dummy = 8;
+ 	}
+ 
+-	writel(LUT0(CMD, PAD1, cmd) | LUT1(ADDR, PAD1, addrlen),
++	writel(LUT0(LUT_CMD, LUT_PAD1, cmd) | LUT1(LUT_ADDR, LUT_PAD1, addrlen),
+ 			base + QUADSPI_LUT(lut_base));
+-	writel(LUT0(DUMMY, PAD1, dummy) | LUT1(READ, PAD4, rxfifo),
++	writel(LUT0(LUT_DUMMY, LUT_PAD1, dummy) | LUT1(LUT_READ, LUT_PAD4, rxfifo),
+ 			base + QUADSPI_LUT(lut_base + 1));
+ 
+ 	/* Write enable */
+ 	lut_base = SEQID_WREN * 4;
+-	writel(LUT0(CMD, PAD1, SPINOR_OP_WREN), base + QUADSPI_LUT(lut_base));
++	writel(LUT0(LUT_CMD, LUT_PAD1, SPINOR_OP_WREN), base + QUADSPI_LUT(lut_base));
+ 
+ 	/* Page Program */
+ 	lut_base = SEQID_PP * 4;
+@@ -325,13 +325,13 @@
+ 		addrlen = ADDR32BIT;
+ 	}
+ 
+-	writel(LUT0(CMD, PAD1, cmd) | LUT1(ADDR, PAD1, addrlen),
++	writel(LUT0(LUT_CMD, LUT_PAD1, cmd) | LUT1(LUT_ADDR, LUT_PAD1, addrlen),
+ 			base + QUADSPI_LUT(lut_base));
+-	writel(LUT0(WRITE, PAD1, 0), base + QUADSPI_LUT(lut_base + 1));
++	writel(LUT0(LUT_WRITE, LUT_PAD1, 0), base + QUADSPI_LUT(lut_base + 1));
+ 
+ 	/* Read Status */
+ 	lut_base = SEQID_RDSR * 4;
+-	writel(LUT0(CMD, PAD1, SPINOR_OP_RDSR) | LUT1(READ, PAD1, 0x1),
++	writel(LUT0(LUT_CMD, LUT_PAD1, SPINOR_OP_RDSR) | LUT1(LUT_READ, LUT_PAD1, 0x1),
+ 			base + QUADSPI_LUT(lut_base));
+ 
+ 	/* Erase a sector */
+@@ -346,40 +346,40 @@
+ 		addrlen = ADDR32BIT;
+ 	}
+ 
+-	writel(LUT0(CMD, PAD1, cmd) | LUT1(ADDR, PAD1, addrlen),
++	writel(LUT0(LUT_CMD, LUT_PAD1, cmd) | LUT1(LUT_ADDR, LUT_PAD1, addrlen),
+ 			base + QUADSPI_LUT(lut_base));
+ 
+ 	/* Erase the whole chip */
+ 	lut_base = SEQID_CHIP_ERASE * 4;
+-	writel(LUT0(CMD, PAD1, SPINOR_OP_CHIP_ERASE),
++	writel(LUT0(LUT_CMD, LUT_PAD1, SPINOR_OP_CHIP_ERASE),
+ 			base + QUADSPI_LUT(lut_base));
+ 
+ 	/* READ ID */
+ 	lut_base = SEQID_RDID * 4;
+-	writel(LUT0(CMD, PAD1, SPINOR_OP_RDID) | LUT1(READ, PAD1, 0x8),
++	writel(LUT0(LUT_CMD, LUT_PAD1, SPINOR_OP_RDID) | LUT1(LUT_READ, LUT_PAD1, 0x8),
+ 			base + QUADSPI_LUT(lut_base));
+ 
+ 	/* Write Register */
+ 	lut_base = SEQID_WRSR * 4;
+-	writel(LUT0(CMD, PAD1, SPINOR_OP_WRSR) | LUT1(WRITE, PAD1, 0x2),
++	writel(LUT0(LUT_CMD, LUT_PAD1, SPINOR_OP_WRSR) | LUT1(LUT_WRITE, LUT_PAD1, 0x2),
+ 			base + QUADSPI_LUT(lut_base));
+ 
+ 	/* Read Configuration Register */
+ 	lut_base = SEQID_RDCR * 4;
+-	writel(LUT0(CMD, PAD1, SPINOR_OP_RDCR) | LUT1(READ, PAD1, 0x1),
++	writel(LUT0(LUT_CMD, LUT_PAD1, SPINOR_OP_RDCR) | LUT1(LUT_READ, LUT_PAD1, 0x1),
+ 			base + QUADSPI_LUT(lut_base));
+ 
+ 	/* Write disable */
+ 	lut_base = SEQID_WRDI * 4;
+-	writel(LUT0(CMD, PAD1, SPINOR_OP_WRDI), base + QUADSPI_LUT(lut_base));
++	writel(LUT0(LUT_CMD, LUT_PAD1, SPINOR_OP_WRDI), base + QUADSPI_LUT(lut_base));
+ 
+ 	/* Enter 4 Byte Mode (Micron) */
+ 	lut_base = SEQID_EN4B * 4;
+-	writel(LUT0(CMD, PAD1, SPINOR_OP_EN4B), base + QUADSPI_LUT(lut_base));
++	writel(LUT0(LUT_CMD, LUT_PAD1, SPINOR_OP_EN4B), base + QUADSPI_LUT(lut_base));
+ 
+ 	/* Enter 4 Byte Mode (Spansion) */
+ 	lut_base = SEQID_BRWR * 4;
+-	writel(LUT0(CMD, PAD1, SPINOR_OP_BRWR), base + QUADSPI_LUT(lut_base));
++	writel(LUT0(LUT_CMD, LUT_PAD1, SPINOR_OP_BRWR), base + QUADSPI_LUT(lut_base));
+ 
+ 	fsl_qspi_lock_lut(q);
+ }
diff --git a/main/linux-grsec/kernelconfig.armhf b/main/linux-grsec/kernelconfig.armhf
index 49105eb2e7..e11ed5c81b 100644
--- a/main/linux-grsec/kernelconfig.armhf
+++ b/main/linux-grsec/kernelconfig.armhf
@@ -385,11 +385,13 @@ CONFIG_ARCH_OMAP=y
 #
 # OMAP Feature Selections
 #
+# CONFIG_POWER_AVS_OMAP is not set
 # CONFIG_OMAP_RESET_CLOCKS is not set
 CONFIG_OMAP_MUX=y
 # CONFIG_OMAP_MUX_DEBUG is not set
 CONFIG_OMAP_MUX_WARNINGS=y
 CONFIG_OMAP_32K_TIMER=y
+# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
 CONFIG_OMAP_DM_TIMER=y
 CONFIG_OMAP_PM_NOOP=y
 CONFIG_MACH_OMAP_GENERIC=y
@@ -397,11 +399,11 @@ CONFIG_MACH_OMAP_GENERIC=y
 #
 # TI OMAP/AM/DM/DRA Family
 #
-# CONFIG_ARCH_OMAP3 is not set
-# CONFIG_ARCH_OMAP4 is not set
-# CONFIG_SOC_OMAP5 is not set
+CONFIG_ARCH_OMAP3=y
+CONFIG_ARCH_OMAP4=y
+CONFIG_SOC_OMAP5=y
 CONFIG_SOC_AM33XX=y
-# CONFIG_SOC_AM43XX is not set
+CONFIG_SOC_AM43XX=y
 # CONFIG_SOC_DRA7XX is not set
 CONFIG_ARCH_OMAP2PLUS=y
 
@@ -409,11 +411,36 @@ CONFIG_ARCH_OMAP2PLUS=y
 # TI OMAP2/3/4 Specific Features
 #
 CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
-# CONFIG_SOC_HAS_OMAP2_SDRC is not set
+CONFIG_SOC_HAS_OMAP2_SDRC=y
+CONFIG_SOC_HAS_REALTIME_COUNTER=y
+CONFIG_SOC_OMAP3430=y
+CONFIG_SOC_TI81XX=y
+CONFIG_OMAP_PACKAGE_CBB=y
+CONFIG_OMAP_PACKAGE_CUS=y
 
 #
 # OMAP Legacy Platform Data Board Type
 #
+CONFIG_MACH_OMAP3_BEAGLE=y
+CONFIG_MACH_DEVKIT8000=y
+CONFIG_MACH_OMAP_LDP=y
+CONFIG_MACH_OMAP3530_LV_SOM=y
+CONFIG_MACH_OMAP3_TORPEDO=y
+CONFIG_MACH_OVERO=y
+CONFIG_MACH_OMAP3517EVM=y
+# CONFIG_MACH_CRANEBOARD is not set
+CONFIG_MACH_OMAP3_PANDORA=y
+CONFIG_MACH_TOUCHBOOK=y
+CONFIG_MACH_OMAP_3430SDP=y
+CONFIG_MACH_NOKIA_RX51=y
+CONFIG_MACH_CM_T35=y
+CONFIG_MACH_CM_T3517=y
+CONFIG_MACH_CM_T3730=y
+CONFIG_MACH_SBC3530=y
+CONFIG_MACH_TI8168EVM=y
+CONFIG_MACH_TI8148EVM=y
+# CONFIG_OMAP3_EMU is not set
+# CONFIG_OMAP3_SDRC_AC_TIMING is not set
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_MSM8X60=y
 CONFIG_ARCH_MSM8960=y
@@ -424,9 +451,45 @@ CONFIG_QCOM_SCM=y
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_ARCH_STI is not set
 # CONFIG_ARCH_S5PV210 is not set
-# CONFIG_ARCH_EXYNOS is not set
+CONFIG_ARCH_EXYNOS=y
+# CONFIG_ARCH_EXYNOS3 is not set
+CONFIG_ARCH_EXYNOS4=y
+CONFIG_ARCH_EXYNOS5=y
+
+#
+# EXYNOS SoCs
+#
+CONFIG_CPU_EXYNOS4210=y
+CONFIG_SOC_EXYNOS4212=y
+CONFIG_SOC_EXYNOS4412=y
+CONFIG_SOC_EXYNOS5250=y
+CONFIG_SOC_EXYNOS5260=y
+CONFIG_SOC_EXYNOS5410=y
+CONFIG_SOC_EXYNOS5420=y
+CONFIG_SOC_EXYNOS5440=y
+CONFIG_SOC_EXYNOS5800=y
+CONFIG_PLAT_SAMSUNG=y
+
+#
+# Samsung Common options
+#
+
+#
+# Boot options
+#
+CONFIG_S5P_DEV_MFC=y
+
+#
+# Power management
+#
+# CONFIG_SAMSUNG_PM_CHECK is not set
 # CONFIG_ARCH_SHMOBILE_MULTI is not set
-# CONFIG_ARCH_SUNXI is not set
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN4I=y
+CONFIG_MACH_SUN5I=y
+CONFIG_MACH_SUN6I=y
+CONFIG_MACH_SUN7I=y
+CONFIG_MACH_SUN8I=y
 # CONFIG_ARCH_SIRF is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_U8500 is not set
@@ -525,18 +588,18 @@ CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_NR_CPUS=4
 CONFIG_HOTPLUG_CPU=y
 CONFIG_ARM_PSCI=y
-CONFIG_ARCH_NR_GPIO=0
+CONFIG_ARCH_NR_GPIO=512
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
-CONFIG_HZ_FIXED=0
-CONFIG_HZ_100=y
+CONFIG_HZ_FIXED=200
+# CONFIG_HZ_100 is not set
 # CONFIG_HZ_200 is not set
 # CONFIG_HZ_250 is not set
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_500 is not set
 # CONFIG_HZ_1000 is not set
-CONFIG_HZ=100
+CONFIG_HZ=200
 CONFIG_SCHED_HRTICK=y
 # CONFIG_THUMB2_KERNEL is not set
 CONFIG_AEABI=y
@@ -621,6 +684,12 @@ CONFIG_CPUFREQ_DT=m
 #
 # ARM CPU frequency scaling drivers
 #
+CONFIG_ARM_EXYNOS_CPUFREQ=y
+CONFIG_ARM_EXYNOS4210_CPUFREQ=y
+CONFIG_ARM_EXYNOS4X12_CPUFREQ=y
+CONFIG_ARM_EXYNOS5250_CPUFREQ=y
+CONFIG_ARM_EXYNOS5440_CPUFREQ=y
+# CONFIG_ARM_EXYNOS_CPU_FREQ_BOOST_SW is not set
 CONFIG_ARM_IMX6Q_CPUFREQ=y
 # CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
 CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
@@ -636,7 +705,8 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 # ARM CPU Idle Drivers
 #
 # CONFIG_ARM_HIGHBANK_CPUIDLE is not set
-# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
+# CONFIG_ARM_EXYNOS_CPUIDLE is not set
+CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
 
 #
 # Floating point emulation
@@ -676,7 +746,11 @@ CONFIG_PM=y
 CONFIG_APM_EMULATION=y
 CONFIG_PM_OPP=y
 CONFIG_PM_CLK=y
+CONFIG_PM_GENERIC_DOMAINS=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
+CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
+CONFIG_PM_GENERIC_DOMAINS_RUNTIME=y
+CONFIG_PM_GENERIC_DOMAINS_OF=y
 CONFIG_CPU_PM=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARM_CPU_SUSPEND=y
@@ -1456,7 +1530,7 @@ CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_BRCMSTB_GISB_ARB is not set
 # CONFIG_IMX_WEIM is not set
 # CONFIG_OMAP_OCP2SCP is not set
-# CONFIG_OMAP_INTERCONNECT is not set
+CONFIG_OMAP_INTERCONNECT=y
 # CONFIG_ARM_CCI is not set
 CONFIG_ARM_CCN=y
 CONFIG_VEXPRESS_CONFIG=y
@@ -1566,6 +1640,8 @@ CONFIG_MTD_NAND_PLATFORM=m
 CONFIG_MTD_ONENAND=m
 # CONFIG_MTD_ONENAND_VERIFY_WRITE is not set
 # CONFIG_MTD_ONENAND_GENERIC is not set
+# CONFIG_MTD_ONENAND_OMAP2 is not set
+# CONFIG_MTD_ONENAND_SAMSUNG is not set
 CONFIG_MTD_ONENAND_OTP=y
 CONFIG_MTD_ONENAND_2X_PROGRAM=y
 
@@ -1661,6 +1737,7 @@ CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_93XX46=m
+# CONFIG_EEPROM_SUNXI_SID is not set
 
 #
 # Texas Instruments shared transport line discipline
@@ -1754,6 +1831,7 @@ CONFIG_SATA_PMP=y
 #
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_AHCI_IMX=m
+# CONFIG_AHCI_SUNXI is not set
 CONFIG_ATA_SFF=y
 
 #
@@ -1867,6 +1945,8 @@ CONFIG_NET_DSA_MV88E6123_61_65=m
 CONFIG_NET_DSA_MV88E6171=m
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_ETHERNET=y
+CONFIG_NET_VENDOR_ALLWINNER=y
+# CONFIG_SUN4I_EMAC is not set
 CONFIG_ALTERA_TSE=m
 CONFIG_NET_XGENE=m
 CONFIG_NET_VENDOR_ARC=y
@@ -1915,6 +1995,7 @@ CONFIG_STMMAC_ETH=m
 # CONFIG_STMMAC_DEBUG_FS is not set
 # CONFIG_STMMAC_DA is not set
 CONFIG_NET_VENDOR_TI=y
+# CONFIG_TI_DAVINCI_EMAC is not set
 # CONFIG_TI_DAVINCI_MDIO is not set
 # CONFIG_TI_DAVINCI_CPDMA is not set
 # CONFIG_TI_CPSW is not set
@@ -1955,6 +2036,7 @@ CONFIG_MICREL_PHY=m
 # CONFIG_FIXED_PHY is not set
 CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_GPIO=m
+# CONFIG_MDIO_SUN4I is not set
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 CONFIG_MDIO_BCM_UNIMAC=m
@@ -2179,7 +2261,7 @@ CONFIG_INPUT=y
 CONFIG_INPUT_FF_MEMLESS=m
 CONFIG_INPUT_POLLDEV=m
 CONFIG_INPUT_SPARSEKMAP=m
-CONFIG_INPUT_MATRIXKMAP=m
+CONFIG_INPUT_MATRIXKMAP=y
 
 #
 # Userland interfaces
@@ -2217,10 +2299,11 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_OPENCORES is not set
 CONFIG_KEYBOARD_PMIC8XXX=m
-# CONFIG_KEYBOARD_SAMSUNG is not set
+CONFIG_KEYBOARD_SAMSUNG=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_OMAP4 is not set
+# CONFIG_KEYBOARD_TWL4030 is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_CAP1106 is not set
 CONFIG_INPUT_MOUSE=y
@@ -2308,6 +2391,7 @@ CONFIG_TOUCHSCREEN_TSC_SERIO=m
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_ST1232=m
+# CONFIG_TOUCHSCREEN_SUN4I is not set
 # CONFIG_TOUCHSCREEN_SUR40 is not set
 CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_TOUCHSCREEN_ZFORCE=m
@@ -2331,6 +2415,8 @@ CONFIG_INPUT_KXTJ9=m
 CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_YEALINK=m
 CONFIG_INPUT_CM109=m
+# CONFIG_INPUT_TWL4030_PWRBUTTON is not set
+# CONFIG_INPUT_TWL4030_VIBRA is not set
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_PCF50633_PMU=m
 CONFIG_INPUT_PCF8574=m
@@ -2399,6 +2485,9 @@ CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y
+# CONFIG_SERIAL_SAMSUNG is not set
+CONFIG_SERIAL_SAMSUNG_UARTS_4=y
+CONFIG_SERIAL_SAMSUNG_UARTS=4
 # CONFIG_SERIAL_MAX3100 is not set
 # CONFIG_SERIAL_MAX310X is not set
 CONFIG_SERIAL_IMX=y
@@ -2433,7 +2522,9 @@ CONFIG_IPMI_POWEROFF=m
 CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_OMAP=m
+CONFIG_HW_RANDOM_OMAP3_ROM=m
 CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_EXYNOS=m
 CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_MSM=m
 CONFIG_NVRAM=m
@@ -2478,8 +2569,10 @@ CONFIG_I2C_ALGOPCA=m
 #
 # CONFIG_I2C_CBUS_GPIO is not set
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+CONFIG_I2C_EXYNOS5=y
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_IMX=m
+# CONFIG_I2C_MV64XXX is not set
 # CONFIG_I2C_NOMADIK is not set
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_OMAP=y
@@ -2487,7 +2580,10 @@ CONFIG_I2C_PCA_PLATFORM=m
 # CONFIG_I2C_PXA_PCI is not set
 CONFIG_I2C_QUP=m
 # CONFIG_I2C_RK3X is not set
+CONFIG_HAVE_S3C2410_I2C=y
+# CONFIG_I2C_S3C2410 is not set
 CONFIG_I2C_SIMTEC=m
+# CONFIG_I2C_SUN6I_P2WI is not set
 # CONFIG_I2C_VERSATILE is not set
 CONFIG_I2C_XILINX=m
 
@@ -2527,7 +2623,10 @@ CONFIG_SPI_IMX=m
 # CONFIG_SPI_PXA2XX_PCI is not set
 CONFIG_SPI_ROCKCHIP=m
 CONFIG_SPI_QUP=m
+# CONFIG_SPI_S3C64XX is not set
 # CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SUN4I is not set
+# CONFIG_SPI_SUN6I is not set
 CONFIG_SPI_XCOMM=m
 # CONFIG_SPI_XILINX is not set
 CONFIG_SPI_DESIGNWARE=m
@@ -2586,6 +2685,18 @@ CONFIG_PINCTRL_APQ8084=m
 CONFIG_PINCTRL_IPQ8064=m
 CONFIG_PINCTRL_MSM8960=m
 # CONFIG_PINCTRL_MSM8X74 is not set
+CONFIG_PINCTRL_SAMSUNG=y
+CONFIG_PINCTRL_EXYNOS=y
+CONFIG_PINCTRL_EXYNOS5440=y
+CONFIG_PINCTRL_SUNXI_COMMON=y
+CONFIG_PINCTRL_SUN4I_A10=y
+CONFIG_PINCTRL_SUN5I_A10S=y
+CONFIG_PINCTRL_SUN5I_A13=y
+CONFIG_PINCTRL_SUN6I_A31=y
+CONFIG_PINCTRL_SUN6I_A31_R=y
+CONFIG_PINCTRL_SUN7I_A20=y
+CONFIG_PINCTRL_SUN8I_A23=y
+CONFIG_PINCTRL_SUN8I_A23_R=y
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
@@ -2621,6 +2732,7 @@ CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
 # CONFIG_GPIO_SX150X is not set
+# CONFIG_GPIO_TWL4030 is not set
 CONFIG_GPIO_ADP5588=m
 # CONFIG_GPIO_ADNP is not set
 
@@ -2668,6 +2780,7 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_CHARGER_PCF50633 is not set
 # CONFIG_CHARGER_ISP1704 is not set
 # CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_TWL4030 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_MANAGER is not set
@@ -2682,6 +2795,7 @@ CONFIG_POWER_RESET_GPIO_RESTART=y
 CONFIG_POWER_RESET_MSM=y
 # CONFIG_POWER_RESET_LTC2952 is not set
 # CONFIG_POWER_RESET_RESTART is not set
+# CONFIG_POWER_RESET_SUN6I is not set
 CONFIG_POWER_RESET_VERSATILE=y
 CONFIG_POWER_RESET_VEXPRESS=y
 CONFIG_POWER_RESET_SYSCON=y
@@ -2837,6 +2951,11 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 # Texas Instruments thermal drivers
 #
 # CONFIG_TI_SOC_THERMAL is not set
+
+#
+# Samsung thermal drivers
+#
+# CONFIG_EXYNOS_THERMAL is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -2849,8 +2968,12 @@ CONFIG_GPIO_WATCHDOG=m
 CONFIG_XILINX_WATCHDOG=m
 # CONFIG_ARM_SP805_WATCHDOG is not set
 CONFIG_CADENCE_WATCHDOG=m
+CONFIG_HAVE_S3C2410_WATCHDOG=y
+# CONFIG_S3C2410_WATCHDOG is not set
 # CONFIG_DW_WATCHDOG is not set
 # CONFIG_OMAP_WATCHDOG is not set
+# CONFIG_SUNXI_WATCHDOG is not set
+# CONFIG_TWL4030_WATCHDOG is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
 # CONFIG_IMX2_WDT is not set
 CONFIG_QCOM_WDT=m
@@ -2943,6 +3066,7 @@ CONFIG_MFD_SM501=m
 CONFIG_ABX500_CORE=y
 # CONFIG_AB3100_CORE is not set
 # CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_LP3943 is not set
@@ -2961,7 +3085,9 @@ CONFIG_MFD_TPS65218=m
 # CONFIG_MFD_TPS65912_I2C is not set
 # CONFIG_MFD_TPS65912_SPI is not set
 # CONFIG_MFD_TPS80031 is not set
-# CONFIG_TWL4030_CORE is not set
+CONFIG_TWL4030_CORE=y
+CONFIG_TWL4030_POWER=y
+# CONFIG_MFD_TWL4030_AUDIO is not set
 # CONFIG_TWL6040_CORE is not set
 CONFIG_MFD_WL1273_CORE=m
 # CONFIG_MFD_LM3533 is not set
@@ -3018,6 +3144,7 @@ CONFIG_REGULATOR_RK808=m
 # CONFIG_REGULATOR_TPS6507X is not set
 CONFIG_REGULATOR_TPS65218=m
 # CONFIG_REGULATOR_TPS6524X is not set
+# CONFIG_REGULATOR_TWL4030 is not set
 # CONFIG_REGULATOR_VEXPRESS is not set
 CONFIG_MEDIA_SUPPORT=m
 
@@ -3079,6 +3206,7 @@ CONFIG_IR_TTUSBIR=m
 # CONFIG_IR_IMG is not set
 CONFIG_RC_LOOPBACK=m
 CONFIG_IR_GPIO_CIR=m
+# CONFIG_IR_SUNXI is not set
 CONFIG_MEDIA_USB_SUPPORT=y
 
 #
@@ -3224,6 +3352,10 @@ CONFIG_VIDEO_EM28XX_RC=m
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_VIDEO_CODA is not set
 CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+# CONFIG_VIDEO_SAMSUNG_S5P_G2D is not set
+# CONFIG_VIDEO_SAMSUNG_S5P_JPEG is not set
+# CONFIG_VIDEO_SAMSUNG_S5P_MFC is not set
+# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set
 # CONFIG_VIDEO_SH_VEU is not set
 # CONFIG_V4L_TEST_DRIVERS is not set
 
@@ -3497,6 +3629,7 @@ CONFIG_FB_ARMCLCD=m
 CONFIG_FB_UVESA=m
 # CONFIG_FB_OPENCORES is not set
 CONFIG_FB_S1D13XXX=m
+# CONFIG_FB_S3C is not set
 CONFIG_FB_SM501=m
 # CONFIG_FB_SMSCUFX is not set
 # CONFIG_FB_UDL is not set
@@ -3507,6 +3640,7 @@ CONFIG_FB_MX3=m
 CONFIG_FB_BROADSHEET=m
 # CONFIG_FB_AUO_K190X is not set
 # CONFIG_OMAP2_DSS is not set
+# CONFIG_EXYNOS_VIDEO is not set
 # CONFIG_FB_SSD1307 is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
@@ -3532,6 +3666,7 @@ CONFIG_BACKLIGHT_PCF50633=m
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LP855X is not set
+# CONFIG_BACKLIGHT_PANDORA is not set
 # CONFIG_BACKLIGHT_GPIO is not set
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
@@ -3640,6 +3775,7 @@ CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 CONFIG_SND_SOC_IMX_MC13783=m
 CONFIG_SND_SOC_FSL_ASOC_CARD=m
+# CONFIG_SND_SOC_SAMSUNG is not set
 CONFIG_SND_SOC_I2C_AND_SPI=m
 
 #
@@ -3658,6 +3794,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271 is not set
+CONFIG_SND_SOC_CS42XX8=m
 CONFIG_SND_SOC_CS42XX8_I2C=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_ES8328=m
@@ -3835,6 +3972,7 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_EHCI_HCD_OMAP=m
 CONFIG_USB_EHCI_MSM=m
+# CONFIG_USB_EHCI_EXYNOS is not set
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
@@ -3844,7 +3982,9 @@ CONFIG_USB_ISP1362_HCD=m
 # CONFIG_USB_FOTG210_HCD is not set
 # CONFIG_USB_MAX3421_HCD is not set
 CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_OMAP3=m
 # CONFIG_USB_OHCI_HCD_SSB is not set
+# CONFIG_USB_OHCI_EXYNOS is not set
 CONFIG_USB_OHCI_HCD_PLATFORM=m
 CONFIG_USB_U132_HCD=m
 CONFIG_USB_SL811_HCD=m
@@ -4043,6 +4183,7 @@ CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_SDHCI_OF_ARASAN=m
 CONFIG_MMC_SDHCI_ESDHC_IMX=m
+# CONFIG_MMC_SDHCI_S3C is not set
 # CONFIG_MMC_SDHCI_PXAV3 is not set
 # CONFIG_MMC_SDHCI_PXAV2 is not set
 # CONFIG_MMC_OMAP is not set
@@ -4054,6 +4195,7 @@ CONFIG_MMC_VUB300=m
 # CONFIG_MMC_USHC is not set
 # CONFIG_MMC_USDHI6ROL0 is not set
 CONFIG_MMC_REALTEK_USB=m
+# CONFIG_MMC_SUNXI is not set
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set
 
@@ -4160,6 +4302,7 @@ CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
 CONFIG_RTC_DRV_M41T80_WDT=y
 CONFIG_RTC_DRV_BQ32K=m
+# CONFIG_RTC_DRV_TWL4030 is not set
 CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_FM3130=m
 CONFIG_RTC_DRV_RX8581=m
@@ -4208,8 +4351,12 @@ CONFIG_RTC_DRV_PCF50633=m
 #
 CONFIG_RTC_DRV_IMXDI=m
 # CONFIG_RTC_DRV_OMAP is not set
+CONFIG_HAVE_S3C_RTC=y
+# CONFIG_RTC_DRV_S3C is not set
 CONFIG_RTC_DRV_PL030=m
 CONFIG_RTC_DRV_PL031=m
+# CONFIG_RTC_DRV_SUN6I is not set
+# CONFIG_RTC_DRV_SUNXI is not set
 # CONFIG_RTC_DRV_MC13XXX is not set
 CONFIG_RTC_DRV_PM8XXX=m
 CONFIG_RTC_DRV_MXC=m
@@ -4239,6 +4386,7 @@ CONFIG_IMX_DMA=m
 # CONFIG_DMA_OMAP is not set
 # CONFIG_TI_CPPI41 is not set
 # CONFIG_FSL_EDMA is not set
+# CONFIG_DMA_SUN6I is not set
 # CONFIG_NBPFAXI_DMA is not set
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_VIRTUAL_CHANNELS=m
@@ -4331,6 +4479,7 @@ CONFIG_COMMON_CLK_RK808=m
 # CONFIG_COMMON_CLK_SI570 is not set
 # CONFIG_COMMON_CLK_PXA is not set
 # CONFIG_COMMON_CLK_QCOM is not set
+CONFIG_COMMON_CLK_SAMSUNG=y
 CONFIG_HWSPINLOCK=m
 
 #
@@ -4343,11 +4492,15 @@ CONFIG_HWSPINLOCK_OMAP=m
 #
 CONFIG_CLKSRC_OF=y
 CONFIG_CLKSRC_MMIO=y
+CONFIG_SUN4I_TIMER=y
+CONFIG_SUN5I_HSTIMER=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 CONFIG_ARM_GLOBAL_TIMER=y
 CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
 # CONFIG_ATMEL_PIT is not set
+CONFIG_CLKSRC_EXYNOS_MCT=y
+CONFIG_CLKSRC_SAMSUNG_PWM=y
 # CONFIG_SH_TIMER_CMT is not set
 # CONFIG_SH_TIMER_MTU2 is not set
 # CONFIG_SH_TIMER_TMU is not set
@@ -4359,6 +4512,7 @@ CONFIG_IOMMU_SUPPORT=y
 CONFIG_OF_IOMMU=y
 # CONFIG_MSM_IOMMU is not set
 # CONFIG_OMAP_IOMMU is not set
+# CONFIG_EXYNOS_IOMMU is not set
 
 #
 # Remoteproc drivers
@@ -4386,6 +4540,7 @@ CONFIG_DEVFREQ_GOV_USERSPACE=m
 #
 # DEVFREQ Drivers
 #
+# CONFIG_ARM_EXYNOS5_BUS_DEVFREQ is not set
 CONFIG_EXTCON=m
 
 #
@@ -4402,10 +4557,14 @@ CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_FSL_FTM is not set
 CONFIG_PWM_IMX=m
 # CONFIG_PWM_PCA9685 is not set
+# CONFIG_PWM_SAMSUNG is not set
 # CONFIG_PWM_TIECAP is not set
 # CONFIG_PWM_TIEHRPWM is not set
+# CONFIG_PWM_TWL is not set
+# CONFIG_PWM_TWL_LED is not set
 CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC=y
+CONFIG_GIC_NON_BANKED=y
 CONFIG_OMAP_IRQCHIP=y
 # CONFIG_IPACK_BUS is not set
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
@@ -4416,8 +4575,12 @@ CONFIG_RESET_CONTROLLER=y
 # PHY Subsystem
 #
 CONFIG_GENERIC_PHY=y
+CONFIG_PHY_EXYNOS_MIPI_VIDEO=y
 CONFIG_OMAP_CONTROL_PHY=m
+CONFIG_PHY_EXYNOS_DP_VIDEO=y
 # CONFIG_BCM_KONA_USB2_PHY is not set
+# CONFIG_PHY_EXYNOS5250_SATA is not set
+# CONFIG_PHY_SUN4I_USB is not set
 CONFIG_PHY_QCOM_APQ8064_SATA=m
 CONFIG_PHY_QCOM_IPQ806X_SATA=m
 # CONFIG_POWERCAP is not set
@@ -4866,6 +5029,13 @@ CONFIG_DEBUG_IMX6Q_UART=y
 # CONFIG_DEBUG_TI81XXUART3 is not set
 # CONFIG_DEBUG_AM33XXUART1 is not set
 # CONFIG_DEBUG_ZOOM_UART is not set
+# CONFIG_DEBUG_S3C_UART0 is not set
+# CONFIG_DEBUG_S3C_UART1 is not set
+# CONFIG_DEBUG_S3C_UART2 is not set
+# CONFIG_DEBUG_S3C_UART3 is not set
+# CONFIG_DEBUG_SUNXI_UART0 is not set
+# CONFIG_DEBUG_SUNXI_UART1 is not set
+# CONFIG_DEBUG_SUNXI_R_UART is not set
 # CONFIG_DEBUG_VEXPRESS_UART0_DETECT is not set
 # CONFIG_DEBUG_VEXPRESS_UART0_CA9 is not set
 # CONFIG_DEBUG_VEXPRESS_UART0_RS1 is not set
@@ -5193,6 +5363,7 @@ CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_OMAP_AES is not set
 # CONFIG_CRYPTO_DEV_OMAP_DES is not set
 # CONFIG_CRYPTO_DEV_SAHARA is not set
+# CONFIG_CRYPTO_DEV_S5P is not set
 CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_ASYMMETRIC_KEY_TYPE=m
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m