KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hci_usb.c has been replaced with btusb.c in 2.6.29 - modify makefile to handle this condition based upon kernel revision

Browse source 
SVN-Revision: 15336
This commit is contained in:
Hamish Guthrie 2009-04-22 13:11:16 +00:00
parent 8398eb00ba
commit e0694c7ca6
1 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
package/kernel/modules/other.mk
View file

@ -235,6 +235,25 @@ define KernelPackage/bluetooth
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=Bluetooth support TITLE:=Bluetooth support
DEPENDS:=@USB_SUPPORT +kmod-usb-core DEPENDS:=@USB_SUPPORT +kmod-usb-core
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.29)),1)
KCONFIG:= \
CONFIG_BLUEZ \
CONFIG_BLUEZ_L2CAP \
CONFIG_BLUEZ_SCO \
CONFIG_BLUEZ_RFCOMM \
CONFIG_BLUEZ_BNEP \
CONFIG_BLUEZ_HCIUART \
CONFIG_BLUEZ_HCIUSB \
CONFIG_BLUEZ_HIDP \
CONFIG_BT \
CONFIG_BT_L2CAP \
CONFIG_BT_SCO \
CONFIG_BT_RFCOMM \
CONFIG_BT_BNEP \
CONFIG_BT_HCIBTUSB \
CONFIG_BT_HCIUART \
CONFIG_BT_HIDP
else
KCONFIG:= \ KCONFIG:= \
CONFIG_BLUEZ \ CONFIG_BLUEZ \
CONFIG_BLUEZ_L2CAP \ CONFIG_BLUEZ_L2CAP \
@ -252,6 +271,7 @@ define KernelPackage/bluetooth
CONFIG_BT_HCIUSB \ CONFIG_BT_HCIUSB \
CONFIG_BT_HCIUART \ CONFIG_BT_HCIUART \
CONFIG_BT_HIDP CONFIG_BT_HIDP
endif
endef endef
define KernelPackage/bluetooth/2.4 define KernelPackage/bluetooth/2.4
@ -283,6 +303,18 @@ define KernelPackage/bluetooth/2.6
# CONFIG_BT_BNEP \ # CONFIG_BT_BNEP \
# CONFIG_BT_HCIUSB \ # CONFIG_BT_HCIUSB \
# CONFIG_BT_HCIUART # CONFIG_BT_HCIUART
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.29)),1)
FILES:= \
$(LINUX_DIR)/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/net/bluetooth/sco.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/net/bluetooth/rfcomm/rfcomm.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/net/bluetooth/bnep/bnep.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/net/bluetooth/hidp/hidp.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/bluetooth/btusb.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hidp hci_uart btusb)
else
FILES:= \ FILES:= \
$(LINUX_DIR)/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \
@ -293,6 +325,7 @@ define KernelPackage/bluetooth/2.6
$(LINUX_DIR)/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/bluetooth/hci_usb.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/bluetooth/hci_usb.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hidp hci_uart hci_usb) AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hidp hci_uart hci_usb)
endif
endef endef
define KernelPackage/bluetooth/description define KernelPackage/bluetooth/description