14 files changed, 41 insertions, 5 deletions
diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth
index 42d220302..6e59fe357 100644
--- a/target/linux/config/Config.in.bluetooth
+++ b/target/linux/config/Config.in.bluetooth
@@ -10,6 +10,9 @@ depends on ADK_TARGET_WITH_USB \
 config ADK_KERNEL_BT_BREDR
 	bool
 
+config ADK_KERNEL_BT_BCM
+	tristate
+
 config ADK_KERNEL_BT
 	tristate "Bluetooth network stack"
 	select ADK_KERNEL_BT_BREDR
@@ -111,6 +114,20 @@ config ADK_KERNEL_BT_HCIUART
 	  UART based Bluetooth PCMCIA and CF devices like Xircom Credit Card 
 	  adapter and BrainBoxes Bluetooth PC Card.
 
+config ADK_KERNEL_BT_HCIUART_H4
+	bool
+	depends on ADK_KERNEL_BT_HCIUART
+	default n
+
+config ADK_KERNEL_BT_HCIUART_BCM
+	tristate "Broadcom protocol support"
+	select ADK_KERNEL_BT_HCIUART
+	select ADK_KERNEL_BT_HCIUART_H4
+	select ADK_KERNEL_BT_BCM
+	help
+	  The Broadcom protocol support enables Bluetooth HCI over serial
+	  port interface for Broadcom Bluetooth controllers.
+
 config ADK_KERNEL_BT_MRVL
 	tristate "Marvell driver"
 	select ADK_KERNEL_BT
diff --git a/target/linux/config/Config.in.wireless b/target/linux/config/Config.in.wireless
index 55fb9145f..71d97852d 100644
--- a/target/linux/config/Config.in.wireless
+++ b/target/linux/config/Config.in.wireless
@@ -124,23 +124,42 @@ depends on ADK_TARGET_WITH_CARDBUS \
 	|| ADK_TARGET_WITH_SDIO \
 	|| ADK_TARGET_GENERIC
 
-config ADK_KERNEL_BRCMFMAC_SDIO
+config ADK_KERNEL_BRCMFMAC
+	tristate
+
+config ADK_KERNEL_BRCMDBG
 	bool
 
-config ADK_KERNEL_BRCMFMAC
-	tristate "Broadcom brcmfmac wireless driver"
+config ADK_KERNEL_BRCMFMAC_SDIO
+	tristate "Broadcom brcmfmac wireless driver (SDIO)"
 	select ADK_KERNEL_WIRELESS
 	select ADK_KERNEL_WLAN_80211
 	select ADK_KERNEL_CFG80211
 	select ADK_KERNEL_BCMA_POSSIBLE
-	select ADK_KERNEL_BRCMFMAC_SDIO
 	select ADK_KERNEL_RFKILL
+	select ADK_KERNEL_BRCMFMAC
 	select ADK_PACKAGE_BRCMFMAC_FIRMWARE
 	depends on ADK_TARGET_WITH_SDIO
 	default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 	help
-	  Driver for Broadcom FullMac wireless cards
+	  Driver for Broadcom FullMac wireless cards (SDIO).
+
+config ADK_KERNEL_BRCMFMAC_USB
+	tristate "Broadcom brcmfmac wireless driver (USB)"
+	select ADK_KERNEL_WIRELESS
+	select ADK_KERNEL_WLAN_80211
+	select ADK_KERNEL_CFG80211
+	select ADK_KERNEL_BCMA_POSSIBLE
+	select ADK_KERNEL_RFKILL
+	select ADK_KERNEL_BRCMFMAC
+	select ADK_KERNEL_BRCMDBG
+	select ADK_PACKAGE_BRCMFMAC_FIRMWARE
+	depends on ADK_TARGET_WITH_USB
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3
+	default n
+	help
+	  Driver for Broadcom FullMac wireless cards (USB).
 
 config ADK_KERNEL_ATH6KL_SDIO
 	bool
