From 008229cfaffc1ca9cb8d46a55d1f72cfa9de6391 Mon Sep 17 00:00:00 2001
From: dir <dir@ableton.com>
Date: Tue, 11 Apr 2017 16:40:08 +0200
Subject: Fix hifiberry dacplus missing I2C dependencies

---
 target/linux/config/Config.in.audio | 1 +
 target/linux/config/Config.in.i2c   | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index d7518b733..bd766ca1b 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -211,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
 
diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c
index 6d33e81cd..c3cb0fa89 100644
--- a/target/linux/config/Config.in.i2c
+++ b/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
-- 
cgit v1.2.3


From 6f43ed9bd0b65ee9165176de9d1309bf113cbfbf Mon Sep 17 00:00:00 2001
From: dir <dir@ableton.com>
Date: Tue, 11 Apr 2017 16:40:31 +0200
Subject: Add Cherry HID keyboard miniconfig support

---
 target/linux/config/Config.in.input | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 5560e22a5..f95d5faa8 100644
--- a/target/linux/config/Config.in.input
+++ b/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
-- 
cgit v1.2.3


From 88a1c3f61b9f97cda3f6e88608b40b40d99d4a74 Mon Sep 17 00:00:00 2001
From: csk <csk@ableton.com>
Date: Fri, 7 Apr 2017 17:17:41 +0200
Subject: Fix CXX variable when using ccache

---
 mk/vars.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/vars.mk b/mk/vars.mk
index eca2c2fd3..912fa5e73 100644
--- a/mk/vars.mk
+++ b/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
-- 
cgit v1.2.3