mixin updates

Add support for stmmac controller Changes added to config and load stmmac controller for celadon_ivi target. Add stmmac flag to load stmicro driver for ivi Enables config to load stmac and related driver for celadon ivi. Change-Id: I687c67d7e20848f928c44bb7e7efc7ff9d48e75e Tracked-On: OAM-110351 Mixin-Reviewed-On: projectceladon/device-androidia-mixins#1733 Mixin-Reviewed-On: #1733 Signed-off-by: Bharat B Panda <[email protected]>
projectceladon · Sep 4, 2023 · 6dbbe53 · 6dbbe53
1 parent 0b2f148
commit 6dbbe53
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 16 deletions.
diff --git a/caas/config-lts/linux-intel-lts2021/x86_64_defconfig b/caas/config-lts/linux-intel-lts2021/x86_64_defconfig
@@ -2303,7 +2303,11 @@ CONFIG_E1000E_HWTS=y
 CONFIG_IGC=y
 # CONFIG_JME is not set
 CONFIG_NET_VENDOR_LITEX=y
-# CONFIG_NET_VENDOR_MARVELL is not set
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
 # CONFIG_NET_VENDOR_MELLANOX is not set
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MICROCHIP is not set
@@ -2351,12 +2355,12 @@ CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_NET_VENDOR_SOCIONEXT=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_SELFTESTS is not set
+CONFIG_STMMAC_SELFTESTS=y
 CONFIG_STMMAC_PLATFORM=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_INTEL=m
 # CONFIG_DWMAC_LOONGSON is not set
-# CONFIG_STMMAC_PCI is not set
+CONFIG_STMMAC_PCI=m
 # CONFIG_NET_VENDOR_SUN is not set
 CONFIG_NET_VENDOR_SYNOPSYS=y
 # CONFIG_DWC_XLGMAC is not set
@@ -2397,9 +2401,10 @@ CONFIG_AX88796B_PHY=y
 # CONFIG_LXT_PHY is not set
 # CONFIG_INTEL_XWAY_PHY is not set
 # CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_MARVELL_PHY is not set
+CONFIG_MARVELL_PHY=m
 # CONFIG_MARVELL_10G_PHY is not set
 # CONFIG_MARVELL_88X2222_PHY is not set
+CONFIG_MARVELL_88Q2XXX_PHY=m
 # CONFIG_MAXLINEAR_GPHY is not set
 # CONFIG_MEDIATEK_GE_PHY is not set
 # CONFIG_MICREL_PHY is not set

diff --git a/caas/init.rc b/caas/init.rc
@@ -602,6 +602,7 @@ on boot
     write /proc/sys/net/core/rmem_max 6291456
     write /proc/sys/net/core/wmem_max 4194304
 
+on early-boot
 ##############################################################
 # Source: device/intel/mixins/groups/debug-crashlogd/true/init.rc
 ##############################################################

diff --git a/caas_cfc/config-lts/linux-intel-lts2021/x86_64_defconfig b/caas_cfc/config-lts/linux-intel-lts2021/x86_64_defconfig
@@ -2303,7 +2303,11 @@ CONFIG_E1000E_HWTS=y
 CONFIG_IGC=y
 # CONFIG_JME is not set
 CONFIG_NET_VENDOR_LITEX=y
-# CONFIG_NET_VENDOR_MARVELL is not set
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
 # CONFIG_NET_VENDOR_MELLANOX is not set
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MICROCHIP is not set
@@ -2351,12 +2355,12 @@ CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_NET_VENDOR_SOCIONEXT=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_SELFTESTS is not set
+CONFIG_STMMAC_SELFTESTS=y
 CONFIG_STMMAC_PLATFORM=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_INTEL=m
 # CONFIG_DWMAC_LOONGSON is not set
-# CONFIG_STMMAC_PCI is not set
+CONFIG_STMMAC_PCI=m
 # CONFIG_NET_VENDOR_SUN is not set
 CONFIG_NET_VENDOR_SYNOPSYS=y
 # CONFIG_DWC_XLGMAC is not set
@@ -2397,9 +2401,10 @@ CONFIG_AX88796B_PHY=y
 # CONFIG_LXT_PHY is not set
 # CONFIG_INTEL_XWAY_PHY is not set
 # CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_MARVELL_PHY is not set
+CONFIG_MARVELL_PHY=m
 # CONFIG_MARVELL_10G_PHY is not set
 # CONFIG_MARVELL_88X2222_PHY is not set
+CONFIG_MARVELL_88Q2XXX_PHY=m
 # CONFIG_MAXLINEAR_GPHY is not set
 # CONFIG_MEDIATEK_GE_PHY is not set
 # CONFIG_MICREL_PHY is not set

diff --git a/caas_cfc/init.rc b/caas_cfc/init.rc
@@ -588,6 +588,7 @@ on boot
     write /proc/sys/net/core/rmem_max 6291456
     write /proc/sys/net/core/wmem_max 4194304
 