diff --git a/target/linux/patches/4.1.22/aufs.patch b/target/linux/patches/4.1.23/aufs.patch
index 749c90989..749c90989 100644
--- a/target/linux/patches/4.1.22/aufs.patch
+++ b/target/linux/patches/4.1.23/aufs.patch
diff --git a/target/linux/patches/4.1.22/cleankernel.patch b/target/linux/patches/4.1.23/cleankernel.patch
index 59693f426..59693f426 100644
--- a/target/linux/patches/4.1.22/cleankernel.patch
+++ b/target/linux/patches/4.1.23/cleankernel.patch
diff --git a/target/linux/patches/4.1.22/cris-header.patch b/target/linux/patches/4.1.23/cris-header.patch
index 2b5a88461..2b5a88461 100644
--- a/target/linux/patches/4.1.22/cris-header.patch
+++ b/target/linux/patches/4.1.23/cris-header.patch
diff --git a/target/linux/patches/4.1.22/initramfs-nosizelimit.patch b/target/linux/patches/4.1.23/initramfs-nosizelimit.patch
index 40d2f6bd8..40d2f6bd8 100644
--- a/target/linux/patches/4.1.22/initramfs-nosizelimit.patch
+++ b/target/linux/patches/4.1.23/initramfs-nosizelimit.patch
diff --git a/target/linux/patches/4.1.22/j2-core.patch b/target/linux/patches/4.1.23/j2-core.patch
index 38136df2c..38136df2c 100644
--- a/target/linux/patches/4.1.22/j2-core.patch
+++ b/target/linux/patches/4.1.23/j2-core.patch
diff --git a/target/linux/patches/4.1.22/mtd-rootfs.patch b/target/linux/patches/4.1.23/mtd-rootfs.patch
index 5f6d82b5c..5f6d82b5c 100644
--- a/target/linux/patches/4.1.22/mtd-rootfs.patch
+++ b/target/linux/patches/4.1.23/mtd-rootfs.patch
diff --git a/target/linux/patches/4.1.22/realtime.patch b/target/linux/patches/4.1.23/realtime.patch
index 832b82fdf..832b82fdf 100644
--- a/target/linux/patches/4.1.22/realtime.patch
+++ b/target/linux/patches/4.1.23/realtime.patch
diff --git a/target/linux/patches/4.1.22/regmap-default-on.patch b/target/linux/patches/4.1.23/regmap-default-on.patch
index 8d72224bf..8d72224bf 100644
--- a/target/linux/patches/4.1.22/regmap-default-on.patch
+++ b/target/linux/patches/4.1.23/regmap-default-on.patch
diff --git a/target/linux/patches/4.1.22/remove-warn.patch b/target/linux/patches/4.1.23/remove-warn.patch
index 1f89c710d..1f89c710d 100644
--- a/target/linux/patches/4.1.22/remove-warn.patch
+++ b/target/linux/patches/4.1.23/remove-warn.patch
diff --git a/target/linux/patches/4.1.22/startup.patch b/target/linux/patches/4.1.23/startup.patch
index d396b75e4..d396b75e4 100644
--- a/target/linux/patches/4.1.22/startup.patch
+++ b/target/linux/patches/4.1.23/startup.patch
diff --git a/target/linux/patches/4.1.22/use-gawk.patch b/target/linux/patches/4.1.23/use-gawk.patch
index 5b312589d..5b312589d 100644
--- a/target/linux/patches/4.1.22/use-gawk.patch
+++ b/target/linux/patches/4.1.23/use-gawk.patch
diff --git a/target/linux/patches/4.1.22/use-libgcc-for-sh.patch b/target/linux/patches/4.1.23/use-libgcc-for-sh.patch
index 6420219b0..6420219b0 100644
--- a/target/linux/patches/4.1.22/use-libgcc-for-sh.patch
+++ b/target/linux/patches/4.1.23/use-libgcc-for-sh.patch