[kernel/f17] Update ARM config options for 3.4, nable MTD/UBI/JFFS2 on ARM platforms

Peter Robinson pbrobinson at fedoraproject.org
Tue Jun 5 14:20:30 UTC 2012


commit 745a2cc5d4ba47aabdd92a211880260dc54f6a2a
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Jun 5 15:20:20 2012 +0100

    Update ARM config options for 3.4, nable MTD/UBI/JFFS2 on ARM platforms

 config-arm-generic |   88 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 config-arm-omap    |    5 ++-
 config-arm-tegra   |   16 ++-------
 kernel.spec        |    4 ++
 4 files changed, 98 insertions(+), 15 deletions(-)
---
diff --git a/config-arm-generic b/config-arm-generic
index e512b8b..a59369b 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -257,7 +257,7 @@ CONFIG_DVB_TDA1004X=m
 CONFIG_ARM_ERRATA_720789=y
 CONFIG_ARM_ERRATA_751472=y
 CONFIG_ARM_ERRATA_326103=y
-CONFIG_OMAP4_ERRATA_I688=y
+# CONFIG_OMAP4_ERRATA_I688 is not set
 # CONFIG_FB_MX3 is not set
 # CONFIG_MX3_IPU is not set
 # CONFIG_MX3_IPU_IRQS is not set
@@ -275,5 +275,91 @@ CONFIG_OMAP4_ERRATA_I688=y
 # CONFIG_ARM_EXYNOS4210_CPUFREQ is not set
 
 CONFIG_OF_GPIO=y
+CONFIG_INPUT_GP2A=m
+CONFIG_INPUT_GPIO_TILT_POLLED=m
 
 CONFIG_BPF_JIT=y
+
+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
diff --git a/config-arm-omap b/config-arm-omap
index af8e918..c4f22dc 100644
--- a/config-arm-omap
+++ b/config-arm-omap
@@ -1,3 +1,5 @@
+# CONFIG_OMAP4_ERRATA_I688 is not set
+
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_GENERIC_LOCKBREAK=y
@@ -368,6 +370,7 @@ CONFIG_INPUT_AD714X_SPI=m
 CONFIG_INPUT_TWL4030_PWRBUTTON=y
 CONFIG_INPUT_TWL4030_VIBRA=y
 CONFIG_INPUT_TWL6040_VIBRA=y
+CONFIG_KEYBOARD_OMAP4=m
 CONFIG_INPUT_UINPUT=y
 # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
 CONFIG_INPUT_ADXL34X=m
@@ -1042,8 +1045,6 @@ CONFIG_LIBCRC32C=y
 # CONFIG_BT_WILINK is not set
 # CONFIG_USB_HSO is not set
 
-CONFIG_CRYSTALHD=m
-
 CONFIG_GPIO_GENERIC_PLATFORM=y
 
 CONFIG_MACH_OMAP_GENERIC=y
diff --git a/config-arm-tegra b/config-arm-tegra
index f19e50c..317e12f 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
 
@@ -63,6 +63,7 @@ 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
 
@@ -83,25 +84,16 @@ CONFIG_ARM_CPU_SUSPEND=y
 
 CONFIG_CRYPTO_DEV_TEGRA_AES=m
 
-CONFIG_CRYSTALHD=m
-
 CONFIG_PL310_ERRATA_753970=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
 CONFIG_LEDS_RENESAS_TPU=y
 
-# CONFIG_ARM_EXYNOS4210_CPUFREQ is not set
-# CONFIG_ETHERNET is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_INPUT_GP2A is not set
-# CONFIG_INPUT_GPIO_TILT_POLLED is not set
-# CONFIG_SND_SOC_TEGRA_ALC5632 is not set
-
-CONFIG_PCI=y
-CONFIG_PCI_SYSCALL=y
 CONFIG_OF_GPIO=y
 CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
+CONFIG_OF=y
+CONFIG_SERIAL_OF_PLATFORM=y
 
 CONFIG_TEGRA_IOMMU_GART=y
 CONFIG_TEGRA_IOMMU_SMMU=y
diff --git a/kernel.spec b/kernel.spec
index c7b066d..4d5375e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2330,6 +2330,10 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Tue Jun  5 2012 Peter Robinson <pbrobinson at fedoraproject.org>
+- Update ARM config options for 3.4
+- Enable MTD/UBI/JFFS2 on ARM platforms
+
 * Mon Jun 04 2012 Josh Boyer <jwboyer at redhat.com> 3.4.1-1
 - Linux v3.4.1
 


More information about the scm-commits mailing list