From f1812d5901e5450034fba24e7c8234841799c747 Mon Sep 17 00:00:00 2001 From: Til Kaiser Date: Sat, 3 Aug 2024 10:48:34 +0200 Subject: [PATCH] kernel: netdevices: adjust mlxsw network drivers * Adds the x86_64 dependency for mlxsw_core * Removes the redundant mlxsw_core dependency from mlxsw-minimal and mlxsw-spectrum * Removes the DCB configuration symbols because they were moved into the generic configuration Signed-off-by: Til Kaiser Link: https://github.com/openwrt/openwrt/pull/15362 Signed-off-by: Hauke Mehrtens --- package/kernel/linux/modules/netdevices.mk | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index c1188351dc..312f310485 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -1441,7 +1441,7 @@ $(eval $(call KernelPackage,mlxfw)) define KernelPackage/mlxsw-core SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Mellanox Technologies Switch ASICs support - DEPENDS:=+kmod-mlxfw +kmod-hwmon-core + DEPENDS:=@TARGET_x86_64 +kmod-mlxfw +kmod-hwmon-core FILES:=$(LINUX_DIR)/drivers/net/ethernet/mellanox/mlxsw/mlxsw_core.ko KCONFIG:= \ CONFIG_MLXSW_CORE \ @@ -1476,7 +1476,7 @@ $(eval $(call KernelPackage,mlxsw-i2c)) define KernelPackage/mlxsw-minimal SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Mellanox Technologies minimal I2C support - DEPENDS:=+kmod-mlxsw-core +kmod-mlxsw-i2c + DEPENDS:=+kmod-mlxsw-i2c FILES:=$(LINUX_DIR)/drivers/net/ethernet/mellanox/mlxsw/mlxsw_minimal.ko KCONFIG:=CONFIG_MLXSW_MINIMAL AUTOLOAD:=$(call AutoProbe,mlxsw_minimal) @@ -1510,20 +1510,14 @@ define KernelPackage/mlxsw-spectrum SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Mellanox Technologies Spectrum family support DEPENDS:= \ - +kmod-mlxsw-core +kmod-mlxsw-pci +kmod-lib-objagg +kmod-lib-parman \ + +kmod-mlxsw-pci +kmod-lib-objagg +kmod-lib-parman \ +kmod-ip6-tunnel +kmod-ptp +kmod-sched-act-sample +kmod-vxlan FILES:=$(LINUX_DIR)/drivers/net/ethernet/mellanox/mlxsw/mlxsw_spectrum.ko KCONFIG:= \ CONFIG_MLXSW_SPECTRUM \ - CONFIG_NET_SWITCHDEV=y \ CONFIG_MLXSW_SPECTRUM_DCB=y \ - CONFIG_DCB=y \ - CONFIG_AMD_XGBE_DCB=n \ - CONFIG_IXGBE_DCB=n \ - CONFIG_I40E_DCB=n \ - CONFIG_QLCNIC_DCB=n \ - CONFIG_FSL_DPAA2_ETH_DCB=n \ - CONFIG_FSL_DPAA2_SWITCH=n + CONFIG_NET_SWITCHDEV=y \ + CONFIG_DCB=y AUTOLOAD:=$(call AutoProbe,mlxsw_spectrum) endef -- 2.30.2