a lot of bugfixes and package updates

3 files changed, 25 insertions, 37 deletions

diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index 5fc901854..1e08c94b5 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -168,36 +168,36 @@ config ADK_KERNEL_SND_BCM2708_SOC_I2S
 config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_AMP
 	tristate "Hifiberry AMP"
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
-	depends on ADK_TARGET_BOARD_BCM28XX
+	depends on ADK_TARGET_BOARD_BCM28XX && ADK_KERNEL_VERSION_3_18
 
 config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC
 	tristate "Hifiberry DAC"
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC_PCM5102A
-	depends on ADK_TARGET_BOARD_BCM28XX
+	depends on ADK_TARGET_BOARD_BCM28XX && ADK_KERNEL_VERSION_3_18
 
 config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI
 	tristate "Hifiberry DIGI"
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC_WM8804
-	depends on ADK_TARGET_BOARD_BCM28XX
+	depends on ADK_TARGET_BOARD_BCM28XX && ADK_KERNEL_VERSION_3_18
 
 config ADK_KERNEL_SND_BCM2708_SOC_RPI_DAC
 	tristate "RPI-DAC"
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
-	depends on ADK_TARGET_BOARD_BCM28XX
+	depends on ADK_TARGET_BOARD_BCM28XX && ADK_KERNEL_VERSION_3_18
 
 config ADK_KERNEL_SND_BCM2708_SOC_IQAUDIO_DAC
 	tristate "IQAudio-DAC"
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC_PCM512x_I2C
-	depends on ADK_TARGET_BOARD_BCM28XX
+	depends on ADK_TARGET_BOARD_BCM28XX && ADK_KERNEL_VERSION_3_18
 
 config ADK_KERNEL_SND_BCM2708_SOC_RPI_PROTO
 	tristate "Rpi-Proto"
 	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC_WM8731
-	depends on ADK_TARGET_BOARD_BCM28XX
+	depends on ADK_TARGET_BOARD_BCM28XX && ADK_KERNEL_VERSION_3_18
 
 config ADK_KERNEL_SND_IMX_SOC
 	bool "IMX6 SoC sound chip"
@@ -212,8 +212,7 @@ config ADK_KERNEL_SND_IMX_SOC
 	select ADK_KERNEL_SND_SOC_FSL_SPDIF
 	select ADK_KERNEL_REGMAP_SPI
 	select ADK_KERNEL_REGMAP_I2C
-	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	depends on ADK_KERNEL_VERSION_3_14
+	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 && ADK_KERNEL_VERSION_3_14
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 
diff --git a/target/linux/config/Config.in.aufs b/target/linux/config/Config.in.aufs
index 2320cacd8..4e333d3a8 100644
--- a/target/linux/config/Config.in.aufs
+++ b/target/linux/config/Config.in.aufs
@@ -1,8 +1,7 @@
 menu "Overlay filesystems"
 
 config ADK_KERNEL_AUFS_FS
-	prompt "Aufs (Advanced multi layered unification filesystem) support"
-	tristate
+	bool "Aufs (Advanced multi layered unification filesystem) support"
 	help
 	  Aufs is a stackable unification filesystem such as Unionfs,
 	  which unifies several directories and provides a merged single
diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth
index f9c8ea8b6..bcac0b0d0 100644
--- a/target/linux/config/Config.in.bluetooth
+++ b/target/linux/config/Config.in.bluetooth
@@ -1,9 +1,12 @@
 menu "Bluetooth support and drivers"
 depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_SDIO
 
+config ADK_KERNEL_BT_BREDR
+	bool
+
 config ADK_KERNEL_BT
-	prompt "Bluetooth network stack"
-	tristate
+	tristate "Bluetooth network stack"
+	select ADK_KERNEL_BT_BREDR
 	default n
 	help
 	  Bluetooth is low-cost, low-power, short-range wireless technology.
@@ -23,8 +26,7 @@ config ADK_KERNEL_BT
 	     HIDP Module (Human Interface Device Protocol)
 
 config ADK_KERNEL_BT_L2CAP
-	prompt "L2CAP protocol support"
-	boolean
+	bool "L2CAP protocol support"
 	select ADK_KERNEL_BT
 	default n
 	help
