From b09e060e2c12535fb71f18bf0b47a0fc3e267896 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Wed, 13 Dec 2023 17:00:17 +0100 Subject: [PATCH] package: kernel: move pcs-xpcs from armsr to generic Move pcs-xpcs kmod from armsr modules.mk to generic modules package. Also add additional dependency to x86_64 as stmmac-core it's now used by x86_64 target and depends on this package. Fixes: 4b4c940fbc8f ("x86: Add kmod-dwmac-intel") Signed-off-by: Christian Marangi --- package/kernel/linux/modules/netdevices.mk | 12 ++++++++++++ target/linux/armsr/modules.mk | 11 ----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index d357b233f2a0..ab6bead9c2df 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -1543,6 +1543,18 @@ endef $(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 + KCONFIG:=CONFIG_PCS_XPCS + FILES:=$(LINUX_DIR)/drivers/net/pcs/pcs_xpcs.ko + AUTOLOAD:=$(call AutoLoad,20,pcs_xpcs) +endef + +$(eval $(call KernelPackage,pcs-xpcs)) + + define KernelPackage/stmmac-core SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Synopsis Ethernet Controller core (NXP,STMMicro,others) diff --git a/target/linux/armsr/modules.mk b/target/linux/armsr/modules.mk index 521a52fec15b..7612b258c393 100644 --- a/target/linux/armsr/modules.mk +++ b/target/linux/armsr/modules.mk @@ -47,17 +47,6 @@ endef $(eval $(call KernelPackage,fsl-pcs-lynx)) -define KernelPackage/pcs-xpcs - SUBMENU:=$(NETWORK_DEVICES_MENU) - TITLE:=Synopsis DesignWare PCS driver - DEPENDS:=@(TARGET_armsr_armv8) +kmod-phylink - KCONFIG:=CONFIG_PCS_XPCS - FILES:=$(LINUX_DIR)/drivers/net/pcs/pcs_xpcs.ko - AUTOLOAD:=$(call AutoLoad,20,pcs_xpcs) -endef - -$(eval $(call KernelPackage,pcs-xpcs)) - define KernelPackage/fsl-fec SUBMENU:=$(NETWORK_DEVICES_MENU) DEPENDS:=@(TARGET_armsr_armv8) +kmod-libphy +kmod-of-mdio \ -- 2.30.2