Skip to content

Commit

Permalink
kirkwood: Make the Marvell DSA switch a module
Browse files Browse the repository at this point in the history
Not all Kirkwood systems have the Marvell MV88E6XXX switches.
Drop those from the generic config and add them as modules
in the systems that have it.

This was inferred by inspecting the upstream DTS files for any
mv88e* strings and adding the mv88e6xxx kmod package to those
that have an upstream device tree with an MV88E6xxx switch
and an OpenWrt image target.

Signed-off-by: Linus Walleij <[email protected]>
  • Loading branch information
linusw committed Dec 16, 2024
1 parent af1740a commit 8a72390
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
4 changes: 0 additions & 4 deletions target/linux/kirkwood/config-6.6
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,6 @@ CONFIG_NEED_KUSER_HELPERS=y
CONFIG_NEED_PER_CPU_KM=y
CONFIG_NET_DEVLINK=y
CONFIG_NET_DSA=y
CONFIG_NET_DSA_MV88E6XXX=y
CONFIG_NET_DSA_TAG_DSA=y
CONFIG_NET_DSA_TAG_DSA_COMMON=y
CONFIG_NET_DSA_TAG_EDSA=y
CONFIG_NET_EGRESS=y
CONFIG_NET_INGRESS=y
CONFIG_NET_SELFTESTS=y
Expand Down
8 changes: 5 additions & 3 deletions target/linux/kirkwood/image/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@ define Device/checkpoint_l-50
DEVICE_VENDOR := Check Point
DEVICE_MODEL := L-50
DEVICE_PACKAGES := kmod-ath9k kmod-gpio-button-hotplug kmod-mvsdio \
kmod-rtc-s35390a kmod-usb-ledtrig-usbport wpad-basic-mbedtls
kmod-rtc-s35390a kmod-usb-ledtrig-usbport wpad-basic-mbedtls \
kmod-dsa-mv88e6xxx
IMAGES := sysupgrade.bin
endef
TARGET_DEVICES += checkpoint_l-50
Expand Down Expand Up @@ -193,7 +194,8 @@ define Device/endian_4i-edge-200
DEVICE_MODEL := 4i Edge 200
DEVICE_ALT0_VENDOR := Endian
DEVICE_ALT0_MODEL := UTM Mini Firewall
DEVICE_PACKAGES := kmod-ath9k kmod-mvsdio wpad-basic-mbedtls kmod-rtc-mv
DEVICE_PACKAGES := kmod-ath9k kmod-mvsdio wpad-basic-mbedtls kmod-rtc-mv \
kmod-dsa-mv88e6xxx
KERNEL_SIZE := 4096k
IMAGES := sysupgrade.bin
endef
Expand Down Expand Up @@ -273,7 +275,7 @@ define Device/linksys
$(Device/kernel-size-migration-linksys)
DEVICE_VENDOR := Linksys
DEVICE_PACKAGES := kmod-mwl8k wpad-basic-mbedtls kmod-gpio-button-hotplug \
kmod-rtc-mv
kmod-rtc-mv kmod-dsa-mv88e6xxx
KERNEL_IN_UBI :=
KERNEL_SIZE := 4096k
UBINIZE_OPTS := -E 5
Expand Down

0 comments on commit 8a72390

Please sign in to comment.