aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNishanth Menon2021-03-03 13:37:58 -0600
committerNishanth Menon2021-03-03 13:37:58 -0600
commitc60eb6b797369ee343de49e074c971ac5f311527 (patch)
tree8da26a1a56dd2a9fc996b5ef049af90ae7deddac
parent4d10a58c6f4af22c42bfb5b4634d8f271cd46d3b (diff)
parentc83d4aab0394809b3b70540cb9bc9001178adf18 (diff)
downloadti-upstream-tools-ti-linux-5.4.y.tar.gz
ti-upstream-tools-ti-linux-5.4.y.tar.xz
ti-upstream-tools-ti-linux-5.4.y.zip
Merge pull request #22 in LCPDPUB/ti-upstream-tools from ~A0132425/ti-upstream-tools:ti-linux-5.4.y to ti-linux-5.4.yti-linux-5.4.y
* commit 'c83d4aab0394809b3b70540cb9bc9001178adf18': config/connectivity.cfg: Sync Network related configs to that of kernel
-rw-r--r--config/connectivity.cfg15
1 files changed, 13 insertions, 2 deletions
diff --git a/config/connectivity.cfg b/config/connectivity.cfg
index 83a71da..e5c9956 100644
--- a/config/connectivity.cfg
+++ b/config/connectivity.cfg
@@ -38,6 +38,7 @@ CONFIG_TI_CPTS=y
38CONFIG_TI_RDEV_ETH_SWITCH_VIRT_EMAC=m 38CONFIG_TI_RDEV_ETH_SWITCH_VIRT_EMAC=m
39CONFIG_TI_PRUETH=m 39CONFIG_TI_PRUETH=m
40CONFIG_TI_ICSSG_PRUETH=m 40CONFIG_TI_ICSSG_PRUETH=m
41CONFIG_TI_K3_AM65_CPSW_SWITCHDEV=y
41# non-TI Net vendors 42# non-TI Net vendors
42CONFIG_NET_DSA_BCM_SF2=n 43CONFIG_NET_DSA_BCM_SF2=n
43CONFIG_B53=n 44CONFIG_B53=n
@@ -106,6 +107,10 @@ CONFIG_ICPLUS_PHY=n
106CONFIG_DP83848_PHY=y 107CONFIG_DP83848_PHY=y
107# Enable phy for DRA72 evm 108# Enable phy for DRA72 evm
108CONFIG_DP83867_PHY=y 109CONFIG_DP83867_PHY=y
110# Enable phy for AM64 evm
111CONFIG_DP83869_PHY=y
112# Control onboard MDIO muxes
113CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y
109 114
110#MTD 115#MTD
111CONFIG_MTD=y 116CONFIG_MTD=y
@@ -173,6 +178,7 @@ CONFIG_PHY_J721E_WIZ=y
173CONFIG_PHY_CADENCE_SIERRA=y 178CONFIG_PHY_CADENCE_SIERRA=y
174 179
175# Networking 180# Networking
181CONFIG_HSR=m
176CONFIG_NF_CONNTRACK=m 182CONFIG_NF_CONNTRACK=m
177CONFIG_IP_NF_IPTABLES=m 183CONFIG_IP_NF_IPTABLES=m
178CONFIG_IP_NF_ARPTABLES=m 184CONFIG_IP_NF_ARPTABLES=m
@@ -262,6 +268,7 @@ CONFIG_CLS_U32_MARK=y
262CONFIG_NET_CLS_RSVP=m 268CONFIG_NET_CLS_RSVP=m
263CONFIG_NET_CLS_RSVP6=m 269CONFIG_NET_CLS_RSVP6=m
264CONFIG_NET_CLS_FLOW=m 270CONFIG_NET_CLS_FLOW=m
271CONFIG_NET_CLS_FLOWER=m
265CONFIG_NET_EMATCH=y 272CONFIG_NET_EMATCH=y
266CONFIG_NET_EMATCH_STACK=32 273CONFIG_NET_EMATCH_STACK=32
267CONFIG_NET_EMATCH_CMP=m 274CONFIG_NET_EMATCH_CMP=m
@@ -284,12 +291,13 @@ CONFIG_NET_SCH_FIFO=y
284CONFIG_IP_SCTP=m 291CONFIG_IP_SCTP=m
285CONFIG_VLAN_8021Q=m 292CONFIG_VLAN_8021Q=m
286CONFIG_IP_MULTICAST=y 293CONFIG_IP_MULTICAST=y
294CONFIG_NET_SWITCHDEV=y
287 295
288# Ethernet drivers 296# Ethernet drivers
289CONFIG_TI_K3_UDMA_DESC_POOL=y 297CONFIG_TI_K3_UDMA_DESC_POOL=y
290CONFIG_TI_AM65_CPSW_NUSS=y 298CONFIG_TI_K3_AM65_CPSW_NUSS=y
291CONFIG_TI_AM65_CPSW_TAS=y 299CONFIG_TI_AM65_CPSW_TAS=y
292CONFIG_TI_AM65_CPTS=y 300CONFIG_TI_K3_AM65_CPTS=y
293#MMC/SD support 301#MMC/SD support
294CONFIG_MMC=y 302CONFIG_MMC=y
295CONFIG_MMC_SDHCI=y 303CONFIG_MMC_SDHCI=y
@@ -473,3 +481,6 @@ CONFIG_SCSI_UFS_BSG=y
473CONFIG_SCSI_UFSHCD_PLATFORM=y 481CONFIG_SCSI_UFSHCD_PLATFORM=y
474CONFIG_SCSI_UFS_CDNS_PLATFORM=y 482CONFIG_SCSI_UFS_CDNS_PLATFORM=y
475CONFIG_SCSI_UFS_TI_J721E=y 483CONFIG_SCSI_UFS_TI_J721E=y
484
485# MUX Drivers
486CONFIG_MUX_GPIO=y