kernel: Move some DSA config options to generic config

This moves some new configuration options to the generic kernel
configuration instead of configuring them for each target on our own.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

4 files changed, 4 insertions, 10 deletions

diff --git a/target/linux/gemini/config-4.19 b/target/linux/gemini/config-4.19
index 7eee5fe9c0..85abbe2454 100644
--- a/target/linux/gemini/config-4.19
+++ b/target/linux/gemini/config-4.19
@@ -322,7 +322,6 @@ CONFIG_MODULES_USE_ELF_REL=y
 # CONFIG_MODULE_UNLOAD is not set
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
-# CONFIG_MSCC_OCELOT_SWITCH is not set
 CONFIG_MTD_CFI_STAA=y
 # CONFIG_MTD_IMPA7 is not set
 CONFIG_MTD_JEDECPROBE=y
@@ -336,9 +335,6 @@ CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_KUSER_HELPERS=y
 CONFIG_NEED_PER_CPU_KM=y
 CONFIG_NET_DSA=y
-# CONFIG_NET_DSA_LEGACY is not set
-CONFIG_NET_DSA_REALTEK_SMI=y
-CONFIG_NET_DSA_VITESSE_VSC73XX=y
 CONFIG_NET_NS=y
 CONFIG_NET_SWITCHDEV=y
 CONFIG_NLS=y
diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19
index f9a4b83944..aa94466148 100644
--- a/target/linux/generic/config-4.19
+++ b/target/linux/generic/config-4.19
@@ -2892,6 +2892,7 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MQ_IOSCHED_KYBER is not set
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
+# CONFIG_MSCC_OCELOT_SWITCH is not set
 # CONFIG_MSDOS_FS is not set
 CONFIG_MSDOS_PARTITION=y
 # CONFIG_MSI_BITMAP_SELFTEST is not set
@@ -3194,6 +3195,7 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_NET_DSA is not set
 # CONFIG_NET_DSA_BCM_SF2 is not set
+# CONFIG_NET_DSA_LEGACY is not set
 # CONFIG_NET_DSA_LOOP is not set
 # CONFIG_NET_DSA_MT7530 is not set
 # CONFIG_NET_DSA_MV88E6060 is not set
@@ -3204,10 +3206,12 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_DSA_MV88E6XXX is not set
 # CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
 # CONFIG_NET_DSA_QCA8K is not set
+# CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
 # CONFIG_NET_DSA_TAG_DSA is not set
 # CONFIG_NET_DSA_TAG_EDSA is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
 # CONFIG_NET_EMATCH is not set
 # CONFIG_NET_EMATCH_CANID is not set
 # CONFIG_NET_EMATCH_CMP is not set
diff --git a/target/linux/imx6/config-4.19 b/target/linux/imx6/config-4.19
index 9fada9a01a..94865f96e2 100644
--- a/target/linux/imx6/config-4.19
+++ b/target/linux/imx6/config-4.19
@@ -338,7 +338,6 @@ CONFIG_MMC_SDHCI_PLTFM=y
 # CONFIG_MMC_TIFM_SD is not set
 CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_MPILIB=y
-# CONFIG_MSCC_OCELOT_SWITCH is not set
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_ECC=y
 CONFIG_MTD_NAND_GPMI_NAND=y
@@ -354,11 +353,9 @@ CONFIG_MXS_DMA=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEON=y
 CONFIG_NET_DSA=y
-CONFIG_NET_DSA_LEGACY=y
 CONFIG_NET_DSA_MV88E6XXX=y
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 # CONFIG_NET_DSA_MV88E6XXX_PTP is not set
-# CONFIG_NET_DSA_REALTEK_SMI is not set
 CONFIG_NET_DSA_TAG_DSA=y
 CONFIG_NET_DSA_TAG_EDSA=y
 # CONFIG_NET_DSA_VITESSE_VSC73XX is not set
diff --git a/target/linux/ipq40xx/config-4.19 b/target/linux/ipq40xx/config-4.19
index a40f4b6bcb..8948b73ff7 100644
--- a/target/linux/ipq40xx/config-4.19
+++ b/target/linux/ipq40xx/config-4.19
@@ -284,7 +284,6 @@ CONFIG_MIGHT_HAVE_CACHE_L2X0=y
 CONFIG_MIGHT_HAVE_PCI=y
 CONFIG_MIGRATION=y
 CONFIG_MODULES_USE_ELF_REL=y
-# CONFIG_MSCC_OCELOT_SWITCH is not set
 # CONFIG_MSM_GCC_8660 is not set
 # CONFIG_MSM_GCC_8916 is not set
 # CONFIG_MSM_GCC_8960 is not set
@@ -316,9 +315,7 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEON=y
 CONFIG_NET_DSA=y
-CONFIG_NET_DSA_LEGACY=y
 CONFIG_NET_DSA_QCA8K=y
-# CONFIG_NET_DSA_REALTEK_SMI is not set
 CONFIG_NET_DSA_TAG_QCA=y
 # CONFIG_NET_DSA_VITESSE_VSC73XX is not set
 CONFIG_NET_FLOW_LIMIT=y