Skip to content

Commit b942624

Browse files
committed
ARM: config: multi v7: Drop unavailable options
SIRF was removed in commit f3a7328 ("ARM: remove sirf prima2/atlas platforms"). This covers ARCH_SIRF, SERIAL_SIRFSOC, SERIAL_SIRFSOC_CONSOLE, I2C_SIRF, SPI_SIRF. EVI_VARS was made x86 only in commit 963fabf ("efi: efivars: limit availability to X86 builds"). Signed-off-by: Joel Stanley <[email protected]> Reviewed-by: Arnd Bergmann <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 6880fa6 commit b942624

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

arch/arm/configs/multi_v7_defconfig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ CONFIG_SOC_OMAP5=y
7373
CONFIG_SOC_AM33XX=y
7474
CONFIG_SOC_AM43XX=y
7575
CONFIG_SOC_DRA7XX=y
76-
CONFIG_ARCH_SIRF=y
7776
CONFIG_ARCH_QCOM=y
7877
CONFIG_ARCH_MSM8X60=y
7978
CONFIG_ARCH_MSM8960=y
@@ -125,7 +124,6 @@ CONFIG_RASPBERRYPI_FIRMWARE=y
125124
CONFIG_TRUSTED_FOUNDATIONS=y
126125
CONFIG_BCM47XX_NVRAM=y
127126
CONFIG_BCM47XX_SPROM=y
128-
CONFIG_EFI_VARS=m
129127
CONFIG_EFI_CAPSULE_LOADER=m
130128
CONFIG_ARM_CRYPTO=y
131129
CONFIG_CRYPTO_SHA1_ARM_NEON=m
@@ -354,8 +352,6 @@ CONFIG_SERIAL_MESON=y
354352
CONFIG_SERIAL_MESON_CONSOLE=y
355353
CONFIG_SERIAL_SAMSUNG=y
356354
CONFIG_SERIAL_SAMSUNG_CONSOLE=y
357-
CONFIG_SERIAL_SIRFSOC=y
358-
CONFIG_SERIAL_SIRFSOC_CONSOLE=y
359355
CONFIG_SERIAL_TEGRA=y
360356
CONFIG_SERIAL_IMX=y
361357
CONFIG_SERIAL_IMX_CONSOLE=y
@@ -410,7 +406,6 @@ CONFIG_I2C_RIIC=y
410406
CONFIG_I2C_RK3X=y
411407
CONFIG_I2C_S3C2410=y
412408
CONFIG_I2C_SH_MOBILE=y
413-
CONFIG_I2C_SIRF=y
414409
CONFIG_I2C_ST=y
415410
CONFIG_I2C_STM32F7=y
416411
CONFIG_I2C_SUN6I_P2WI=y
@@ -438,7 +433,6 @@ CONFIG_SPI_RSPI=y
438433
CONFIG_SPI_S3C64XX=m
439434
CONFIG_SPI_SH_MSIOF=m
440435
CONFIG_SPI_SH_HSPI=y
441-
CONFIG_SPI_SIRF=y
442436
CONFIG_SPI_STM32=m
443437
CONFIG_SPI_STM32_QSPI=y
444438
CONFIG_SPI_SUN4I=y
@@ -965,7 +959,6 @@ CONFIG_MV_XOR=y
965959
CONFIG_MXS_DMA=y
966960
CONFIG_OWL_DMA=y
967961
CONFIG_PL330_DMA=y
968-
CONFIG_SIRF_DMA=y
969962
CONFIG_STE_DMA40=y
970963
CONFIG_ST_FDMA=m
971964
CONFIG_STM32_DMA=y

0 commit comments

Comments
 (0)