From 0357372896b784b6eb4010b479a9714413ec44e0 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Sun, 27 Oct 2024 10:02:55 +0100 Subject: [PATCH] armsr: don't limit kmods to armsr armv8 subtarget Drop limitation on depending on only armv8 for armsr target as those module should support both 32 and 64 bits systems. Only thunderx-net actually require 64 bit systems. Signed-off-by: Christian Marangi --- package/kernel/linux/modules/netdevices.mk | 6 ++-- target/linux/armsr/image/Makefile | 4 +-- target/linux/armsr/modules.mk | 34 +++++++++++----------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index eb0d55e252..cd24fb3ecb 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -1765,7 +1765,7 @@ $(eval $(call KernelPackage,sfp)) define KernelPackage/pcs-xpcs SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Synopsis DesignWare PCS driver - DEPENDS:=@(TARGET_x86_64||TARGET_armsr_armv8) +kmod-phylink + DEPENDS:=@(TARGET_x86_64||TARGET_armsr) +kmod-phylink KCONFIG:=CONFIG_PCS_XPCS FILES:=$(LINUX_DIR)/drivers/net/pcs/pcs_xpcs.ko AUTOLOAD:=$(call AutoLoad,20,pcs_xpcs) @@ -1777,7 +1777,7 @@ $(eval $(call KernelPackage,pcs-xpcs)) define KernelPackage/stmmac-core SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Synopsis Ethernet Controller core (NXP,STMMicro,others) - DEPENDS:=@TARGET_x86_64||TARGET_armsr_armv8 +kmod-pcs-xpcs +kmod-ptp + DEPENDS:=@TARGET_x86_64||TARGET_armsr +kmod-pcs-xpcs +kmod-ptp KCONFIG:=CONFIG_STMMAC_ETH \ CONFIG_STMMAC_SELFTESTS=n \ CONFIG_STMMAC_PLATFORM \ @@ -1961,7 +1961,7 @@ $(eval $(call KernelPackage,lan743x)) define KernelPackage/amazon-ena SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Elastic Network Adapter (for Amazon AWS) - DEPENDS:=@TARGET_x86_64||TARGET_armsr_armv8 + DEPENDS:=@TARGET_x86_64||TARGET_armsr KCONFIG:=CONFIG_ENA_ETHERNET FILES:=$(LINUX_DIR)/drivers/net/ethernet/amazon/ena/ena.ko AUTOLOAD:=$(call AutoLoad,12,ena) diff --git a/target/linux/armsr/image/Makefile b/target/linux/armsr/image/Makefile index 66f027c732..09c37beeec 100644 --- a/target/linux/armsr/image/Makefile +++ b/target/linux/armsr/image/Makefile @@ -106,11 +106,11 @@ define Device/generic DEVICE_PACKAGES += kmod-amazon-ena kmod-e1000e kmod-vmxnet3 kmod-rtc-rx8025 \ kmod-i2c-mux-pca954x kmod-gpio-pca953x partx-utils kmod-wdt-sp805 \ kmod-mvneta kmod-mvpp2 kmod-fsl-dpaa1-net kmod-fsl-dpaa2-net \ - kmod-fsl-enetc-net kmod-dwmac-imx kmod-fsl-fec kmod-thunderx-net \ + kmod-fsl-enetc-net kmod-dwmac-imx kmod-fsl-fec \ kmod-dwmac-rockchip kmod-dwmac-sun8i kmod-phy-aquantia kmod-phy-broadcom \ kmod-phy-marvell kmod-phy-marvell-10g kmod-sfp kmod-atlantic \ kmod-bcmgenet kmod-octeontx2-net kmod-renesas-net-avb \ - kmod-phy-realtek kmod-phy-smsc + kmod-phy-realtek kmod-phy-smsc $(if $(CONFIG_aarch64),kmod-thunderx-net) endef TARGET_DEVICES += generic diff --git a/target/linux/armsr/modules.mk b/target/linux/armsr/modules.mk index 15acfd9e48..692fb9fa68 100644 --- a/target/linux/armsr/modules.mk +++ b/target/linux/armsr/modules.mk @@ -1,7 +1,7 @@ define KernelPackage/acpi-mdio SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=ACPI MDIO support - DEPENDS:=@(TARGET_armsr_armv8) +kmod-libphy +kmod-mdio-devres + DEPENDS:=@TARGET_armsr +kmod-libphy +kmod-mdio-devres KCONFIG:=CONFIG_ACPI_MDIO FILES:=$(LINUX_DIR)/drivers/net/mdio/acpi_mdio.ko AUTOLOAD:=$(call AutoLoad,11,acpi_mdio) @@ -15,7 +15,7 @@ $(eval $(call KernelPackage,acpi-mdio)) define KernelPackage/bcmgenet SUBMENU=$(NETWORK_DEVICES_MENU) - DEPENDS:=@(TARGET_armsr_armv8) +kmod-mdio-bcm-unimac + DEPENDS:=@TARGET_armsr +kmod-mdio-bcm-unimac TITLE:=Broadcom GENET internal MAC (Raspberry Pi 4) KCONFIG:=CONFIG_BCMGENET FILES=$(LINUX_DIR)/drivers/net/ethernet/broadcom/genet/genet.ko @@ -26,7 +26,7 @@ $(eval $(call KernelPackage,bcmgenet)) define KernelPackage/mdio-bcm-unimac SUBMENU=$(NETWORK_DEVICES_MENU) - DEPENDS:=@(TARGET_armsr_armv8) +kmod-of-mdio + DEPENDS:=@TARGET_armsr +kmod-of-mdio TITLE:=Broadcom UniMAC MDIO bus controller KCONFIG:=CONFIG_MDIO_BCM_UNIMAC FILES=$(LINUX_DIR)/drivers/net/mdio/mdio-bcm-unimac.ko @@ -37,7 +37,7 @@ $(eval $(call KernelPackage,mdio-bcm-unimac)) define KernelPackage/fsl-pcs-lynx SUBMENU=$(NETWORK_DEVICES_MENU) - DEPENDS:=@(TARGET_armsr_armv8) +kmod-libphy +kmod-of-mdio +kmod-phylink + DEPENDS:=@TARGET_armsr +kmod-libphy +kmod-of-mdio +kmod-phylink TITLE:=NXP (Freescale) Lynx PCS HIDDEN:=1 KCONFIG:=CONFIG_PCS_LYNX @@ -49,7 +49,7 @@ $(eval $(call KernelPackage,fsl-pcs-lynx)) define KernelPackage/fsl-fec SUBMENU:=$(NETWORK_DEVICES_MENU) - DEPENDS:=@(TARGET_armsr_armv8) +kmod-libphy +kmod-of-mdio \ + DEPENDS:=@TARGET_armsr +kmod-libphy +kmod-of-mdio \ +kmod-ptp +kmod-net-selftests TITLE:=NXP (Freescale) FEC Ethernet controller (i.MX) KCONFIG:=CONFIG_FEC @@ -61,7 +61,7 @@ $(eval $(call KernelPackage,fsl-fec)) define KernelPackage/fsl-xgmac-mdio SUBMENU=$(NETWORK_DEVICES_MENU) - DEPENDS:=@(TARGET_armsr_armv8) +kmod-libphy +kmod-of-mdio +kmod-acpi-mdio + DEPENDS:=@TARGET_armsr +kmod-libphy +kmod-of-mdio +kmod-acpi-mdio TITLE:=NXP (Freescale) MDIO bus KCONFIG:=CONFIG_FSL_XGMAC_MDIO FILES=$(LINUX_DIR)/drivers/net/ethernet/freescale/xgmac_mdio.ko @@ -85,7 +85,7 @@ $(eval $(call KernelPackage,fsl-mc-dpio)) define KernelPackage/fsl-enetc-net SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=:NXP ENETC (LS1028A) Ethernet - DEPENDS:=@(TARGET_armsr_armv8) +kmod-phylink +kmod-fsl-pcs-lynx + DEPENDS:=@TARGET_armsr +kmod-phylink +kmod-fsl-pcs-lynx KCONFIG:= \ CONFIG_FSL_ENETC \ CONFIG_FSL_ENETC_VF \ @@ -104,7 +104,7 @@ $(eval $(call KernelPackage,fsl-enetc-net)) define KernelPackage/fsl-dpaa1-net SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=NXP DPAA1 (LS1043/LS1046) Ethernet - DEPENDS:=@(TARGET_armsr_armv8) +kmod-fsl-xgmac-mdio +kmod-libphy +kmod-crypto-crc32 + DEPENDS:=@TARGET_armsr +kmod-fsl-xgmac-mdio +kmod-libphy +kmod-crypto-crc32 KCONFIG:= \ CONFIG_FSL_DPAA=y \ CONFIG_FSL_DPAA_ETH \ @@ -124,7 +124,7 @@ $(eval $(call KernelPackage,fsl-dpaa1-net)) define KernelPackage/fsl-dpaa2-net SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=NXP DPAA2 Ethernet - DEPENDS:=@(TARGET_armsr_armv8) +kmod-fsl-xgmac-mdio +kmod-phylink \ + DEPENDS:=@TARGET_armsr +kmod-fsl-xgmac-mdio +kmod-phylink \ +kmod-fsl-pcs-lynx +kmod-fsl-mc-dpio KCONFIG:= \ CONFIG_FSL_MC_UAPI_SUPPORT=y \ @@ -139,7 +139,7 @@ $(eval $(call KernelPackage,fsl-dpaa2-net)) define KernelPackage/fsl-dpaa2-console SUBMENU:=$(OTHER_MENU) TITLE:=NXP DPAA2 Debug console - DEPENDS:=@(TARGET_armsr_armv8) + DEPENDS:=@TARGET_armsr KCONFIG:=CONFIG_DPAA2_CONSOLE FILES=$(LINUX_DIR)/drivers/soc/fsl/dpaa2-console.ko AUTOLOAD=$(call AutoLoad,40,dpaa2-console) @@ -155,7 +155,7 @@ $(eval $(call KernelPackage,fsl-dpaa2-console)) define KernelPackage/marvell-mdio SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Marvell Armada platform MDIO driver - DEPENDS:=@(TARGET_armsr_armv8) +kmod-libphy +kmod-of-mdio +kmod-acpi-mdio + DEPENDS:=@TARGET_armsr +kmod-libphy +kmod-of-mdio +kmod-acpi-mdio KCONFIG:=CONFIG_MVMDIO FILES=$(LINUX_DIR)/drivers/net/ethernet/marvell/mvmdio.ko AUTOLOAD=$(call AutoLoad,30,marvell-mdio) @@ -166,7 +166,7 @@ $(eval $(call KernelPackage,marvell-mdio)) define KernelPackage/mvneta SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Marvell Armada 370/38x/XP/37xx network driver - DEPENDS:=@(TARGET_armsr_armv8) +kmod-marvell-mdio +kmod-phylink + DEPENDS:=@TARGET_armsr +kmod-marvell-mdio +kmod-phylink KCONFIG:=CONFIG_MVNETA FILES:=$(LINUX_DIR)/drivers/net/ethernet/marvell/mvneta.ko AUTOLOAD=$(call AutoLoad,30,mvneta) @@ -177,7 +177,7 @@ $(eval $(call KernelPackage,mvneta)) define KernelPackage/mvpp2 SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Marvell Armada 375/7K/8K network driver - DEPENDS:=@(TARGET_armsr_armv8) +kmod-marvell-mdio +kmod-phylink + DEPENDS:=@TARGET_armsr +kmod-marvell-mdio +kmod-phylink KCONFIG:=CONFIG_MVPP2 \ CONFIG_MVPP2_PTP=n FILES=$(LINUX_DIR)/drivers/net/ethernet/marvell/mvpp2/mvpp2.ko @@ -242,7 +242,7 @@ $(eval $(call KernelPackage,dwmac-rockchip)) define KernelPackage/mdio-thunder SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Marvell (Cavium) Thunder MDIO controller - DEPENDS:=@(TARGET_armsr_armv8) +kmod-of-mdio + DEPENDS:=@TARGET_armsr +kmod-of-mdio KCONFIG:=CONFIG_MDIO_THUNDER FILES=$(LINUX_DIR)/drivers/net/mdio/mdio-cavium.ko \ $(LINUX_DIR)/drivers/net/mdio/mdio-thunder.ko @@ -254,7 +254,7 @@ $(eval $(call KernelPackage,mdio-thunder)) define KernelPackage/thunderx-net SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Marvell (Cavium) Thunder network drivers - DEPENDS:=@(TARGET_armsr_armv8) +kmod-phylink +kmod-mdio-thunder + DEPENDS:=@TARGET_armsr_armv8 +kmod-phylink +kmod-mdio-thunder KCONFIG:=CONFIG_NET_VENDOR_CAVIUM \ CONFIG_THUNDER_NIC_PF \ CONFIG_THUNDER_NIC_VF \ @@ -272,7 +272,7 @@ $(eval $(call KernelPackage,thunderx-net)) define KernelPackage/octeontx2-net SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Marvell (Cavium) ThunderX2 network drivers - DEPENDS:=@(TARGET_armsr_armv8) +kmod-phylink +kmod-of-mdio +kmod-macsec \ + DEPENDS:=@TARGET_armsr +kmod-phylink +kmod-of-mdio +kmod-macsec \ +kmod-ptp KCONFIG:=CONFIG_OCTEONTX2_MBOX \ CONFIG_OCTEONTX2_AF \ @@ -291,7 +291,7 @@ $(eval $(call KernelPackage,octeontx2-net)) define KernelPackage/renesas-net-avb SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Renesas network drivers - DEPENDS:=@(TARGET_armsr_armv8) +kmod-phylink +kmod-mii +kmod-ptp +kmod-libphy +kmod-mdio-gpio + DEPENDS:=@TARGET_armsr +kmod-phylink +kmod-mii +kmod-ptp +kmod-libphy +kmod-mdio-gpio KCONFIG:=CONFIG_RAVB FILES=$(LINUX_DIR)/drivers/net/ethernet/renesas/ravb.ko AUTOLOAD:=$(call AutoProbe,ravb)