From 8fc954aeb76fe5991204646f7bee0ac521453159 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Wed, 13 Dec 2023 17:03:13 +0100 Subject: [PATCH] package: kernel: detach of-mdio dependency from stmmac-core Detach of-mdio dependency from stmmac-core kmod to fix support for x86_64 target. This target doesn't use OpenFirmware infrastructure and stmmac-core for the dwmac-intel driver doesn't depends on it. Add kmod-of-mdio to any other user of stmmac-core as it's not inherit from stmmac-core anymore. Fixes: #14209 Fixes: 4b4c940fbc8f ("x86: Add kmod-dwmac-intel") Signed-off-by: Christian Marangi --- package/kernel/linux/modules/netdevices.mk | 3 +-- target/linux/armsr/modules.mk | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index ab6bead9c2..46dcdfdef7 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -1558,8 +1558,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 \ - +kmod-of-mdio + DEPENDS:=@TARGET_x86_64||TARGET_armsr_armv8 +kmod-pcs-xpcs +kmod-ptp KCONFIG:=CONFIG_STMMAC_ETH \ CONFIG_STMMAC_SELFTESTS=n \ CONFIG_STMMAC_PLATFORM \ diff --git a/target/linux/armsr/modules.mk b/target/linux/armsr/modules.mk index 7612b258c3..7dd3739ffa 100644 --- a/target/linux/armsr/modules.mk +++ b/target/linux/armsr/modules.mk @@ -208,7 +208,7 @@ $(eval $(call KernelPackage,imx7-ulp-wdt)) define KernelPackage/dwmac-imx SUBMENU=$(NETWORK_DEVICES_MENU) TITLE:=NXP i.MX8 Ethernet controller - DEPENDS:=+kmod-stmmac-core + DEPENDS:=+kmod-stmmac-core +kmod-of-mdio KCONFIG:=CONFIG_DWMAC_IMX8 FILES=$(LINUX_DIR)/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.ko AUTOLOAD=$(call AutoLoad,45,dwmac-imx) @@ -219,7 +219,7 @@ $(eval $(call KernelPackage,dwmac-imx)) define KernelPackage/dwmac-sun8i SUBMENU=$(NETWORK_DEVICES_MENU) TITLE:=Allwinner H3/A83T/A64 (sun8i) Ethernet - DEPENDS:=+kmod-stmmac-core +kmod-mdio-bus-mux + DEPENDS:=+kmod-stmmac-core +kmod-of-mdio +kmod-mdio-bus-mux KCONFIG:=CONFIG_DWMAC_SUN8I FILES=$(LINUX_DIR)/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.ko AUTOLOAD=$(call AutoLoad,45,dwmac-sun8i) @@ -230,7 +230,7 @@ $(eval $(call KernelPackage,dwmac-sun8i)) define KernelPackage/dwmac-rockchip SUBMENU=$(NETWORK_DEVICES_MENU) TITLE:=Rockchip RK3328/RK3399/RK3568 Ethernet - DEPENDS:=+kmod-stmmac-core +kmod-mdio-bus-mux + DEPENDS:=+kmod-stmmac-core +kmod-of-mdio +kmod-mdio-bus-mux KCONFIG:=CONFIG_DWMAC_ROCKCHIP FILES=$(LINUX_DIR)/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.ko AUTOLOAD=$(call AutoLoad,45,dwmac-rk) -- 2.30.2