[oe] [meta-handheld][PATCH 5/5] linux-yocto_3.4: minor config cleanings towards 3.8

[Andrea Adami]

* fix lack of some mtd options needed by collie
* remove union_fs
* some options are now detected as non-hardware: move them
* still WIP

Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
---
 .../linux/linux-yocto-3.4/collie/collie.cfg           | 19 ++++++++++++++-----
 .../linux/linux-yocto-3.4/zaurus-hardware.cfg         |  9 ++++++---
 .../linux/linux-yocto-3.4/zaurus-non-hardware.cfg     |  9 ++++++++-
 .../linux/linux-yocto-3.4/zaurus-pxa-common.cfg       | 10 ----------
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/recipes-kernel/linux/linux-yocto-3.4/collie/collie.cfg b/recipes-kernel/linux/linux-yocto-3.4/collie/collie.cfg
index 5c0a7bf..791c966 100644
--- a/recipes-kernel/linux/linux-yocto-3.4/collie/collie.cfg
+++ b/recipes-kernel/linux/linux-yocto-3.4/collie/collie.cfg
@@ -1,9 +1,4 @@
 #
-# General setup
-#
-CONFIG_KERNEL_LZMA=y
-
-#
 # System Type
 #
 CONFIG_ARCH_SA1100=y
@@ -35,6 +30,20 @@ CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 mem=64M fbcon=rotate:1 loglevel=3"
 
 #
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+CONFIG_MTD_JEDECPROBE=y
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_UTIL=y
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_SA1100=y
+
+#
 # Multimedia Capabilities Port drivers
 #
 CONFIG_MCP=y
diff --git a/recipes-kernel/linux/linux-yocto-3.4/zaurus-hardware.cfg b/recipes-kernel/linux/linux-yocto-3.4/zaurus-hardware.cfg
index 1336bf0..ae3627a 100644
--- a/recipes-kernel/linux/linux-yocto-3.4/zaurus-hardware.cfg
+++ b/recipes-kernel/linux/linux-yocto-3.4/zaurus-hardware.cfg
@@ -1,14 +1,11 @@
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_GENERIC_GPIO=y
-CONFIG_KTIME_SCALAR=y
 CONFIG_HAVE_PROC_CPU=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_ARCH_HAS_CPUFREQ=y
 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
@@ -156,6 +153,12 @@ CONFIG_SENSORS_MAX1111=y
 CONFIG_SSB_POSSIBLE=y
 
 #
+# Multimedia Capabilities Port drivers
+#
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_DUMMY=y
+
+#
 # Graphics support
 #
 CONFIG_FB=y
diff --git a/recipes-kernel/linux/linux-yocto-3.4/zaurus-non-hardware.cfg b/recipes-kernel/linux/linux-yocto-3.4/zaurus-non-hardware.cfg
index 1fced91..d76d794 100644
--- a/recipes-kernel/linux/linux-yocto-3.4/zaurus-non-hardware.cfg
+++ b/recipes-kernel/linux/linux-yocto-3.4/zaurus-non-hardware.cfg
@@ -1,3 +1,11 @@
+CONFIG_KERNEL_LZMA=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+#
+# General setup
+#
+CONFIG_KTIME_SCALAR=y
+
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_HAVE_IRQ_WORK=y
 CONFIG_IRQ_WORK=y
@@ -320,7 +328,6 @@ CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 CONFIG_MISC_FILESYSTEMS=y
-CONFIG_UNION_FS=y
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_WRITEBUFFER=y
diff --git a/recipes-kernel/linux/linux-yocto-3.4/zaurus-pxa-common.cfg b/recipes-kernel/linux/linux-yocto-3.4/zaurus-pxa-common.cfg
index 78d0e17..dace6fd 100644
--- a/recipes-kernel/linux/linux-yocto-3.4/zaurus-pxa-common.cfg
+++ b/recipes-kernel/linux/linux-yocto-3.4/zaurus-pxa-common.cfg
@@ -62,16 +62,6 @@ CONFIG_AUTO_ZRELADDR=y
 CONFIG_PXA_FICP=m
 
 #
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_ROM=y
-
-#
 # PATA SFF controllers with BMDMA
 #
 CONFIG_PATA_PXA=y
-- 
1.7.12.4