bcm27xx: move USB HID/sound to opt-in meta-packages

kmod-usb-hid, kmod-sound-core, and kmod-sound-arm-bcm2835 are
currently forced onto every bcm27xx image regardless of use case.
Move them into two new opt-in meta-packages, kmod-bcm27xx-hid and
kmod-bcm27xx-sound, filed under the input and sound submenus
respectively, following the same pattern as kmod-bcm27xx-i2c/-spi.
Still available via apk or menuconfig, just no longer default.

Signed-off-by: Joshua Covington <joshuacov@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/24244
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>

diff --git a/target/linux/bcm27xx/Makefile b/target/linux/bcm27xx/Makefile
index 46a3df5aa8a3b9ce42772f75319af3347de5c4c9..0758f7b421f14c99d1870dfc047aa0ab37b0bae2 100644 (file)
--- a/target/linux/bcm27xx/Makefile
+++ b/target/linux/bcm27xx/Makefile
@@ -24,8 +24,6 @@ include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES := $(filter-out urngd,$(DEFAULT_PACKAGES))
 DEFAULT_PACKAGES += \
        $(if $(CONFIG_TARGET_bcm27xx_bcm2712),,bcm27xx-gpu-fw) bcm27xx-utils \
-       kmod-usb-hid \
-       kmod-sound-core kmod-sound-arm-bcm2835 \
        kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \
        partx-utils mkf2fs e2fsprogs
 

diff --git a/target/linux/bcm27xx/modules/other.mk b/target/linux/bcm27xx/modules/other.mk
index 0e308a775823a5b49fd1adad96c731b5c40336a7..4918306308a1306880b159bc254cfa790a780bde 100644 (file)
--- a/target/linux/bcm27xx/modules/other.mk
+++ b/target/linux/bcm27xx/modules/other.mk
@@ -139,3 +139,35 @@ define KernelPackage/rp1-mailbox/description
 endef
 
 $(eval $(call KernelPackage,rp1-mailbox))
+
+
+define KernelPackage/bcm27xx-hid
+  SUBMENU:=$(INPUT_MODULES_MENU)
+  TITLE:=USB HID support for bcm27xx boards
+  DEPENDS:=@TARGET_bcm27xx \
+       +kmod-usb-hid
+endef
+
+define KernelPackage/bcm27xx-hid/description
+ Pulls in USB Human Input Device (keyboard, mouse) support. Not
+ installed by default -- headless/router deployments don't need
+ it; install this if you want to attach a USB keyboard or mouse.
+endef
+
+$(eval $(call KernelPackage,bcm27xx-hid))
+
+
+define KernelPackage/bcm27xx-sound
+  SUBMENU:=$(SOUND_MENU)
+  TITLE:=Onboard audio support for bcm27xx boards
+  DEPENDS:=@TARGET_bcm27xx \
+       +kmod-sound-core +kmod-sound-arm-bcm2835
+endef
+
+define KernelPackage/bcm27xx-sound/description
+ Pulls in onboard audio support. Not installed by default --
+ headless/router deployments don't need it; install this if you
+ want sound output on this board.
+endef
+
+$(eval $(call KernelPackage,bcm27xx-sound))