Update ARM config options for 3.5, Enable MTD/UBI/JFFS2 on ARM platforms

7 files changed, 102 insertions, 16 deletions

diff --git a/config-arm-generic b/config-arm-generic
index 856af8e43..12fb61bc9 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -127,8 +127,90 @@ CONFIG_MMC_SDHCI_PLTFM=m
 # Generic GPIO options
 CONFIG_GENERIC_GPIO=y
 
-# We'll enable this here as various platforms will need it
-CONFIG_DRM=m
+CONFIG_MTD=m
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_AFS_PARTS=y
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_BLOCK_RO is not set
+# CONFIG_MTD_AR7_PARTS is not set
+CONFIG_MTD_CFI=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+CONFIG_MTD_CFI_GEOMETRY=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_STAA=y
+CONFIG_MTD_CFI_UTIL=y
+CONFIG_MTD_DOC2000=m
+CONFIG_MTD_DOC2001=m
+CONFIG_MTD_DOC2001PLUS=m
+# CONFIG_MTD_DOCPROBE_ADVANCED is not set
+CONFIG_MTD_ALAUDA=m
+# CONFIG_MTD_ONENAND is not set
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_M25P80=m
+CONFIG_M25PXX_USE_FAST_READ=y
+CONFIG_MTD_NAND=m
+CONFIG_MTD_NAND_ECC=m
+CONFIG_MTD_NAND_IDS=m
+# CONFIG_MTD_NAND_CAFE is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_DENALI is not set
+# CONFIG_MTD_NAND_DOCG4 is not set
+CONFIG_MTD_NAND_GPIO=m
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+CONFIG_MTD_NAND_ORION=m
+# CONFIG_MTD_NAND_RICOH is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_OTP is not set
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_PLATRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_SLRAM is not set
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+# CONFIG_MTD_UBI_GLUEBI is not set
+# CONFIG_MTD_UBI_DEBUG is not set
+
+# CONFIG_SM_FTL is not set
+
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
+
 # HW Disabled because it causes issues on ARM platforms
 
 # disable TPM on arm at least on the trimslices it causes havoc
diff --git a/config-arm-highbank b/config-arm-highbank
index c20f104f2..e8701cfa7 100644
--- a/config-arm-highbank
+++ b/config-arm-highbank
@@ -24,8 +24,6 @@ CONFIG_NEON=y
 CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_ATA_SFF=y
 
-CONFIG_ETHERNET=y
-CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_NET_CALXEDA_XGMAC=y
 
 CONFIG_GPIO_PL061=y
diff --git a/config-arm-imx b/config-arm-imx
index 9e7191159..6ee58278f 100644
--- a/config-arm-imx
+++ b/config-arm-imx
@@ -13,6 +13,7 @@ CONFIG_MACH_MX51_EFIKASB=y
 # CONFIG_THUMB2_KERNEL is not set
 CONFIG_CPU_FREQ_IMX=y
 CONFIG_W1_MASTER_MXC=m
+CONFIG_IMX_DMA=y
 CONFIG_IMX_SDMA=y
 CONFIG_MACH_MX31ADS=y
 CONFIG_MACH_MX31LILLY=y
@@ -40,8 +41,6 @@ CONFIG_PL310_ERRATA_588369=y
 CONFIG_PL310_ERRATA_727915=y
 CONFIG_ARM_ERRATA_364296=y
 CONFIG_PATA_IMX=m
-CONFIG_ETHERNET=y
-CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_NET_VENDOR_FREESCALE=y
 CONFIG_FEC=y
 CONFIG_KEYBOARD_IMX=m
@@ -50,6 +49,7 @@ CONFIG_HW_RANDOM_MXC_RNGA=m
 CONFIG_I2C_IMX=m
 CONFIG_GPIO_GENERIC_PLATFORM=y
 CONFIG_GPIO_MCP23S08=m
+CONFIG_GPIO_MC9S08DZ60=y
 CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_PLL=m
 CONFIG_SND_IMX_SOC=m
@@ -65,6 +65,7 @@ CONFIG_LEDS_PWM=m
 CONFIG_MACH_PCM037_EET=y
 # CONFIG_MACH_MX31_3DS_MXC_NAND_USE_BBT is not set
 CONFIG_MXC_USE_EPIT=y
+CONFIG_HAVE_EPIT=y
 CONFIG_ARM_THUMBEE=y
 CONFIG_ARM_ERRATA_430973=y
 CONFIG_ARM_ERRATA_458693=y
@@ -85,4 +86,3 @@ CONFIG_LEDS_RENESAS_TPU=y
 # CONFIG_ARM_LPAE is not set
 # CONFIG_INPUT_GP2A is not set
 # CONFIG_INPUT_GPIO_TILT_POLLED is not set
