Skip to content

Commit

Permalink
linux: use packages kmod-hci-uart and kmod-btusb instead of kmod-blue…
Browse files Browse the repository at this point in the history
…tooth

Use Bluetooth UART and USB packages separetly.

Signed-off-by: Paweł Owoc <[email protected]>
Link: openwrt/openwrt#15118
Signed-off-by: Hauke Mehrtens <[email protected]>
  • Loading branch information
testuser7 authored and hauke committed Feb 23, 2025
1 parent 1c42a0b commit 3b7a927
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion target/linux/bcm53xx/image/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ TARGET_DEVICES += meraki_mr26
define Device/meraki_mr32
DEVICE_VENDOR := Meraki
DEVICE_MODEL := MR32
DEVICE_PACKAGES := $(B43) kmod-leds-pwm kmod-hwmon-ina2xx kmod-bluetooth
DEVICE_PACKAGES := $(B43) kmod-leds-pwm kmod-hwmon-ina2xx kmod-hci-uart
DEVICE_DTS := bcm53016-meraki-mr32
# Meraki FW r23 tries to resize the part.safe partition before it will
# flash the image. This is a bit of a problem, since resizing will fail
Expand Down
6 changes: 3 additions & 3 deletions target/linux/ipq40xx/image/generic.mk
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ define Device/linksys_whw03
IMAGE_SIZE := 131072k
IMAGES += factory.bin
IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | linksys-image type=WHW03
DEVICE_PACKAGES := ath10k-firmware-qca9888-ct kmod-leds-pca963x kmod-spi-dev kmod-bluetooth \
DEVICE_PACKAGES := ath10k-firmware-qca9888-ct kmod-leds-pca963x kmod-spi-dev kmod-hci-uart \
kmod-fs-ext4 e2fsprogs kmod-fs-f2fs mkf2fs losetup ipq-wifi-linksys_whw03
endef
TARGET_DEVICES += linksys_whw03
Expand All @@ -758,7 +758,7 @@ define Device/linksys_whw03v2
UBINIZE_OPTS := -E 5 # EOD marks to "hide" factory sig at EOF
IMAGES += factory.bin
IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | linksys-image type=WHW03v2
DEVICE_PACKAGES := ath10k-firmware-qca9888-ct kmod-leds-pca963x kmod-spi-dev kmod-bluetooth
DEVICE_PACKAGES := ath10k-firmware-qca9888-ct kmod-leds-pca963x kmod-spi-dev kmod-hci-uart
endef
TARGET_DEVICES += linksys_whw03v2

Expand Down Expand Up @@ -1127,7 +1127,7 @@ define Device/teltonika_rutx10
PAGESIZE := 2048
FILESYSTEMS := squashfs
IMAGE/factory.ubi := append-ubi | qsdk-ipq-factory-nand | append-rutx-metadata
DEVICE_PACKAGES := kmod-bluetooth
DEVICE_PACKAGES := kmod-btusb
endef
# Missing DSA Setup
#TARGET_DEVICES += teltonika_rutx10
Expand Down
6 changes: 3 additions & 3 deletions target/linux/qualcommax/image/ipq807x.mk
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ define Device/linksys_mx4200v1
$(call Device/linksys_mx4x00)
DEVICE_MODEL := MX4200
DEVICE_VARIANT := v1
DEVICE_PACKAGES += kmod-bluetooth
DEVICE_PACKAGES += kmod-hci-uart
endef
TARGET_DEVICES += linksys_mx4200v1

Expand Down Expand Up @@ -241,7 +241,7 @@ define Device/linksys_mx8500
$(call Device/linksys_mx)
DEVICE_MODEL := MX8500
DEVICE_PACKAGES += ipq-wifi-linksys_mx8500 kmod-ath11k-pci \
ath11k-firmware-qcn9074 kmod-bluetooth
ath11k-firmware-qcn9074 kmod-hci-uart
endef
TARGET_DEVICES += linksys_mx8500

Expand Down Expand Up @@ -507,6 +507,6 @@ define Device/zyxel_nbg7815
DEVICE_DTS_CONFIG := config@nbg7815
SOC := ipq8074
DEVICE_PACKAGES := kmod-fs-f2fs f2fs-tools ipq-wifi-zyxel_nbg7815 kmod-ath11k-pci \
kmod-bluetooth kmod-hwmon-tmp103
kmod-hci-uart kmod-hwmon-tmp103
endef
TARGET_DEVICES += zyxel_nbg7815

0 comments on commit 3b7a927

Please sign in to comment.