diff options
| -rw-r--r-- | config-arm-generic | 7 | ||||
| -rw-r--r-- | config-arm64 | 3 | ||||
| -rw-r--r-- | config-armv7 | 14 | ||||
| -rw-r--r-- | config-armv7-generic | 26 | ||||
| -rw-r--r-- | kernel.spec | 3 |
5 files changed, 36 insertions, 17 deletions
diff --git a/config-arm-generic b/config-arm-generic index 91c7ef1eb..3c404fc04 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -6,6 +6,7 @@ CONFIG_FB_SSD1307=m CONFIG_HW_PERF_EVENTS=y CONFIG_MMC=y CONFIG_NFS_FS=y + # CONFIG_PID_IN_CONTEXTIDR is not set # CONFIG_CPU_BIG_ENDIAN is not set @@ -26,10 +27,15 @@ CONFIG_ARM_ARCH_TIMER=y CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y # CONFIG_ARM_DT_BL_CPUFREQ is not set CONFIG_NR_CPUS=8 + CONFIG_ARM_DMA_USE_IOMMU=y +CONFIG_SWIOTLB=y CONFIG_DMA_VIRTUAL_CHANNELS=y CONFIG_FB_SIMPLE=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y + # ARM AMBA generic HW CONFIG_ARM_AMBA=y CONFIG_ARM_GIC=y @@ -98,6 +104,7 @@ CONFIG_GPIOLIB=y CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_MDIO_GPIO=m +CONFIG_BACKLIGHT_GPIO=m CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_RESET_RESTART=y diff --git a/config-arm64 b/config-arm64 index 3b7ac06af..29c1518e2 100644 --- a/config-arm64 +++ b/config-arm64 @@ -59,15 +59,12 @@ CONFIG_SERIAL_8250_DMA=y CONFIG_SPARSE_IRQ=y CONFIG_SPARSEMEM_VMEMMAP=y -CONFIG_SWIOTLB=y # CONFIG_SYS_HYPERVISOR is not set # CONFIG_THERMAL is not set CONFIG_VIRTUALIZATION=y CONFIG_VM_EVENT_COUNTERS=y # not arm64 -# CONFIG_HW_RANDOM_ATMEL is not set -# CONFIG_HW_RANDOM_EXYNOS is not set # CONFIG_GPIO_ADNP is not set # CONFIG_GPIO_MCP23S08 is not set # CONFIG_MDIO_BUS_MUX_GPIO is not set diff --git a/config-armv7 b/config-armv7 index 22eab1120..c57957c9a 100644 --- a/config-armv7 +++ b/config-armv7 @@ -143,7 +143,6 @@ CONFIG_RTC_DRV_TWL4030=y CONFIG_RTC_DRV_OMAP=y CONFIG_SENSORS_TWL4030_MADC=m CONFIG_TWL6030_GPADC=m -CONFIG_HW_RANDOM_OMAP3_ROM=m # OMAP5 (possibly other devices too) CONFIG_MFD_PALMAS=y @@ -176,7 +175,7 @@ CONFIG_TOUCHSCREEN_TI_TSCADC=m # OMAP thermal temp. Can likely be built as module but doesn't autoload so build in to ensure performance on PandaES CONFIG_OMAP_BANDGAP=y -CONFIG_TI_SOC_THERMAL=m +CONFIG_TI_SOC_THERMAL=y CONFIG_TI_THERMAL=y CONFIG_OMAP4_THERMAL=y CONFIG_OMAP5_THERMAL=y @@ -196,6 +195,7 @@ CONFIG_PWM_TWL_LED=m CONFIG_CRYPTO_DEV_OMAP_SHAM=m CONFIG_CRYPTO_DEV_OMAP_AES=m CONFIG_HW_RANDOM_OMAP=m +CONFIG_HW_RANDOM_OMAP3_ROM=m CONFIG_DRM_OMAP=m CONFIG_DRM_OMAP_NUM_CRTCS=2 @@ -296,23 +296,23 @@ CONFIG_SOC_AM33XX=y CONFIG_SOC_AM43XX=y CONFIG_AM335X_CONTROL_USB=m CONFIG_AM335X_PHY_USB=m -CONFIG_USB_MUSB_AM335X_CHILD=y +CONFIG_USB_MUSB_AM335X_CHILD=m +CONFIG_TI_CPPI41=m CONFIG_USB_TI_CPPI41_DMA=y CONFIG_MFD_TI_AM335X_TSCADC=m CONFIG_TI_ST=m CONFIG_TI_DAC7512=m +CONFIG_TI_DAVINCI_CPDMA=m CONFIG_TI_DAVINCI_EMAC=m CONFIG_TI_DAVINCI_MDIO=m -CONFIG_TI_DAVINCI_CPDMA=m CONFIG_TI_CPSW=m -CONFIG_TI_CPTS=y +CONFIG_TI_CPSW_PHY_SEL=y +# CONFIG_TI_CPTS is not set CONFIG_TI_EMIF=m CONFIG_DRM_TILCDC=m CONFIG_SPI_DAVINCI=m CONFIG_SND_DAVINCI_SOC=m CONFIG_REGULATOR_TI_ABB=m -CONFIG_TI_CPPI41=m -CONFIG_MFD_TI_AM335X_TSCADC=m CONFIG_TI_ADC081C=m CONFIG_TI_AM335X_ADC=m CONFIG_PWM_TIPWMSS=y diff --git a/config-armv7-generic b/config-armv7-generic index e5c7e8696..95723b34c 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -8,6 +8,7 @@ CONFIG_ARM=y CONFIG_ARCH_MULTI_V7=y CONFIG_CMDLINE="" +CONFIG_CMDLINE_FROM_BOOTLOADER=y CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_HAVE_ARM_TWD=y CONFIG_AEABI=y @@ -110,7 +111,7 @@ CONFIG_RCU_FANOUT=32 CONFIG_CPU_IDLE=y # CONFIG_CPU_IDLE_GOV_LADDER is not set CONFIG_CPU_IDLE_GOV_MENU=y -CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y +# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set # CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set @@ -157,6 +158,13 @@ CONFIG_ARM_SP805_WATCHDOG=m CONFIG_GPIO_PL061=y CONFIG_PL320_MBOX=y +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=m +CONFIG_REGMAP_SPI=m +CONFIG_REGMAP_SPMI=m +CONFIG_REGMAP_MMIO=m +CONFIG_REGMAP_IRQ=y + # usb CONFIG_USB_OTG=y # CONFIG_USB_OTG_WHITELIST is not set @@ -246,18 +254,20 @@ CONFIG_GENERIC_PINCONF=y # GPIO # CONFIG_GPIO_EM is not set +CONFIG_GPIO_74X164=m CONFIG_GPIO_ADNP=m CONFIG_GPIO_MCP23S08=m -CONFIG_SERIAL_8250_EM=m -CONFIG_INPUT_GPIO_TILT_POLLED=m -CONFIG_MDIO_BUS_MUX_GPIO=m -CONFIG_MDIO_BUS_MUX_MMIOREG=m -CONFIG_LEDS_GPIO=m CONFIG_GPIO_MAX7301=m CONFIG_GPIO_MC33880=m -CONFIG_GPIO_74X164=m CONFIG_GPIO_TPS65910=y CONFIG_GPIO_TPS65912=m +CONFIG_LEDS_GPIO=m +CONFIG_MDIO_BUS_MUX_GPIO=m +CONFIG_MDIO_BUS_MUX_MMIOREG=m +CONFIG_INPUT_GPIO_TILT_POLLED=m +CONFIG_INPUT_MATRIXKMAP=m +CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_MATRIX=m # CONFIG_GPIO_RCAR is not set CONFIG_W1_MASTER_GPIO=m @@ -477,6 +487,7 @@ CONFIG_SRAM=y # Ethernet CONFIG_KS8851=m +CONFIG_KS8851_MLL=m CONFIG_ENC28J60=m CONFIG_LIBERTAS_SPI=m CONFIG_P54_SPI=m @@ -538,6 +549,7 @@ CONFIG_BPF_JIT=y # CONFIG_DEPRECATED_PARAM_STRUCT is not set # CONFIG_LATTICE_ECP3_CONFIG is not set # CONFIG_M25PXX_USE_FAST_READ is not set +# CONFIG_SERIAL_8250_EM is not set # CONFIG_SERIAL_MAX3100 is not set # CONFIG_SERIAL_MAX310X is not set # CONFIG_SERIAL_IFX6X60 is not set diff --git a/kernel.spec b/kernel.spec index a1733e14f..b5ff354db 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2167,6 +2167,9 @@ fi # ||----w | # || || %changelog +* Sun Jan 12 2014 Peter Robinson <pbrobinson@fedoraproject.org> +- Minor ARM config updates and cleanups + * Sun Jan 12 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc8.git0.1 - Linux v3.13-rc8 - Disable debugging options. |