Skip to content

Commit e07ecee

Browse files
committed
ARM: config: multi v7: Clean up enabled by default options
A number of options in the defconfig are enabled by other options; either through selects or defaults. SECCOMP is on by default as of commit 282a181 ("seccomp: Move config option SECCOMP to arch/Kconfig"). NET_SWITCHDEV is enabled by NET_DSA. I think this is a result of commit 227d720 ("dsa: simplify Kconfig symbols and dependencies"). SIMPLE_PM_BUS is selected ARCH_OMAP2PLUS as of commit 2a39af3 ("ARM: OMAP2+: Fix booting for am335x after moving to simple-pm-bus"). MICREL_PHY is selected by the ks8851 ethernet driver as of f0791b9 ("net: ks8851: Select PHYLIB and MICREL_PHY in Kconfig"). SMSC_PHY is selected by USB_NET_SMSC95XX as of commit 05b35e7 ("smsc95xx: add phylib support"). STMPE_I2C is default y. It was explicitly added to the defconfig in commit d8f0ddc ("ARM: defconfig: add STMPE ADC driver for P4 Note") but it's not required. CLK_ACTIONS and CLK_OWL_S500 was explicitly added in commit 26ba4a4 ("ARM: multi_v7_defconfig: Enable Actions Semi platform and drivers"), but it defaults on when ARCH_ACTIONS is enabled. Drop them. CROS_EC_CHARDEV defaults to MFD_CROS_EC_DEV, which defaults to CROS_EC since commit 2fa2b98 ("mfd / platform: cros_ec: Rename config to a better name"). TEGRA20_APB_DMA is selected by SOC_TEGRA_FUSE if ARCH_TEGRA_2x_SOC since commit 19d41e5 ("soc/tegra: fuse: Add APB DMA dependency for Tegra20"). USB_CHIPIDEA_TEGRA is enabled when USB_CHIPIDEA is enabled. It falls out of the defconfig but is enabled, as intended by d50229c ("ARM: multi_v7_defconfig: Stop using deprecated USB_EHCI_TEGRA"). SERIAL_OWL_CONSOLE defaults to on when SERIAL_OWL=y, and has since it was introduced. Commit c6774ee ("media: Kconfig: make filtering devices optional") made MEDIA_PLATFORM_SUPPORT, MEDIA_CAMERA_SUPPORT and MEDIA_CEC_SUPPORT default y if MEDIA_SUPPORT_FILTER is disabled, so they fall out of the defconfig. MEDIA_CONTROLLER is selected by a number of drivers in the config, and additionally defaults to MEDIA_PLATFORM_SUPPORT which is enabled. Signed-off-by: Joel Stanley <[email protected]> Reviewed-by: Arnd Bergmann <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent b942624 commit e07ecee

File tree

1 file changed

+0
-19
lines changed

1 file changed

+0
-19
lines changed

