diff --git a/target/config/Config.in.addons b/target/config/Config.in.addons
index 4ee369d..06f4753 100644
--- a/target/config/Config.in.addons
+++ b/target/config/Config.in.addons
@@ -15,9 +15,13 @@ config ADK_TARGET_HARDWARE_RPI3_BT
 
 config ADK_TARGET_HARDWARE_RPI3_NONE
 	bool "disable serial and bluetooth"
-
 endchoice
 
+config ADK_TARGET_HARDWARE_BCM2835_SND
+       	bool "BCM2835 on board audio"
+        depends on ADK_TARGET_OS_LINUX && ADK_TARGET_BOARD_BCM28XX
+	select ADK_KERNEL_SND_BCM2835 m
+
 choice
 prompt "Audio Board"
 depends on ADK_TARGET_OS_LINUX && ADK_TARGET_BOARD_BCM28XX
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index 6eb3afe..f33d6bb 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -183,7 +183,6 @@ config ADK_KERNEL_SND_BCM2835
 	select ADK_KERNEL_SND
 	select ADK_KERNEL_SND_ARM
 	depends on ADK_TARGET_BOARD_BCM28XX
-	default m if ADK_TARGET_BOARD_BCM28XX
 	default n
 
 config ADK_KERNEL_SND_BCM2835_SOC_I2S
@@ -191,7 +190,6 @@ config ADK_KERNEL_SND_BCM2835_SOC_I2S
 	select ADK_KERNEL_SND
 	select ADK_KERNEL_SND_ARM
 	select ADK_KERNEL_SND_SOC
-	select ADK_KERNEL_SND_BCM2835
 	select ADK_KERNEL_DMA_BCM2835
 	select ADK_KERNEL_REGMAP
 	select ADK_KERNEL_REGMAP_MMIO
@@ -212,7 +210,7 @@ config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC
 config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DACPLUS
 	tristate "Hifiberry DACPLUS"
 	select ADK_KERNEL_SND_BCM2835_SOC_I2S
-	select ADK_KERNEL_SND_SOC_PCM512x
+	select ADK_KERNEL_SND_SOC_PCM512x_I2C
 	depends on ADK_TARGET_BOARD_BCM28XX
 
 config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI
diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c
index 6d33e81..7bd5ab8 100644
--- a/target/linux/config/Config.in.i2c
+++ b/target/linux/config/Config.in.i2c
@@ -25,12 +25,17 @@ config ADK_KERNEL_I2C_GPIO
 	default y if ADK_TARGET_SYSTEM_LINKSYS_NSLU2
 	help
 
+config ADK_KERNEL_I2C_BCM2835
+	tristate "I2C driver for BCM2835 boards"
+
+
 config ADK_KERNEL_I2C_BCM2708
 	tristate "I2C driver for BCM28XX boards"
 	select ADK_KERNEL_I2C
 	select ADK_KERNEL_REGMAP
 	select ADK_KERNEL_REGMAP_I2C
 	select ADK_KERNEL_I2C_CHARDEV
+	select ADK_KERNEL_I2C_BCM2835
 	depends on ADK_TARGET_BOARD_BCM28XX
 	default m if ADK_TARGET_BOARD_BCM28XX
 	default n