Skip to content

Commit 2389793

Browse files
committed
kernel: kmod-btmtk: Extract btmtk.ko into own package
btmtk.ko is used by btusb.ko and btmtkuart.ko, add it into an own package and make both packages depend on it. Fixes: 1c42a0b ("kernel: modules: bluetooth: separating UART and USB drivers") Link: openwrt/openwrt#18110 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
1 parent d6977ab commit 2389793

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

package/kernel/linux/modules/bluetooth.mk

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ $(eval $(call KernelPackage,hci-uart))
6060
define KernelPackage/btusb
6161
SUBMENU:=$(BLUETOOTH_MENU)
6262
TITLE:=Bluetooth HCI USB support
63-
DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-bluetooth
63+
DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-bluetooth +kmod-btmtk
6464
KCONFIG:= \
6565
CONFIG_BT_HCIBTUSB \
6666
CONFIG_BT_HCIBTUSB_BCM=n \
@@ -69,8 +69,7 @@ define KernelPackage/btusb
6969
FILES:= \
7070
$(LINUX_DIR)/drivers/bluetooth/btusb.ko \
7171
$(LINUX_DIR)/drivers/bluetooth/btintel.ko \
72-
$(LINUX_DIR)/drivers/bluetooth/btrtl.ko \
73-
$(LINUX_DIR)/drivers/bluetooth/btmtk.ko
72+
$(LINUX_DIR)/drivers/bluetooth/btrtl.ko
7473
AUTOLOAD:=$(call AutoProbe,btusb)
7574
endef
7675

@@ -81,6 +80,18 @@ endef
8180
$(eval $(call KernelPackage,btusb))
8281

8382

83+
define KernelPackage/btmtk
84+
SUBMENU:=$(BLUETOOTH_MENU)
85+
TITLE:=MTK Bluetooth support
86+
HIDDEN:=1
87+
DEPENDS:=+kmod-bluetooth
88+
KCONFIG:=CONFIG_BT_MTK
89+
FILES:=$(LINUX_DIR)/drivers/bluetooth/btmtk.ko
90+
endef
91+
92+
$(eval $(call KernelPackage,btmtk))
93+
94+
8495
define KernelPackage/ath3k
8596
SUBMENU:=$(BLUETOOTH_MENU)
8697
TITLE:=ATH3K Kernel Module support

target/linux/mediatek/modules.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $(eval $(call KernelPackage,ata-ahci-mtk))
1818
define KernelPackage/btmtkuart
1919
SUBMENU:=Other modules
2020
TITLE:=MediaTek HCI UART driver
21-
DEPENDS:=@TARGET_mediatek_mt7622 +kmod-bluetooth +mt7622bt-firmware
21+
DEPENDS:=@TARGET_mediatek_mt7622 +kmod-bluetooth +kmod-btmtk +mt7622bt-firmware
2222
KCONFIG:=CONFIG_BT_MTKUART
2323
FILES:= \
2424
$(LINUX_DIR)/drivers/bluetooth/btmtkuart.ko

0 commit comments

Comments
 (0)