kernel: netdevices: fold mv88e6xxx into one package

This was the first DSA packaged, and the tagger was made into
a separate package. This is too complicated: the mv88e6xxx
is the only module using this tagger after all, fold the module
for the DSA hardware and the driver for the tagger into a
single package and let modprobe do its job of probing the
tagger for the driver.

Tested on the BMIPS Inteno XG6846.

Link: https://patchwork.ozlabs.org/project/openwrt/patch/20250110-mv88e6xxx-single-package-v1-1-223ad7fb312e@linaro.org/
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk
index dc256237e971dc8085baf96ae5578782f9d389ab..2a6ecb7a2bd4b08083aee06f2a40b1c4e13894f5 100644 (file)
--- a/package/kernel/linux/modules/netdevices.mk
+++ b/package/kernel/linux/modules/netdevices.mk
@@ -593,31 +593,20 @@ endef
 
 $(eval $(call KernelPackage,dsa-mv88e6060))
 
-define KernelPackage/dsa-tag-dsa
-  SUBMENU:=$(NETWORK_DEVICES_MENU)
-  TITLE:=Marvell DSA type DSA and EDSA taggers
-  DEPENDS:=+kmod-dsa
-  KCONFIG:= CONFIG_NET_DSA_TAG_DSA_COMMON \
-       CONFIG_NET_DSA_TAG_DSA \
-       CONFIG_NET_DSA_TAG_EDSA
-  FILES:=$(LINUX_DIR)/net/dsa/tag_dsa.ko
-  AUTOLOAD:=$(call AutoLoad,40,tag_dsa,1)
-endef
-
-define KernelPackage/dsa-tag-dsa/description
-  Kernel modules for Marvell DSA and EDSA tagging
-endef
-
-$(eval $(call KernelPackage,dsa-tag-dsa))
-
 define KernelPackage/dsa-mv88e6xxx
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Marvell MV88E6XXX DSA Switch
-  DEPENDS:=+kmod-dsa +kmod-ptp +kmod-phy-marvell +kmod-dsa-tag-dsa
-  KCONFIG:=CONFIG_NET_DSA_MV88E6XXX \
+  DEPENDS:=+kmod-dsa +kmod-ptp +kmod-phy-marvell
+  KCONFIG:= \
+       CONFIG_NET_DSA_TAG_DSA_COMMON \
+       CONFIG_NET_DSA_TAG_DSA \
+       CONFIG_NET_DSA_TAG_EDSA \
+       CONFIG_NET_DSA_MV88E6XXX \
        CONFIG_NET_DSA_MV88E6XXX_LEDS=y \
        CONFIG_NET_DSA_MV88E6XXX_PTP=y
-  FILES:=$(LINUX_DIR)/drivers/net/dsa/mv88e6xxx/mv88e6xxx.ko
+  FILES:= \
+       $(LINUX_DIR)/net/dsa/tag_dsa.ko \
+       $(LINUX_DIR)/drivers/net/dsa/mv88e6xxx/mv88e6xxx.ko
   AUTOLOAD:=$(call AutoLoad,41,mv88e6xxx,1)
 endef