From: DENG Qingfang Date: Sat, 30 May 2020 15:31:30 +0000 (+0800) Subject: ipq40xx: disable DSA and Switchdev X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=752cee796d0310989b9543150397985ea302688f;p=openwrt%2Fstaging%2Fnbd.git ipq40xx: disable DSA and Switchdev ipq40xx is still using swconfig based switch management. This might change in he future, however disable the DSA and Switchdev support for now. Signed-off-by: DENG Qingfang [rephrased commit message] Signed-off-by: David Bauer --- diff --git a/target/linux/ipq40xx/config-4.19 b/target/linux/ipq40xx/config-4.19 index 23eb5ca589..7cea66e50d 100644 --- a/target/linux/ipq40xx/config-4.19 +++ b/target/linux/ipq40xx/config-4.19 @@ -336,12 +336,8 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEON=y -CONFIG_NET_DSA=y -CONFIG_NET_DSA_QCA8K=y -CONFIG_NET_DSA_TAG_QCA=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_PTP_CLASSIFY=y -CONFIG_NET_SWITCHDEV=y CONFIG_NLS=y CONFIG_NO_BOOTMEM=y CONFIG_NO_HZ=y @@ -379,7 +375,6 @@ CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PERF_USE_VMALLOC=y CONFIG_PGTABLE_LEVELS=2 CONFIG_PHYLIB=y -CONFIG_PHYLINK=y # CONFIG_PHY_QCOM_APQ8064_SATA is not set CONFIG_PHY_QCOM_IPQ4019_USB=y # CONFIG_PHY_QCOM_IPQ806X_SATA is not set diff --git a/target/linux/ipq40xx/config-5.4 b/target/linux/ipq40xx/config-5.4 index 4e5e47a802..33551a95e7 100644 --- a/target/linux/ipq40xx/config-5.4 +++ b/target/linux/ipq40xx/config-5.4 @@ -355,13 +355,8 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEON=y -CONFIG_NET_DEVLINK=y -CONFIG_NET_DSA=y -CONFIG_NET_DSA_QCA8K=y -CONFIG_NET_DSA_TAG_QCA=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_PTP_CLASSIFY=y -CONFIG_NET_SWITCHDEV=y CONFIG_NLS=y CONFIG_NO_HZ=y CONFIG_NO_HZ_COMMON=y @@ -398,7 +393,6 @@ CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PERF_USE_VMALLOC=y CONFIG_PGTABLE_LEVELS=2 CONFIG_PHYLIB=y -CONFIG_PHYLINK=y # CONFIG_PHY_QCOM_APQ8064_SATA is not set CONFIG_PHY_QCOM_IPQ4019_USB=y # CONFIG_PHY_QCOM_IPQ806X_SATA is not set