Clean up kconfig for 4.16

- CONFIG_PHY_MVEBU_SATA is an automatic symbol, so don't try to set it.
- CONFIG_SND_SOC_INTEL_SST_TOPLEVEL is now boolean
- CONFIG_X86_PPRO_FENCE was removed
This commit is contained in:
Ben Hutchings 2018-04-19 14:24:54 +01:00
parent a8c6014b43
commit 63bed1200a
4 changed files with 17 additions and 19 deletions

View File

@ -181,6 +181,7 @@ CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
##
CONFIG_DMADEVICES=y
CONFIG_DMA_BCM2835=y
CONFIG_DMA_SUN6I=m
CONFIG_K3_DMA=m
CONFIG_MV_XOR=y
CONFIG_MV_XOR_V2=y
@ -188,7 +189,6 @@ CONFIG_PL330_DMA=m
CONFIG_TEGRA20_APB_DMA=y
CONFIG_TEGRA210_ADMA=y
CONFIG_XGENE_DMA=m
CONFIG_DMA_SUN6I=m
##
## file: drivers/dma/qcom/Kconfig

View File

@ -197,9 +197,9 @@ CONFIG_HW_RANDOM_OMAP=m
##
CONFIG_COMMON_CLK_MAX77686=m
CONFIG_COMMON_CLK_RK808=m
CONFIG_COMMON_CLK_SI5351=m
CONFIG_COMMON_CLK_S2MPS11=m
CONFIG_CLK_TWL6040=m
CONFIG_COMMON_CLK_SI5351=m
##
## file: drivers/cpufreq/Kconfig
@ -426,6 +426,7 @@ CONFIG_I2C_BCM2835=m
CONFIG_I2C_EXYNOS5=m
CONFIG_I2C_GPIO=y
CONFIG_I2C_IMX=m
CONFIG_I2C_MESON=m
CONFIG_I2C_MV64XXX=m
CONFIG_I2C_OMAP=y
CONFIG_I2C_RK3X=m
@ -434,7 +435,6 @@ CONFIG_I2C_SUN6I_P2WI=m
CONFIG_I2C_TEGRA=y
CONFIG_I2C_VERSATILE=m
CONFIG_I2C_CROS_EC_TUNNEL=m
CONFIG_I2C_MESON=m
##
## file: drivers/i2c/muxes/Kconfig
@ -630,10 +630,12 @@ CONFIG_MMC_ARMMMCI=m
CONFIG_MMC_SDHCI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_ESDHC_IMX=m
CONFIG_MMC_SDHCI_DOVE=m
CONFIG_MMC_SDHCI_TEGRA=m
CONFIG_MMC_SDHCI_S3C=m
CONFIG_MMC_SDHCI_PXAV3=m
CONFIG_MMC_SDHCI_IPROC=m
CONFIG_MMC_MESON_MX_SDIO=m
CONFIG_MMC_OMAP=m
CONFIG_MMC_OMAP_HS=m
CONFIG_MMC_MVSDIO=m
@ -644,8 +646,6 @@ CONFIG_MMC_DW_ROCKCHIP=m
CONFIG_MMC_WMT=m
CONFIG_MMC_SUNXI=m
CONFIG_MMC_BCM2835=m
CONFIG_MMC_MESON_MX_SDIO=m
CONFIG_MMC_SDHCI_DOVE=m
##
## file: drivers/mtd/Kconfig
@ -756,10 +756,10 @@ CONFIG_E100=m
##
## file: drivers/net/ethernet/marvell/Kconfig
##
CONFIG_MV643XX_ETH=m
CONFIG_MVMDIO=m
CONFIG_MVNETA=m
CONFIG_MVPP2=m
CONFIG_MV643XX_ETH=m
##
## file: drivers/net/ethernet/microchip/Kconfig
@ -887,11 +887,6 @@ CONFIG_PCI_HOST_GENERIC=y
CONFIG_PHY_SUN4I_USB=m
CONFIG_PHY_SUN9I_USB=m
##
## file: drivers/phy/marvell/Kconfig
##
CONFIG_PHY_MVEBU_SATA=m
##
## file: drivers/phy/rockchip/Kconfig
##
@ -1073,6 +1068,8 @@ CONFIG_SPI_BCM2835=m
CONFIG_SPI_BCM2835AUX=m
CONFIG_SPI_GPIO=y
CONFIG_SPI_IMX=m
CONFIG_SPI_MESON_SPICC=m
CONFIG_SPI_MESON_SPIFC=m
CONFIG_SPI_OMAP24XX=m
CONFIG_SPI_TI_QSPI=m
CONFIG_SPI_ORION=m
@ -1083,15 +1080,13 @@ CONFIG_SPI_SUN6I=m
CONFIG_SPI_TEGRA114=m
CONFIG_SPI_TEGRA20_SFLASH=m
CONFIG_SPI_SPIDEV=y
CONFIG_SPI_MESON_SPICC=m
CONFIG_SPI_MESON_SPIFC=m
##
## file: drivers/thermal/Kconfig
##
CONFIG_ROCKCHIP_THERMAL=m
CONFIG_ARMADA_THERMAL=y
CONFIG_DOVE_THERMAL=m
CONFIG_ARMADA_THERMAL=y
##
## file: drivers/thermal/broadcom/Kconfig
@ -1119,6 +1114,8 @@ CONFIG_SERIAL_AMBA_PL010=y
CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_SERIAL_MESON=y
CONFIG_SERIAL_MESON_CONSOLE=y
CONFIG_SERIAL_SAMSUNG=y
CONFIG_SERIAL_SAMSUNG_CONSOLE=y
CONFIG_SERIAL_TEGRA=y
@ -1131,8 +1128,6 @@ CONFIG_SERIAL_OMAP_CONSOLE=y
CONFIG_SERIAL_ARC=y
CONFIG_SERIAL_ARC_CONSOLE=y
CONFIG_SERIAL_ARC_NR_PORTS=1
CONFIG_SERIAL_MESON=y
CONFIG_SERIAL_MESON_CONSOLE=y
##
## file: drivers/tty/serial/8250/Kconfig
@ -1282,8 +1277,8 @@ CONFIG_SUNXI_WATCHDOG=m
CONFIG_TWL4030_WATCHDOG=m
CONFIG_IMX2_WDT=m
CONFIG_TEGRA_WATCHDOG=m
CONFIG_BCM2835_WDT=m
CONFIG_MESON_WATCHDOG=m
CONFIG_BCM2835_WDT=m
##
## file: kernel/power/Kconfig

View File

@ -47,7 +47,6 @@ CONFIG_SCx200HR_TIMER=m
## file: arch/x86/Kconfig.cpu
##
CONFIG_X86_GENERIC=y
# CONFIG_X86_PPRO_FENCE is not set
##
## file: crypto/Kconfig

View File

@ -1749,6 +1749,10 @@ CONFIG_USB_SL811_CS=m
##
CONFIG_TYPEC=m
CONFIG_TYPEC_TCPM=m
##
## file: drivers/usb/typec/fusb302/Kconfig
##
CONFIG_TYPEC_FUSB302=m
##
@ -2030,7 +2034,7 @@ CONFIG_SND_SOC_AMD_ACP=m
##
## file: sound/soc/intel/Kconfig
##
CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=m
CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
CONFIG_SND_SOC_INTEL_HASWELL=m
CONFIG_SND_SOC_INTEL_BAYTRAIL=m
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m