diff options
| -rw-r--r-- | config-arm-generic | 2 | ||||
| -rw-r--r-- | config-arm64 | 7 | ||||
| -rw-r--r-- | config-armv7 | 17 | ||||
| -rw-r--r-- | config-armv7-generic | 23 | ||||
| -rw-r--r-- | config-armv7-lpae | 1 | ||||
| -rw-r--r-- | config-generic | 9 | ||||
| -rw-r--r-- | config-s390x | 2 | ||||
| -rw-r--r-- | kernel.spec | 3 |
8 files changed, 23 insertions, 41 deletions
diff --git a/config-arm-generic b/config-arm-generic index e08838ec7..fa7df0ecd 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -208,6 +208,8 @@ CONFIG_CMA_AREAS=7 # CONFIG_PATA_PLATFORM is not set # CONFIG_USB_ULPI is not set +# CONFIG_KEYBOARD_OMAP4 is not set +# CONFIG_PHY_SAMSUNG_USB2 is not set ### turn off things which make no sense on embedded SoC diff --git a/config-arm64 b/config-arm64 index de0bcc38d..9d4181328 100644 --- a/config-arm64 +++ b/config-arm64 @@ -121,11 +121,10 @@ CONFIG_HOTPLUG_PCI=y # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set # CONFIG_PNP_DEBUG_MESSAGES is not set -CONFIG_NET_SB1000=y CONFIG_SBSAUART_TTY=y CONFIG_I2C_SCMI=m CONFIG_SENSORS_ACPI_POWER=m -CONFIG_PWM_LPSS=m + CONFIG_ACPI=y CONFIG_ACPI_PROCFS_POWER=y CONFIG_ACPI_EC_DEBUGFS=y @@ -137,6 +136,7 @@ CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_HED=m CONFIG_ACPI_CUSTOM_METHOD=m +CONFIG_NET_SB1000=y CONFIG_AMD_XGBE=m CONFIG_AMD_XGBE_PHY=m # CONFIG_AMD_XGBE_DCB is not set @@ -144,9 +144,6 @@ CONFIG_AMD_XGBE_PHY=m # CONFIG_IMX_THERMAL is not set # CONFIG_MMC_DW is not set -# still? 2014-11-11 -# CONFIG_BPF_JIT is not set - CONFIG_DMI=y CONFIG_DMIID=y CONFIG_DMI_SYSFS=y diff --git a/config-armv7 b/config-armv7 index 090ca3781..f071dd9a8 100644 --- a/config-armv7 +++ b/config-armv7 @@ -4,14 +4,12 @@ # CONFIG_ARCH_KEYSTONE is not set CONFIG_ARCH_MVEBU=y CONFIG_ARCH_MXC=y -# CONFIG_ARCH_OMAP2 is not set CONFIG_ARCH_OMAP3=y CONFIG_ARCH_OMAP4=y CONFIG_ARCH_PICOXCELL=y CONFIG_ARCH_QCOM=y CONFIG_ARCH_TEGRA=y CONFIG_ARCH_U8500=y -# CONFIG_ARCH_VIRT is not set CONFIG_ARCH_ZYNQ=y # These are supported in the LPAE kernel @@ -79,7 +77,6 @@ CONFIG_SOC_TI81XX=y # CONFIG_MACH_CRANEBOARD is not set # CONFIG_MACH_DEVKIT8000 is not set # CONFIG_MACH_NOKIA_RX51 is not set -# CONFIG_MACH_OMAP_3430SDP is not set # CONFIG_MACH_OMAP_LDP is not set # CONFIG_MACH_OMAP3_BEAGLE is not set # CONFIG_MACH_OMAP3517EVM is not set @@ -88,8 +85,6 @@ CONFIG_SOC_TI81XX=y # CONFIG_MACH_OMAP3_TORPEDO is not set # CONFIG_MACH_OVERO is not set # CONFIG_MACH_SBC3530 is not set -# CONFIG_MACH_TI8168EVM is not set -# CONFIG_MACH_TI8148EVM is not set # CONFIG_MACH_TOUCHBOOK is not set CONFIG_SOC_HAS_REALTIME_COUNTER=y @@ -108,7 +103,6 @@ CONFIG_OMAP_PM_NOOP=y CONFIG_DMA_OMAP=y CONFIG_OMAP_IOMMU=y CONFIG_HWSPINLOCK_OMAP=m -CONFIG_OMAP3_EMU=y # CONFIG_OMAP3_SDRC_AC_TIMING is not set CONFIG_SERIAL_OMAP=y @@ -117,6 +111,7 @@ CONFIG_SERIAL_8250_OMAP=m CONFIG_GPIO_TWL4030=m CONFIG_GPIO_TWL6040=m +CONFIG_GPIO_PCF857X=m CONFIG_I2C_OMAP=m CONFIG_CHARGER_TWL4030=m CONFIG_OMAP_WATCHDOG=m @@ -143,6 +138,7 @@ CONFIG_USB_EHCI_HCD_OMAP=m CONFIG_USB_OHCI_HCD_OMAP3=m CONFIG_USB_MUSB_AM35X=m CONFIG_USB_MUSB_OMAP2PLUS=m +CONFIG_USB_DWC3_OMAP=m CONFIG_MMC_OMAP=m CONFIG_MMC_OMAP_HS=y CONFIG_RTC_DRV_MAX8907=m @@ -242,10 +238,10 @@ CONFIG_DISPLAY_PANEL_NEC_NL8048HL11=m CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1=m # Enable V4L2 drivers for OMAP2+ -CONFIG_MEDIA_CONTROLLER=y CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_VIDEO_OMAP2_VOUT is not set CONFIG_VIDEO_OMAP3=m +CONFIG_VIDEO_ADP1653=m # CONFIG_VIDEO_OMAP4 is not set # The ones below are for TI Davinci # CONFIG_VIDEO_DM6446_CCDC is not set @@ -325,6 +321,7 @@ CONFIG_PINCTRL_APQ8084=m CONFIG_PINCTRL_IPQ8064=m CONFIG_PINCTRL_MSM8960=m CONFIG_PINCTRL_MSM8X74=m +CONFIG_PINCTRL_QCOM_SPMI_PMIC=m CONFIG_COMMON_CLK_QCOM=m CONFIG_MFD_QCOM_RPM=m CONFIG_MFD_PM8921_CORE=m @@ -362,6 +359,10 @@ CONFIG_INPUT_PMIC8XXX_PWRKEY=m CONFIG_RTC_DRV_PM8XXX=m # CONFIG_DRM_MSM_REGISTER_LOGGING is not set CONFIG_QCOM_WDT=m +CONFIG_MFD_SPMI_PMIC=m +CONFIG_SPMI=m +CONFIG_SPMI_MSM_PMIC_ARB=m +CONFIG_QCOM_SPMI_IADC=m # i.MX # CONFIG_MXC_DEBUG_BOARD is not set @@ -501,7 +502,7 @@ CONFIG_REGULATOR_DA9055=m CONFIG_ARCH_EXYNOS4=y CONFIG_SOC_EXYNOS4212=y CONFIG_SOC_EXYNOS4412=y -# CONFIG_SOC_EXYNOS4415 is not set +CONFIG_SOC_EXYNOS4415=y CONFIG_ARM_EXYNOS4210_CPUFREQ=y CONFIG_ARM_EXYNOS4X12_CPUFREQ=y CONFIG_AK8975=m diff --git a/config-armv7-generic b/config-armv7-generic index f517acb4b..69d629826 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -2,8 +2,6 @@ # Generic ARM config options CONFIG_ARM=y -# 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 @@ -55,8 +53,8 @@ CONFIG_ARCH_HIGHBANK=y CONFIG_ARCH_ROCKCHIP=y CONFIG_ARCH_SUNXI=y CONFIG_ARCH_TEGRA=y -CONFIG_ARCH_VEXPRESS_CA9X4=y CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y +CONFIG_ARCH_VIRT=y # CONFIG_ARCH_BCM is not set # CONFIG_ARCH_BERLIN is not set # CONFIG_ARCH_HI3xxx is not set @@ -183,8 +181,7 @@ CONFIG_MACH_SUN7I=y CONFIG_DMA_SUN6I=m CONFIG_SUNXI_WATCHDOG=m CONFIG_NET_VENDOR_ALLWINNER=y -CONFIG_STMMAC_PLATFORM=y -CONFIG_DWMAC_SUNXI=y +CONFIG_STMMAC_PLATFORM=m CONFIG_EEPROM_SUNXI_SID=m CONFIG_RTC_DRV_SUNXI=m CONFIG_PHY_SUN4I_USB=m @@ -338,7 +335,6 @@ CONFIG_DRM_ROCKCHIP=m # Tegra CONFIG_ARCH_TEGRA_114_SOC=y CONFIG_ARCH_TEGRA_124_SOC=y -CONFIG_TEGRA_AHB=y CONFIG_ARM_TEGRA_CPUFREQ=y CONFIG_TRUSTED_FOUNDATIONS=y CONFIG_SERIAL_TEGRA=y @@ -443,7 +439,6 @@ CONFIG_USB_CONFIGFS_SERIAL=y # CONFIG_USB_GADGET_DEBUG_FILES is not set # CONFIG_USB_GADGET_DEBUG_FS is not set # CONFIG_USB_FUSB300 is not set -# CONFIG_USB_RENESAS_USBHS is not set # CONFIG_USB_FOTG210_UDC is not set # CONFIG_USB_R8A66597 is not set # CONFIG_USB_PXA27X is not set @@ -604,19 +599,16 @@ CONFIG_SPI_DW_PCI=m # CONFIG_MMC_DW_IDMAC is not set # CONFIG_MMC_DW_K3 is not set # CONFIG_MMC_QCOM_DML is not set -CONFIG_USB_DWC2=y -CONFIG_USB_DWC2_HOST=y -CONFIG_USB_DWC2_PLATFORM=y -CONFIG_USB_DWC2_PCI=y -# CONFIG_USB_DWC2_PERIPHERAL is not set +CONFIG_USB_DWC2=m +CONFIG_USB_DWC2_DUAL_ROLE=y +CONFIG_USB_DWC2_PLATFORM=m +CONFIG_USB_DWC2_PCI=m # CONFIG_USB_DWC2_DEBUG is not set # CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set CONFIG_USB_DWC3=m -CONFIG_USB_DWC3_OMAP=m +CONFIG_USB_DWC3_DUAL_ROLE=y CONFIG_USB_DWC3_PCI=m # CONFIG_USB_DWC3_DEBUG is not set -# CONFIG_USB_DWC3_KEYSTONE is not set -# CONFIG_USB_DWC3_QCOM is not set # CONFIG_DWC3_HOST_USB3_LPM_ENABLE is not set CONFIG_DW_WATCHDOG=m CONFIG_PCIE_DW=y @@ -890,7 +882,6 @@ CONFIG_SND_SOC_TS3A227E=m # CONFIG_EZX_PCAP is not set # CONFIG_CS89x0 is not set # CONFIG_DM9000 is not set -# CONFIG_HW_RANDOM_ATMEL is not set # CONFIG_MTD_AFS_PARTS is not set # CONFIG_SPI_PXA2XX is not set # CONFIG_DEPRECATED_PARAM_STRUCT is not set diff --git a/config-armv7-lpae b/config-armv7-lpae index 0c530b87c..9eb8d8a95 100644 --- a/config-armv7-lpae +++ b/config-armv7-lpae @@ -1,6 +1,5 @@ # ARM A15 lpae unified arch kernel CONFIG_ARCH_KEYSTONE=y -CONFIG_ARCH_VIRT=y # CONFIG_ARCH_MVEBU is not set # CONFIG_ARCH_MXC is not set diff --git a/config-generic b/config-generic index 9bb4ba12c..0240b8e91 100644 --- a/config-generic +++ b/config-generic @@ -565,7 +565,6 @@ CONFIG_SATA_NV=m CONFIG_SATA_PMP=y CONFIG_SATA_PROMISE=m CONFIG_SATA_QSTOR=m -# CONFIG_SATA_RCAR is not set CONFIG_SATA_SIL=m CONFIG_SATA_SIL24=m CONFIG_SATA_SIS=m @@ -1572,8 +1571,6 @@ CONFIG_STE10XP=m CONFIG_VITESSE_PHY=m CONFIG_MICREL_PHY=m # CONFIG_MICREL_KS8995MA is not set -# CONFIG_OMAP_CONTROL_PHY is not set -# CONFIG_PHY_SAMSUNG_USB2 is not set CONFIG_MII=m CONFIG_NET_CORE=y @@ -1582,7 +1579,6 @@ CONFIG_VORTEX=m CONFIG_TYPHOON=m CONFIG_DNET=m - CONFIG_B44=m CONFIG_B44_PCI=y CONFIG_BCMGENET=m @@ -1845,7 +1841,6 @@ CONFIG_MWIFIEX_USB=m CONFIG_IEEE802154=m CONFIG_IEEE802154_6LOWPAN=m CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKEHARD=m CONFIG_IEEE802154_FAKELB=m CONFIG_IEEE802154_CC2520=m # CONFIG_IEEE802154_AT86RF230 is not set @@ -2892,8 +2887,6 @@ CONFIG_WM831X_WATCHDOG=m CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=m -# CONFIG_HW_RANDOM_ATMEL is not set -# CONFIG_HW_RANDOM_EXYNOS is not set # CONFIG_NVRAM is not set # CONFIG_RTC is not set # CONFIG_RTC_DEBUG is not set @@ -3139,7 +3132,6 @@ CONFIG_VIDEO_TLG2300=m # CONFIG_VIDEO_M5MOLS is not set # CONFIG_VIDEO_TW68 is not set # CONFIG_VIDEO_VIVID is not set -# CONFIG_EXYNOS_VIDEO is not set CONFIG_VIDEO_USBTV=m # CONFIG_VIDEO_AU0828_RC is not set @@ -5027,7 +5019,6 @@ CONFIG_NET_DSA_BCM_SF2=m # CONFIG_PHONET is not set # CONFIG_ICS932S401 is not set -# CONFIG_ATMEL_SSC is not set # CONFIG_C2PORT is not set diff --git a/config-s390x b/config-s390x index cc9fd0e38..5f35e494c 100644 --- a/config-s390x +++ b/config-s390x @@ -151,8 +151,6 @@ CONFIG_VIRT_CPU_ACCOUNTING=y # CONFIG_CLAW is not set -# CONFIG_ATMEL is not set - # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set # CONFIG_MII is not set diff --git a/kernel.spec b/kernel.spec index 2181e82a1..328409ab1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2203,6 +2203,9 @@ fi # ||----w | # || || %changelog +* Tue Jan 20 2015 Peter Robinson <pbrobinson@fedoraproject.org> +- More ARM config option cleanups + * Mon Jan 19 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc5.git0.1 - Linux v3.19-rc5 - Disable debugging options. |