mk/vars.mk

@@ -107,7 +107,7 @@ endif
 ifeq ($(ADK_BUILD_COMPILER_GCC),y)
 ifneq ($(strip ${ADK_USE_CCACHE}),)
 TARGET_CC:=		$(STAGING_HOST_DIR)/usr/bin/ccache ${TARGET_CC_NO_CCACHE}
-TARGET_CXX:=		$(STAGING_HOST_DIR)/usr/bin/ccache ${TARGET_CXX_NO_CXXACHE}
+TARGET_CXX:=		$(STAGING_HOST_DIR)/usr/bin/ccache ${TARGET_CXX_NO_CCACHE}
 endif
 
 # for x86_64 x32 ABI we need to extend TARGET_CC/TARGET_CXX

target/linux/config/Config.in.audio

@@ -183,7 +183,7 @@ 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 m if ADK_TARGET_HARDWARE_NONE
 	default n
 
 config ADK_KERNEL_SND_BCM2835_SOC_I2S
@@ -191,7 +191,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,6 +211,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_I2C
 	select ADK_KERNEL_SND_SOC_PCM512x
 	depends on ADK_TARGET_BOARD_BCM28XX
 

target/linux/config/Config.in.i2c

@@ -25,12 +25,16 @@ 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

target/linux/config/Config.in.input

@@ -133,6 +133,10 @@ config ADK_TARGET_USB_KEYBOARD
 	help
 	  Activate to get USB keyboard support.
 
+config ADK_KERNEL_HID_CHERRY
+       tristate "Cherry Cymotion keyboard"
+       depends on ADK_TARGET_USB_KEYBOARD
+
 config ADK_TARGET_USB_MOUSE
 	bool "enable mouse support"
 	depends on ADK_KERNEL_USB_HID