diff options
author | Nishanth Menon | 2021-03-03 13:37:58 -0600 |
---|---|---|
committer | Nishanth Menon | 2021-03-03 13:37:58 -0600 |
commit | c60eb6b797369ee343de49e074c971ac5f311527 (patch) | |
tree | 8da26a1a56dd2a9fc996b5ef049af90ae7deddac | |
parent | 4d10a58c6f4af22c42bfb5b4634d8f271cd46d3b (diff) | |
parent | c83d4aab0394809b3b70540cb9bc9001178adf18 (diff) | |
download | ti-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.cfg | 15 |
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 | |||
38 | CONFIG_TI_RDEV_ETH_SWITCH_VIRT_EMAC=m | 38 | CONFIG_TI_RDEV_ETH_SWITCH_VIRT_EMAC=m |
39 | CONFIG_TI_PRUETH=m | 39 | CONFIG_TI_PRUETH=m |
40 | CONFIG_TI_ICSSG_PRUETH=m | 40 | CONFIG_TI_ICSSG_PRUETH=m |
41 | CONFIG_TI_K3_AM65_CPSW_SWITCHDEV=y | ||
41 | # non-TI Net vendors | 42 | # non-TI Net vendors |
42 | CONFIG_NET_DSA_BCM_SF2=n | 43 | CONFIG_NET_DSA_BCM_SF2=n |
43 | CONFIG_B53=n | 44 | CONFIG_B53=n |
@@ -106,6 +107,10 @@ CONFIG_ICPLUS_PHY=n | |||
106 | CONFIG_DP83848_PHY=y | 107 | CONFIG_DP83848_PHY=y |
107 | # Enable phy for DRA72 evm | 108 | # Enable phy for DRA72 evm |
108 | CONFIG_DP83867_PHY=y | 109 | CONFIG_DP83867_PHY=y |
110 | # Enable phy for AM64 evm | ||
111 | CONFIG_DP83869_PHY=y | ||
112 | # Control onboard MDIO muxes | ||
113 | CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y | ||
109 | 114 | ||
110 | #MTD | 115 | #MTD |
111 | CONFIG_MTD=y | 116 | CONFIG_MTD=y |
@@ -173,6 +178,7 @@ CONFIG_PHY_J721E_WIZ=y | |||
173 | CONFIG_PHY_CADENCE_SIERRA=y | 178 | CONFIG_PHY_CADENCE_SIERRA=y |
174 | 179 | ||
175 | # Networking | 180 | # Networking |
181 | CONFIG_HSR=m | ||
176 | CONFIG_NF_CONNTRACK=m | 182 | CONFIG_NF_CONNTRACK=m |
177 | CONFIG_IP_NF_IPTABLES=m | 183 | CONFIG_IP_NF_IPTABLES=m |
178 | CONFIG_IP_NF_ARPTABLES=m | 184 | CONFIG_IP_NF_ARPTABLES=m |
@@ -262,6 +268,7 @@ CONFIG_CLS_U32_MARK=y | |||
262 | CONFIG_NET_CLS_RSVP=m | 268 | CONFIG_NET_CLS_RSVP=m |
263 | CONFIG_NET_CLS_RSVP6=m | 269 | CONFIG_NET_CLS_RSVP6=m |
264 | CONFIG_NET_CLS_FLOW=m | 270 | CONFIG_NET_CLS_FLOW=m |
271 | CONFIG_NET_CLS_FLOWER=m | ||
265 | CONFIG_NET_EMATCH=y | 272 | CONFIG_NET_EMATCH=y |
266 | CONFIG_NET_EMATCH_STACK=32 | 273 | CONFIG_NET_EMATCH_STACK=32 |
267 | CONFIG_NET_EMATCH_CMP=m | 274 | CONFIG_NET_EMATCH_CMP=m |
@@ -284,12 +291,13 @@ CONFIG_NET_SCH_FIFO=y | |||
284 | CONFIG_IP_SCTP=m | 291 | CONFIG_IP_SCTP=m |
285 | CONFIG_VLAN_8021Q=m | 292 | CONFIG_VLAN_8021Q=m |
286 | CONFIG_IP_MULTICAST=y | 293 | CONFIG_IP_MULTICAST=y |
294 | CONFIG_NET_SWITCHDEV=y | ||
287 | 295 | ||
288 | # Ethernet drivers | 296 | # Ethernet drivers |
289 | CONFIG_TI_K3_UDMA_DESC_POOL=y | 297 | CONFIG_TI_K3_UDMA_DESC_POOL=y |
290 | CONFIG_TI_AM65_CPSW_NUSS=y | 298 | CONFIG_TI_K3_AM65_CPSW_NUSS=y |
291 | CONFIG_TI_AM65_CPSW_TAS=y | 299 | CONFIG_TI_AM65_CPSW_TAS=y |
292 | CONFIG_TI_AM65_CPTS=y | 300 | CONFIG_TI_K3_AM65_CPTS=y |
293 | #MMC/SD support | 301 | #MMC/SD support |
294 | CONFIG_MMC=y | 302 | CONFIG_MMC=y |
295 | CONFIG_MMC_SDHCI=y | 303 | CONFIG_MMC_SDHCI=y |
@@ -473,3 +481,6 @@ CONFIG_SCSI_UFS_BSG=y | |||
473 | CONFIG_SCSI_UFSHCD_PLATFORM=y | 481 | CONFIG_SCSI_UFSHCD_PLATFORM=y |
474 | CONFIG_SCSI_UFS_CDNS_PLATFORM=y | 482 | CONFIG_SCSI_UFS_CDNS_PLATFORM=y |
475 | CONFIG_SCSI_UFS_TI_J721E=y | 483 | CONFIG_SCSI_UFS_TI_J721E=y |
484 | |||
485 | # MUX Drivers | ||
486 | CONFIG_MUX_GPIO=y | ||