From 3f5df9f7d15fb26da3e0bfdd073db6360fa425ef Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Sat, 24 Sep 2016 02:40:25 +0200
Subject: bluetooth: some broadcom USB bt devces need this, move firmware to
 brcm subfolder

---
 package/brcm-bluetooth/Makefile         | 6 +++---
 target/linux/config/Config.in.bluetooth | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/package/brcm-bluetooth/Makefile b/package/brcm-bluetooth/Makefile
index cc8cf280f..8f6a9d41e 100644
--- a/package/brcm-bluetooth/Makefile
+++ b/package/brcm-bluetooth/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		brcm-bluetooth
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_DESCR:=		firmware for broadcom bluetooth chips
 PKG_SECTION:=		sys/firmware
 PKG_DEPENDS:=		bluez
@@ -27,11 +27,11 @@ do-build:
 do-install:
 	${INSTALL_DIR} ${IDIR_BRCM_BLUETOOTH}/etc/init.d
 	$(INSTALL_BIN) ./files/hci $(IDIR_BRCM_BLUETOOTH)/etc/init.d/
-	${INSTALL_DIR} ${IDIR_BRCM_BLUETOOTH}/lib/firmware
+	${INSTALL_DIR} ${IDIR_BRCM_BLUETOOTH}/lib/firmware/brcm
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3),y)
 	${CP} ${WRKBUILD}/BCM43430A1.hcd ${IDIR_BRCM_BLUETOOTH}/lib/firmware
 else
-	${CP} ${WRKBUILD}/*.hcd ${IDIR_BRCM_BLUETOOTH}/lib/firmware
+	${CP} ${WRKBUILD}/*.hcd ${IDIR_BRCM_BLUETOOTH}/lib/firmware/brcm
 	${INSTALL_DIR} ${IDIR_BRCM_BLUETOOTH}/sbin
 	${INSTALL_BIN} ${WRKBUILD}/brcm_patchram \
 		${IDIR_BRCM_BLUETOOTH}/sbin/brcm_patchram
diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth
index 0920336b2..960226e6d 100644
--- a/target/linux/config/Config.in.bluetooth
+++ b/target/linux/config/Config.in.bluetooth
@@ -103,6 +103,14 @@ config ADK_KERNEL_BT_HCIBTUSB
 	  This driver is required if you want to use Bluetooth devices with
 	  USB interface.
 
+config ADK_KERNEL_BT_HCIBTUSB_BCM
+	tristate "Broadcom protocol support"
+	depends on ADK_KERNEL_BT_HCIBTUSB
+	select ADK_KERNEL_BT_BCM
+	help
+	  The Broadcom protocol support enables firmware and patchram
+	  download support for Broadcom Bluetooth controllers.
+
 config ADK_KERNEL_BT_HCIUART
 	tristate "HCI UART driver"
 	select ADK_KERNEL_BT
-- 
cgit v1.2.3