-
diff --git a/config-arm-omap b/config-arm-omap
index 3513ef062..d0fb63a20 100644
--- a/config-arm-omap
+++ b/config-arm-omap
@@ -42,7 +42,7 @@ CONFIG_SOC_OMAP3430=y
 CONFIG_OMAP_PACKAGE_CBB=y
 CONFIG_OMAP_PACKAGE_CBL=y
 CONFIG_OMAP_PACKAGE_CBS=y
-CONFIG_OMAP4_ERRATA_I688=y
+# CONFIG_OMAP4_ERRATA_I688 is not set
 
 #
 # OMAP Board Type
@@ -115,8 +115,6 @@ CONFIG_ARM_ERRATA_720789=y
 # CONFIG_ARM_ERRATA_754327 is not set
 # CONFIG_ARM_ERRATA_764369 is not set
 CONFIG_ARM_GIC=y
-# CONFIG_PCI_SYSCALL is not set
-# CONFIG_PCCARD is not set
 CONFIG_HAVE_ARM_SCU=y
 CONFIG_HAVE_ARM_TWD=y
 CONFIG_HOTPLUG_CPU=y
@@ -156,6 +154,7 @@ CONFIG_WL12XX_SDIO_TEST=m
 CONFIG_INPUT_TWL4030_PWRBUTTON=m
 CONFIG_INPUT_TWL4030_VIBRA=m
 CONFIG_INPUT_TWL6040_VIBRA=m
+CONFIG_KEYBOARD_OMAP4=m
 CONFIG_TOUCHSCREEN_TI_TSCADC=m
 CONFIG_SERIAL_OMAP=y
 CONFIG_SERIAL_OMAP_CONSOLE=y
diff --git a/config-arm-tegra b/config-arm-tegra
index 1f20ce7f9..c9883a655 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -1,7 +1,7 @@
 CONFIG_ARCH_TEGRA=y
 
 CONFIG_ARCH_TEGRA_2x_SOC=y
-CONFIG_ARCH_TEGRA_3x_SOC=y
+# CONFIG_ARCH_TEGRA_3x_SOC is not set
 # CONFIG_ARM_LPAE is not set
 CONFIG_TEGRA_PCI=y
 
@@ -22,6 +22,9 @@ CONFIG_TEGRA_DEBUG_UARTD=y
 CONFIG_NR_CPUS=4
 CONFIG_ARM_CPU_TOPOLOGY=y
 
+CONFIG_TEGRA_IOMMU_GART=y
+CONFIG_TEGRA_IOMMU_SMMU=y
+
 CONFIG_I2C_TEGRA=y
 
 CONFIG_MMC_SDHCI_TEGRA=y
@@ -59,8 +62,11 @@ CONFIG_USB_EHCI_TEGRA=y
 CONFIG_RTC_DRV_TEGRA=m
 
 CONFIG_SND_SOC_TEGRA=m
+CONFIG_SND_SOC_TEGRA_ALC5632=m
 CONFIG_SND_SOC_TEGRA_WM8903=m
 CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
+# CONFIG_SND_SOC_TEGRA30_AHUB is not set
+# CONFIG_SND_SOC_TEGRA30_I2S is not set
 
 CONFIG_MFD_NVEC=y
 CONFIG_KEYBOARD_NVEC=y
@@ -77,10 +83,8 @@ CONFIG_ARM_CPU_SUSPEND=y
 CONFIG_PL310_ERRATA_753970=y
 CONFIG_LEDS_RENESAS_TPU=y
 
-# CONFIG_SND_SOC_TEGRA_ALC5632 is not set
-
-CONFIG_PCI=y
-CONFIG_PCI_SYSCALL=y
+CONFIG_OF=y
+CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_OF_GPIO=y
 CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
diff --git a/config-arm-versatile b/config-arm-versatile
index 207042501..544624346 100644
--- a/config-arm-versatile
+++ b/config-arm-versatile
@@ -22,7 +22,6 @@ CONFIG_CPU_HAS_PMU=y
 # Need to verify whether these are generic or vexpress specific
 CONFIG_ARM_AMBA=y
 
-CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_VFP=y
 CONFIG_VFPv3=y
 
diff --git a/kernel.spec b/kernel.spec
index 3687ab2f0..f6b9a90fb 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2278,6 +2278,10 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Jun 05 2012 Peter Robinson <pbrobinson@fedoraproject.org>
+- Update ARM config options for 3.5
+- Enable MTD/UBI/JFFS2 on ARM platforms
+
 * Mon Jun 04 2012 Dave Jones <davej@redhat.com>
 - Remove 32bit NX emulation.