arch/arm/configs/multi_v7_defconfig

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ CONFIG_ARCH_WM8850=y
9696
CONFIG_ARCH_ZYNQ=y
9797
CONFIG_SMP=y
9898
CONFIG_NR_CPUS=16
99-
CONFIG_SECCOMP=y
10099
CONFIG_ARM_APPENDED_DTB=y
101100
CONFIG_ARM_ATAG_DTB_COMPAT=y
102101
CONFIG_KEXEC=y
@@ -156,7 +155,6 @@ CONFIG_INET6_IPCOMP=m
156155
CONFIG_IPV6_MIP6=m
157156
CONFIG_IPV6_TUNNEL=m
158157
CONFIG_IPV6_MULTIPLE_TABLES=y
159-
CONFIG_NET_SWITCHDEV=y
160158
CONFIG_NET_DSA=m
161159
CONFIG_CAN=y
162160
CONFIG_CAN_AT91=m
@@ -195,7 +193,6 @@ CONFIG_PCI_EPF_TEST=m
195193
CONFIG_DEVTMPFS=y
196194
CONFIG_DEVTMPFS_MOUNT=y
197195
CONFIG_OMAP_OCP2SCP=y
198-
CONFIG_SIMPLE_PM_BUS=y
199196
CONFIG_MTD=y
200197
CONFIG_MTD_CMDLINE_PARTS=y
201198
CONFIG_MTD_BLOCK=y
@@ -280,12 +277,9 @@ CONFIG_TI_CPTS=y
280277
CONFIG_XILINX_EMACLITE=y
281278
CONFIG_BROADCOM_PHY=y
282279
CONFIG_ICPLUS_PHY=y
283-
CONFIG_DP83867_PHY=y
284280
CONFIG_MARVELL_PHY=y
285-
CONFIG_MICREL_PHY=y
286281
CONFIG_AT803X_PHY=y
287282
CONFIG_ROCKCHIP_PHY=y
288-
CONFIG_SMSC_PHY=y
289283
CONFIG_USB_PEGASUS=y
290284
CONFIG_USB_RTL8152=m
291285
CONFIG_USB_LAN78XX=m
@@ -376,7 +370,6 @@ CONFIG_SERIAL_ST_ASC_CONSOLE=y
376370
CONFIG_SERIAL_STM32=y
377371
CONFIG_SERIAL_STM32_CONSOLE=y
378372
CONFIG_SERIAL_OWL=y
379-
CONFIG_SERIAL_OWL_CONSOLE=y
380373
CONFIG_SERIAL_DEV_BUS=y
381374
CONFIG_VIRTIO_CONSOLE=y
382375
CONFIG_ASPEED_KCS_IPMI_BMC=m
@@ -573,7 +566,6 @@ CONFIG_MFD_RK808=y
573566
CONFIG_MFD_RN5T618=y
574567
CONFIG_MFD_SEC_CORE=y
575568
CONFIG_MFD_STMPE=y
576-
CONFIG_STMPE_I2C=y
577569
CONFIG_MFD_PALMAS=y
578570
CONFIG_MFD_TPS65090=y
579571
CONFIG_MFD_TPS65217=y
@@ -630,10 +622,6 @@ CONFIG_REGULATOR_TWL4030=y
630622
CONFIG_REGULATOR_VEXPRESS=y
631623
CONFIG_REGULATOR_WM8994=m
632624
CONFIG_MEDIA_SUPPORT=m
633-
CONFIG_MEDIA_CAMERA_SUPPORT=y
634-
CONFIG_MEDIA_CEC_SUPPORT=y
635-
CONFIG_MEDIA_CONTROLLER=y
636-
CONFIG_VIDEO_V4L2_SUBDEV_API=y
637625
CONFIG_MEDIA_USB_SUPPORT=y
638626
CONFIG_USB_VIDEO_CLASS=m
639627
CONFIG_V4L_PLATFORM_DRIVERS=y
@@ -779,7 +767,6 @@ CONFIG_SND_SOC_AK4642=m
779767
CONFIG_SND_SOC_CPCAP=m
780768
CONFIG_SND_SOC_CS42L51_I2C=m
781769
CONFIG_SND_SOC_SGTL5000=m
782-
CONFIG_SND_SOC_SPDIF=m
783770
CONFIG_SND_SOC_STI_SAS=m
784771
CONFIG_SND_SOC_WM8978=m
785772
CONFIG_SND_AUDIO_GRAPH_CARD=m
@@ -815,7 +802,6 @@ CONFIG_USB_DWC2=y
815802
CONFIG_USB_CHIPIDEA=y
816803
CONFIG_USB_CHIPIDEA_UDC=y
817804
CONFIG_USB_CHIPIDEA_HOST=y
818-
CONFIG_USB_CHIPIDEA_TEGRA=y
819805
CONFIG_USB_ISP1760=y
820806
CONFIG_USB_HSIC_USB3503=y
821807
CONFIG_AB8500_USB=y
@@ -964,7 +950,6 @@ CONFIG_ST_FDMA=m
964950
CONFIG_STM32_DMA=y
965951
CONFIG_STM32_DMAMUX=y
966952
CONFIG_STM32_MDMA=y
967-
CONFIG_TEGRA20_APB_DMA=y
968953
CONFIG_UNIPHIER_MDMAC=y
969954
CONFIG_XILINX_DMA=y
970955
CONFIG_QCOM_BAM_DMA=y
@@ -980,15 +965,12 @@ CONFIG_SERIO_NVEC_PS2=y
980965
CONFIG_NVEC_POWER=y
981966
CONFIG_NVEC_PAZ00=y
982967
CONFIG_STAGING_BOARD=y
983-
CONFIG_MFD_CROS_EC_DEV=m
984968
CONFIG_CROS_EC_I2C=m
985969
CONFIG_CROS_EC_SPI=m
986970
CONFIG_COMMON_CLK_MAX77686=y
987971
CONFIG_COMMON_CLK_RK808=m
988972
CONFIG_COMMON_CLK_SCMI=y
989973
CONFIG_COMMON_CLK_S2MPS11=m
990-
CONFIG_CLK_ACTIONS=y
991-
CONFIG_CLK_OWL_S500=y
992974
CONFIG_CLK_RASPBERRYPI=y
993975
CONFIG_COMMON_CLK_QCOM=y
994976
CONFIG_QCOM_CLK_RPM=y
@@ -1177,4 +1159,3 @@ CONFIG_MAGIC_SYSRQ=y
11771159
CONFIG_DEBUG_FS=y
11781160
CONFIG_CHROME_PLATFORMS=y
11791161
CONFIG_CROS_EC=m
1180-
CONFIG_CROS_EC_CHARDEV=m

0 commit comments

Comments
 (0)