apm821xx: move PHY/DSA drivers to DEVICE_PACKAGES on nand boards

Only the devices that actually have these PHYs and DSA switches
should carry the kernel modules, instead of baking them into the
kernel for all nand boards.

These devices have no space constraints, so any size increase is
meaningless.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/23985
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>

diff --git a/target/linux/apm821xx/image/nand.mk b/target/linux/apm821xx/image/nand.mk
index a5506c7a16e43bd01e34ec1520c00da4e4b1d1a2..d23ee815e16fa5a13b7e835f288f943b2b64bfff 100644 (file)
--- a/target/linux/apm821xx/image/nand.mk
+++ b/target/linux/apm821xx/image/nand.mk
@@ -23,7 +23,7 @@ endef
 define Device/meraki_mr24
   DEVICE_VENDOR := Cisco Meraki
   DEVICE_MODEL := MR24
-  DEVICE_PACKAGES := kmod-spi-gpio -swconfig
+  DEVICE_PACKAGES := kmod-spi-gpio kmod-phy-at803x -swconfig
   BOARD_NAME := mr24
   IMAGES := sysupgrade.bin
   DEVICE_DTC_FLAGS := --space 64512
@@ -42,7 +42,7 @@ define Device/meraki_mx60
   DEVICE_ALT0_VENDOR := Cisco Meraki
   DEVICE_ALT0_MODEL := MX60W
   DEVICE_PACKAGES := kmod-spi-gpio kmod-usb-ledtrig-usbport kmod-usb-dwc2 \
-                    kmod-usb-storage block-mount
+                    kmod-usb-storage block-mount kmod-dsa-qca8k kmod-phy-qca83xx
   BLOCKSIZE := 128k
   IMAGES := sysupgrade.bin
   DEVICE_DTC_FLAGS := --space 20480
@@ -97,7 +97,7 @@ define Device/netgear_wndr4700
        kmod-dm kmod-fs-ext4 kmod-fs-vfat kmod-usb-ledtrig-usbport \
        kmod-md-mod kmod-nls-cp437 kmod-nls-iso8859-1 kmod-nls-iso8859-15 \
        kmod-nls-utf8 kmod-usb-xhci-pci-renesas kmod-usb-dwc2 kmod-usb-storage \
-       partx-utils kmod-ata-dwc
+       partx-utils kmod-ata-dwc kmod-dsa-qca8k kmod-phy-qca83xx
   BOARD_NAME := wndr4700
   PAGESIZE := 2048
   SUBPAGESIZE := 512

diff --git a/target/linux/apm821xx/nand/config-default b/target/linux/apm821xx/nand/config-default
index ac91a8288213517e21526710ab18fb15ed70c83e..64897aaddf1fd87844224be1803bf6d68b6d59b2 100644 (file)
--- a/target/linux/apm821xx/nand/config-default
+++ b/target/linux/apm821xx/nand/config-default
@@ -1,8 +1,6 @@
-CONFIG_AT803X_PHY=y
 CONFIG_BCH=y
 CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_ZSTD=y
-CONFIG_GRO_CELLS=y
 CONFIG_HWMON=y
 CONFIG_MTD_NAND_CORE=y
 CONFIG_MTD_NAND_ECC=y
@@ -16,16 +14,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 CONFIG_MTD_UBI_BLOCK=y
 CONFIG_MTD_UBI_NVMEM=y
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_NET_DEVLINK=y
-CONFIG_NET_DSA=y
-CONFIG_NET_DSA_QCA8K=y
-CONFIG_NET_DSA_QCA8K_LEDS_SUPPORT=y
-CONFIG_NET_DSA_TAG_QCA=y
 # CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
-CONFIG_PHYLINK=y
-CONFIG_QCA83XX_PHY=y
-CONFIG_QCOM_NET_PHYLIB=y
-CONFIG_REGMAP=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_M48T86=y
 CONFIG_RTC_I2C_AND_SPI=y