+on early-boot
 ##############################################################
 # Source: device/intel/mixins/groups/debug-crashlogd/true/init.rc
 ##############################################################

diff --git a/celadon_ivi/config-lts/linux-intel-lts2021/x86_64_defconfig b/celadon_ivi/config-lts/linux-intel-lts2021/x86_64_defconfig
@@ -2303,7 +2303,11 @@ CONFIG_E1000E_HWTS=y
 CONFIG_IGC=y
 # CONFIG_JME is not set
 CONFIG_NET_VENDOR_LITEX=y
-# CONFIG_NET_VENDOR_MARVELL is not set
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
 # CONFIG_NET_VENDOR_MELLANOX is not set
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MICROCHIP is not set
@@ -2351,12 +2355,12 @@ CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_NET_VENDOR_SOCIONEXT=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_SELFTESTS is not set
+CONFIG_STMMAC_SELFTESTS=y
 CONFIG_STMMAC_PLATFORM=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_INTEL=m
 # CONFIG_DWMAC_LOONGSON is not set
-# CONFIG_STMMAC_PCI is not set
+CONFIG_STMMAC_PCI=m
 # CONFIG_NET_VENDOR_SUN is not set
 CONFIG_NET_VENDOR_SYNOPSYS=y
 # CONFIG_DWC_XLGMAC is not set
@@ -2397,9 +2401,10 @@ CONFIG_AX88796B_PHY=y
 # CONFIG_LXT_PHY is not set
 # CONFIG_INTEL_XWAY_PHY is not set
 # CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_MARVELL_PHY is not set
+CONFIG_MARVELL_PHY=m
 # CONFIG_MARVELL_10G_PHY is not set
 # CONFIG_MARVELL_88X2222_PHY is not set
+CONFIG_MARVELL_88Q2XXX_PHY=m
 # CONFIG_MAXLINEAR_GPHY is not set
 # CONFIG_MEDIATEK_GE_PHY is not set
 # CONFIG_MICREL_PHY is not set

diff --git a/celadon_ivi/init.rc b/celadon_ivi/init.rc
@@ -566,6 +566,13 @@ on boot
     write /proc/sys/net/core/rmem_max 6291456
     write /proc/sys/net/core/wmem_max 4194304
 
+on early-boot
+    insmod /vendor/lib/modules/phylink.ko
+    insmod /vendor/lib/modules/pcs_xpcs.ko
+    insmod /vendor/lib/modules/stmmac.ko
+    insmod /vendor/lib/modules/dwmac-intel.ko
+    insmod /vendor/lib/modules/marvell-88q2xxx.ko
+    insmod /vendor/lib/modules/marvell.ko
 ##############################################################
 # Source: device/intel/mixins/groups/debug-crashlogd/true/init.rc
 ##############################################################

diff --git a/celadon_tablet/config-lts/linux-intel-lts2021/x86_64_defconfig b/celadon_tablet/config-lts/linux-intel-lts2021/x86_64_defconfig
@@ -2303,7 +2303,11 @@ CONFIG_E1000E_HWTS=y
 CONFIG_IGC=y
 # CONFIG_JME is not set
 CONFIG_NET_VENDOR_LITEX=y
-# CONFIG_NET_VENDOR_MARVELL is not set
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
 # CONFIG_NET_VENDOR_MELLANOX is not set
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MICROCHIP is not set
@@ -2351,12 +2355,12 @@ CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_NET_VENDOR_SOCIONEXT=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_SELFTESTS is not set
+CONFIG_STMMAC_SELFTESTS=y
 CONFIG_STMMAC_PLATFORM=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_INTEL=m
 # CONFIG_DWMAC_LOONGSON is not set
-# CONFIG_STMMAC_PCI is not set
+CONFIG_STMMAC_PCI=m
 # CONFIG_NET_VENDOR_SUN is not set
 CONFIG_NET_VENDOR_SYNOPSYS=y
 # CONFIG_DWC_XLGMAC is not set
@@ -2397,9 +2401,10 @@ CONFIG_AX88796B_PHY=y
 # CONFIG_LXT_PHY is not set
 # CONFIG_INTEL_XWAY_PHY is not set
 # CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_MARVELL_PHY is not set
+CONFIG_MARVELL_PHY=m
 # CONFIG_MARVELL_10G_PHY is not set
 # CONFIG_MARVELL_88X2222_PHY is not set
+CONFIG_MARVELL_88Q2XXX_PHY=m
 # CONFIG_MAXLINEAR_GPHY is not set
 # CONFIG_MEDIATEK_GE_PHY is not set
 # CONFIG_MICREL_PHY is not set

diff --git a/celadon_tablet/init.rc b/celadon_tablet/init.rc
@@ -609,6 +609,7 @@ on boot
     write /proc/sys/net/core/rmem_max 6291456
     write /proc/sys/net/core/wmem_max 4194304
 
+on early-boot
 ##############################################################
 # Source: device/intel/mixins/groups/debug-crashlogd/true/init.rc
 ##############################################################