@@ -32,10 +34,8 @@ config ADK_KERNEL_BT_L2CAP
 	  connection oriented and connection-less data transport.  L2CAP
 	  support is required for most Bluetooth applications.
 
-
 config ADK_KERNEL_BT_SCO
-	prompt "SCO link support"
-	boolean
+	bool "SCO link support"
 	select ADK_KERNEL_BT
 	default n
 	help
@@ -43,8 +43,7 @@ config ADK_KERNEL_BT_SCO
 	  required for voice applications like Headset and Audio.
 
 config ADK_KERNEL_BT_RFCOMM
-	prompt "RFCOMM protocol support"
-	tristate
+	tristate "RFCOMM protocol support"
 	select ADK_KERNEL_BT
 	depends on ADK_KERNEL_BT_L2CAP
 	default n
@@ -54,8 +53,7 @@ config ADK_KERNEL_BT_RFCOMM
 	  applications.
 
 config ADK_KERNEL_BT_BNEP
-	prompt "BNEP protocol support"
-	tristate
+	tristate "BNEP protocol support"
 	select ADK_KERNEL_BT
 	depends on ADK_KERNEL_BT_L2CAP
 	default n
@@ -65,8 +63,7 @@ config ADK_KERNEL_BT_BNEP
 	  Bluetooth PAN (Personal Area Network).
 
 config ADK_KERNEL_BT_HIDP
-	prompt "HIDP protocol support"
-	tristate
+	tristate "HIDP protocol support"
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_HID
 	select ADK_KERNEL_BT
@@ -78,8 +75,7 @@ config ADK_KERNEL_BT_HIDP
 	  Interface Device Profile.
 
 config ADK_KERNEL_BT_HCIBTSDIO
-	prompt "HCI SDIO driver"
-	tristate
+	tristate "HCI SDIO driver"
 	select ADK_KERNEL_BT
 	depends on ADK_TARGET_WITH_SDIO
 	default n
@@ -89,8 +85,7 @@ config ADK_KERNEL_BT_HCIBTSDIO
 	  SDIO interface.
 
 config ADK_KERNEL_BT_HCIBTUSB
-	prompt "HCI USB driver"
-	tristate
+	tristate "HCI USB driver"
 	select ADK_KERNEL_BT
 	depends on ADK_TARGET_WITH_USB
 	default n
@@ -100,8 +95,7 @@ config ADK_KERNEL_BT_HCIBTUSB
 	  USB interface.
 
 config ADK_KERNEL_BT_HCIUART
-	prompt "HCI UART driver"
-	tristate
+	tristate "HCI UART driver"
 	select ADK_KERNEL_BT
 	default n
 	help
@@ -112,16 +106,14 @@ config ADK_KERNEL_BT_HCIUART
 	  adapter and BrainBoxes Bluetooth PC Card.
 
 config ADK_KERNEL_BT_MRVL
-	prompt "Marvell driver"
-	tristate
+	tristate "Marvell driver"
 	select ADK_KERNEL_BT
 	default n
 	help
 	  Bluetooth Marvell driver.
 
 config ADK_KERNEL_BT_MRVL_SDIO
-	prompt "Marvell SDIO driver"
-	tristate
+	tristate "Marvell SDIO driver"
 	select ADK_PACKAGE_BRCM_BLUETOOTH
 	select ADK_KERNEL_BT_MRVL
 	select ADK_KERNEL_BT_HCIBTSDIO
@@ -131,8 +123,7 @@ config ADK_KERNEL_BT_MRVL_SDIO
 	  Bluetooth Marvell driver.
 
 config ADK_KERNEL_BT_HCIBCM203X
-	prompt "HCI BCM203x USB driver"
-	tristate
+	tristate "HCI BCM203x USB driver"
 	select ADK_KERNEL_FW_LOADER
 	select ADK_KERNEL_BT_HCIBTUSB
 	select ADK_KERNEL_BT
@@ -144,8 +135,7 @@ config ADK_KERNEL_BT_HCIBCM203X
 	  Blutonium based devices.
 
 config ADK_KERNEL_BT_HCIBPA10X
-	prompt "HCI BPA10x USB driver"
-	tristate
+	tristate "HCI BPA10x USB driver"
 	select ADK_KERNEL_BT
 	select ADK_KERNEL_BT_HCIBTUSB
 	default n