microchipsw: lan969x: use network driver as a module

Due to PTP conflicts with CONFIG_ALL_KMODS which causes the end images
to end up with no switchdev driver included, lets switch to using the
switchdev and PHY drivers as modules instead.

Fixes: 88a404a2d177 ("microchipsw: add support for Microchip LAN969x switches")
Signed-off-by: Robert Marko <robert.marko@sartura.hr>

diff --git a/target/linux/microchipsw/lan969x/config-default b/target/linux/microchipsw/lan969x/config-default
index 620c2e61ceb41ce2c75805a926ee35ad9427156a..9c62973b39eabe89aaf6c5e2414ab497929de9e9 100644 (file)
--- a/target/linux/microchipsw/lan969x/config-default
+++ b/target/linux/microchipsw/lan969x/config-default
@@ -80,7 +80,6 @@ CONFIG_DW_APB_TIMER_OF=y
 CONFIG_DW_WATCHDOG=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EXCLUSIVE_SYSTEM_RAM=y
-CONFIG_FDMA=y
 CONFIG_FIXED_PHY=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_FRAME_POINTER=y
@@ -144,7 +143,6 @@ CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_IRQ_MSI_LIB=y
 CONFIG_IRQ_WORK=y
-CONFIG_LAN969X_SWITCH=y
 CONFIG_LIBFDT=y
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
@@ -152,13 +150,11 @@ CONFIG_LRU_GEN_WALKS_MMU=y
 CONFIG_MDIO_BUS=y
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_DEVRES=y
-CONFIG_MDIO_I2C=y
 CONFIG_MDIO_MSCC_MIIM=y
 CONFIG_MFD_AT91_USART=y
 CONFIG_MFD_ATMEL_FLEXCOM=y
 CONFIG_MFD_CORE=y
 CONFIG_MFD_SYSCON=y
-CONFIG_MICREL_PHY=y
 CONFIG_MIGRATION=y
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
@@ -200,7 +196,6 @@ CONFIG_PER_VMA_LOCK=y
 CONFIG_PGTABLE_LEVELS=3
 CONFIG_PHYLIB=y
 CONFIG_PHYLIB_LEDS=y
-CONFIG_PHYLINK=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PHY_SPARX5_SERDES=y
 CONFIG_PINCTRL=y
@@ -232,7 +227,6 @@ CONFIG_SERIAL_ATMEL_CONSOLE=y
 CONFIG_SERIAL_ATMEL_PDC=y
 CONFIG_SERIAL_ATMEL_TTYAT=y
 CONFIG_SERIAL_MCTRL_GPIO=y
-CONFIG_SFP=y
 CONFIG_SMP=y
 CONFIG_SOCK_RX_QUEUE_MAPPING=y
 CONFIG_SOFTIRQ_ON_OWN_STACK=y
@@ -241,7 +235,7 @@ CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSE_IRQ=y
-CONFIG_SPARX5_SWITCH=y
+# CONFIG_SPARX5_SWITCH is not set
 CONFIG_SPI=y
 CONFIG_SPI_ATMEL=y
 CONFIG_SPI_ATMEL_QUADSPI=y

diff --git a/target/linux/microchipsw/lan969x/target.mk b/target/linux/microchipsw/lan969x/target.mk
index bc77e62a5b55dcd2dd487b6afab0fb0a30e8f184..86aa3081b2cfe3eeae52412d6e56cc72189f84fe 100644 (file)
--- a/target/linux/microchipsw/lan969x/target.mk
+++ b/target/linux/microchipsw/lan969x/target.mk
@@ -2,7 +2,8 @@ SUBTARGET:=lan969x
 BOARDNAME:=Microchip LAN969x switches
 FEATURES+= boot-part rootfs-part
 
-DEFAULT_PACKAGES += kmod-usb3 kmod-usb-dwc3 \
+DEFAULT_PACKAGES += kmod-sparx5-switch kmod-sfp kmod-phy-micrel \
+       kmod-usb3 kmod-usb-dwc3 \
        e2fsprogs kmod-fs-ext4 losetup \
        kmod-fs-f2fs f2fs-tools