diff options
| -rw-r--r-- | Makefile.config | 2 | ||||
| -rw-r--r-- | config-arm-generic | 12 | ||||
| -rw-r--r-- | config-arm-tegra | 1 | ||||
| -rw-r--r-- | config-armv7 | 157 | ||||
| -rw-r--r-- | kernel.spec | 3 |
5 files changed, 159 insertions, 16 deletions
diff --git a/Makefile.config b/Makefile.config index ded3bc623..21143ebda 100644 --- a/Makefile.config +++ b/Makefile.config @@ -20,7 +20,7 @@ CONFIGFILES = \ $(CFG)-sparc64.config \ $(CFG)-ppc64.config $(CFG)-ppc64p7.config $(CFG)-ppc64-debug.config -PLATFORMS = x86 x86_64 powerpc powerpc32 powerpc64 s390x sparc64 armv7 +PLATFORMS = x86 x86_64 powerpc powerpc32 powerpc64 s390x sparc64 arm TEMPFILES = $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS))) configs: $(CONFIGFILES) diff --git a/config-arm-generic b/config-arm-generic index f480e40c0..26565ccbb 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -12,6 +12,7 @@ CONFIG_AEABI=y CONFIG_OABI_COMPAT=y CONFIG_VFP=y CONFIG_ARM_UNWIND=y +# CONFIG_ARCH_MULTI_V7 is not set CONFIG_SMP=y CONFIG_NR_CPUS=4 @@ -42,6 +43,7 @@ CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZBOOT_ROM_BSS=0 CONFIG_LOCAL_TIMERS=y +CONFIG_ATAGS=y CONFIG_ATAGS_PROC=y CONFIG_PL330_DMA=y @@ -135,6 +137,8 @@ CONFIG_MMC_DW_PCI=m CONFIG_MMC_SDHCI_PXAV3=m CONFIG_MMC_SDHCI_PXAV2=m +# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set + # Generic GPIO options CONFIG_GENERIC_GPIO=y @@ -249,6 +253,7 @@ CONFIG_OF_PCI_IRQ=y CONFIG_I2C_MUX_PINCTRL=m CONFIG_OF_MDIO=m CONFIG_MDIO_BUS_MUX_GPIO=m +CONFIG_MDIO_BUS_MUX_MMIOREG=m CONFIG_BPF_JIT=y @@ -260,6 +265,7 @@ CONFIG_EDAC_LEGACY_SYSFS=y CONFIG_RTC_DRV_88PM80X=m CONFIG_RTC_DRV_PL030=m CONFIG_RTC_DRV_PL031=m +CONFIG_RTC_DRV_SNVS=m CONFIG_RFKILL_REGULATOR=m CONFIG_INPUT_88PM80X_ONKEY=y CONFIG_INPUT_GP2A=m @@ -269,10 +275,13 @@ CONFIG_SERIAL_AMBA_PL010=m CONFIG_SERIAL_AMBA_PL011=m CONFIG_GPIO_PL061=y CONFIG_GPIO_MCP23S08=m +CONFIG_GPIO_ADNP=m CONFIG_PL310_ERRATA_753970=y CONFIG_MFD_88PM800=m CONFIG_MFD_88PM805=m +CONFIG_MFD_SYSCON=y + CONFIG_REGULATOR_VIRTUAL_CONSUMER=m CONFIG_REGULATOR_USERSPACE_CONSUMER=m CONFIG_REGULATOR_GPIO=m @@ -289,6 +298,9 @@ CONFIG_REGULATOR_TPS6507X=m CONFIG_CHARGER_MANAGER=y CONFIG_EXTCON_GPIO=m +# CONFIG_AUTO_ZRELADDR is not set +# CONFIG_ASYMMETRIC_KEY_TYPE is not set + # CONFIG_VFIO is not set # CONFIG_XIP_KERNEL is not set diff --git a/config-arm-tegra b/config-arm-tegra index 748edc51c..bf31669f3 100644 --- a/config-arm-tegra +++ b/config-arm-tegra @@ -18,7 +18,6 @@ CONFIG_MACH_WARIO=y CONFIG_MACH_VENTANA=y CONFIG_TEGRA_DEBUG_UARTD=y -CONFIG_NR_CPUS=4 CONFIG_ARM_CPU_TOPOLOGY=y CONFIG_TEGRA_IOMMU_GART=y diff --git a/config-armv7 b/config-armv7 index 49d27b2c4..cf8a1d3ed 100644 --- a/config-armv7 +++ b/config-armv7 @@ -1,14 +1,21 @@ -# ARM unified kernel -CONFIG_ARCH_MULTI_V6=y +# ARM unified arch kernel +# CONFIG_ARCH_MULTI_V4 is not set +# CONFIG_ARCH_MULTI_V4T is not set +# CONFIG_ARCH_MULTI_V6 is not set +CONFIG_ARCH_MULTI_V7=y CONFIG_ARCH_MVEBU=y -CONFIG_MACH_ARMADA_370_XP=y CONFIG_ARCH_HIGHBANK=y CONFIG_ARCH_PICOXCELL=y CONFIG_ARCH_SOCFPGA=y CONFIG_ARCH_VEXPRESS_CA9X4=y CONFIG_ARCH_VEXPRESS_DT=y +CONFIG_MACH_ARMADA_370_XP=y +CONFIG_MACH_ARMADA_370=y +CONFIG_MACH_ARMADA_XP=y + # generic ARM config options +CONFIG_CMDLINE="" CONFIG_ARM_ARCH_TIMER=y CONFIG_AEABI=y CONFIG_VFP=y @@ -25,14 +32,46 @@ CONFIG_ARM_ASM_UNIFIED=y CONFIG_ARM_CPU_TOPOLOGY=y CONFIG_ARM_DMA_MEM_BUFFERABLE=y CONFIG_SWP_EMULATE=y +CONFIG_CPU_BPREDICT_DISABLE=y CONFIG_CACHE_L2X0=y CONFIG_HIGHPTE=y +# CONFIG_OABI_COMPAT is not set +# CONFIG_ATAGS is not set +# CONFIG_ATAGS_PROC is not set +# CONFIG_FPE_NWFPE is not set +# CONFIG_FPE_FASTFPE is not set +# CONFIG_APM_EMULATION is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_DMA_CACHE_RWFO is not set +CONFIG_HVC_DCC=y -# Errata - these need proper review -CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y +# CONFIG_ARM_VIRT_EXT is not set + +# errata +# v5/v6 +# CONFIG_ARM_ERRATA_326103 is not set +# CONFIG_ARM_ERRATA_411920 is not set +# Cortex-A8 +# CONFIG_ARM_ERRATA_430973 is not set +# CONFIG_ARM_ERRATA_458693 is not set +# CONFIG_ARM_ERRATA_460075 is not set +# Cortex-A9 +CONFIG_ARM_ERRATA_742230=y +CONFIG_ARM_ERRATA_742231=y +CONFIG_ARM_ERRATA_743622=y +CONFIG_ARM_ERRATA_754322=y +CONFIG_ARM_ERRATA_754327=y +CONFIG_ARM_ERRATA_764369=y +CONFIG_ARM_ERRATA_775420=y +CONFIG_PL310_ERRATA_588369=y +CONFIG_PL310_ERRATA_727915=y +CONFIG_PL310_ERRATA_769419=y # generic that deviates from or should be merged into config-generic CONFIG_SMP=y +CONFIG_NR_CPUS=4 +CONFIG_SMP_ON_UP=y CONFIG_HIGHMEM=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -58,6 +97,11 @@ CONFIG_SUSPEND=y CONFIG_ARM_CPU_SUSPEND=y CONFIG_ARM_CPU_TOPOLOGY=y +CONFIG_LOCAL_TIMERS=y +CONFIG_HW_PERF_EVENTS=y +CONFIG_UACCESS_WITH_MEMCPY=y +CONFIG_CC_STACKPROTECTOR=y + CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 @@ -70,15 +114,6 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -CONFIG_MMC=y -CONFIG_MMC_ARMMMCI=y -CONFIG_MMC_SDHCI_PLTFM=m -CONFIG_MMC_SDHCI_OF=m -CONFIG_MMC_SPI=m -CONFIG_MMC_DW=m -CONFIG_MMC_DW_PLTFM=m -CONFIG_MMC_DW_PCI=m -# CONFIG_MMC_DW_EXYNOS is not set CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y @@ -102,6 +137,7 @@ CONFIG_RTC_DRV_PL031=y CONFIG_PL330_DMA=y CONFIG_AMBA_PL08X=y +CONFIG_ARM_SP805_WATCHDOG=m # highbank CONFIG_EDAC_HIGHBANK_MC=m @@ -115,13 +151,26 @@ CONFIG_SATA_HIGHBANK=m CONFIG_FB_ARMCLCD=m CONFIG_I2C_VERSATILE=m CONFIG_OC_ETM=y +CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y # unknown and needs review CONFIG_ARM_AMBA=y # mvebu +CONFIG_MV_XOR=y CONFIG_RTC_DRV_88PM80X=m +CONFIG_CRYPTO_DEV_MV_CESA=m +CONFIG_MV643XX_ETH=m +CONFIG_I2C_MV64XXX=m +# exynos +# CONFIG_DRM_EXYNOS is not set + +# picoxcell +CONFIG_CRYPTO_DEV_PICOXCELL=m + +# ST Ericsson +# CONFIG_I2C_NOMADIK is not set # General ARM drivers # Device tree CONFIG_OF=y @@ -138,6 +187,22 @@ CONFIG_I2C_MUX_PINCTRL=m CONFIG_OF_MDIO=m CONFIG_MDIO_BUS_MUX_GPIO=m +# MMC/SD +CONFIG_MMC=y +CONFIG_MMC_ARMMMCI=y +CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_SDHCI_OF=m +CONFIG_MMC_SPI=m +CONFIG_MMC_DW=m +CONFIG_MMC_DW_PLTFM=m +CONFIG_MMC_DW_PCI=m +# CONFIG_MMC_DW_EXYNOS is not set +# CONFIG_MMC_DW_IDMAC is not set +CONFIG_MMC_TMIO=m +CONFIG_MMC_SDHCI_PXAV3=m +CONFIG_MMC_SDHCI_PXAV2=m +CONFIG_MMC_MVSDIO=m + # usb CONFIG_USB_ULPI=y CONFIG_AX88796=m @@ -167,6 +232,70 @@ CONFIG_EDAC=y CONFIG_EDAC_MM_EDAC=m CONFIG_EDAC_LEGACY_SYSFS=y +# Watchdog +CONFIG_MPCORE_WATCHDOG=m + +# Multi function devices +CONFIG_MFD_T7L66XB=y +CONFIG_MFD_TC6387XB=y +CONFIG_MFD_SYSCON=y + +# RTC +CONFIG_RTC_DRV_SNVS=m + +# Pin stuff +CONFIG_PINMUX=y +CONFIG_PINCONF=y +CONFIG_PINCTRL_SINGLE=m +# CONFIG_PINCTRL_SAMSUNG is not set +# CONFIG_PINCTRL_EXYNOS4 is not set + +# GPIO +CONFIG_GPIO_GENERIC_PLATFORM=m +CONFIG_GPIO_EM=m +CONFIG_GPIO_ADNP=m +CONFIG_GPIO_MCP23S08=m +CONFIG_RFKILL_GPIO=m +CONFIG_SERIAL_8250_EM=m +CONFIG_INPUT_GP2A=m +CONFIG_INPUT_GPIO_TILT_POLLED=m +CONFIG_MDIO_BUS_MUX_MMIOREG=m + +# MTD +CONFIG_MTD_OF_PARTS=y +# CONFIG_MG_DISK is not set + +# Needs work/investigation + +# CONFIG_ARM_CHARLCD is not set +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_IP_PNP_RARP is not set +# CONFIG_BPF_JIT is not set +# CONFIG_ASYMMETRIC_KEY_TYPE is not set +# CONFIG_PID_IN_CONTEXTIDR is not set +# CONFIG_DEPRECATED_PARAM_STRUCT is not set + +# CONFIG_IRQ_DOMAIN_DEBUG is not set +# CONFIG_COMMON_CLK_DEBUG is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_LL is not set +# CONFIG_DEBUG_PINCTRL is not set + +# CONFIG_CS89x0 is not set +# CONFIG_DM9000 is not set + +# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set +# CONFIG_ARM_KPROBES_TEST is not set +# CONFIG_LEDS_RENESAS_TPU is not set + +CONFIG_ETHERNET=y +# CONFIG_NET_VENDOR_BROADCOM is not set +# CONFIG_NET_VENDOR_CIRRUS is not set +CONFIG_THERMAL=y +# CONFIG_PATA_PLATFORM is not set +CONFIG_PERF_EVENTS=y + + # We need to fix these as they should be either generic includes or kconfig fixes # drivers/input/touchscreen/eeti_ts.c:65:2: error: implicit declaration of function 'irq_to_gpio' [-Werror=implicit-function-declaration] # CONFIG_TOUCHSCREEN_EETI is not set diff --git a/kernel.spec b/kernel.spec index 44209de82..110783987 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2324,6 +2324,9 @@ fi # ||----w | # || || %changelog +* Wed Nov 7 2012 Peter Robinson <pbrobinson@fedoraproject.org> +- Update ARM unified config + * Wed Nov 07 2012 Josh Boyer <jwboyer@redhat.com> - 3.7.0-0.rc4.git1.1 - Linux v3.7-rc4-20-g0e4a43e - Reenable debugging options. |