From 738dd723bf3546143edb639fde8f855450eb1993 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 4 Feb 2014 08:39:47 -0600
Subject: [PATCH] sync with debian 3.12.9

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 patches/debian-armmp    |  6 +++---
 patches/defconfig       |  8 ++++----
 tools/config-checker.sh | 12 ++++++++++++
 tools/debian-checker.sh | 12 ------------
 version.sh              |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/patches/debian-armmp b/patches/debian-armmp
index 36e779ef3..a00007ec5 100644
--- a/patches/debian-armmp
+++ b/patches/debian-armmp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.12.8 Kernel Configuration
+# Linux/arm 3.12.9 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_MIGHT_HAVE_PCI=y
@@ -4207,7 +4207,7 @@ CONFIG_HID_DRAGONRISE=m
 CONFIG_DRAGONRISE_FF=y
 CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
-# CONFIG_HID_ELO is not set
+CONFIG_HID_ELO=m
 CONFIG_HID_EZKEY=y
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
@@ -4261,7 +4261,7 @@ CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XINMO is not set
+CONFIG_HID_XINMO=m
 CONFIG_HID_ZEROPLUS=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
diff --git a/patches/defconfig b/patches/defconfig
index cf41f44de..41cbace18 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -2375,11 +2375,11 @@ CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
 # CONFIG_HVC_DCC is not set
 # CONFIG_VIRTIO_CONSOLE is not set
 # CONFIG_IPMI_HANDLER is not set
-CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM=m
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 # CONFIG_HW_RANDOM_ATMEL is not set
-CONFIG_HW_RANDOM_OMAP=y
-CONFIG_HW_RANDOM_OMAP3_ROM=y
+CONFIG_HW_RANDOM_OMAP=m
+CONFIG_HW_RANDOM_OMAP3_ROM=m
 # CONFIG_HW_RANDOM_VIRTIO is not set
 # CONFIG_HW_RANDOM_EXYNOS is not set
 # CONFIG_NVRAM is not set
@@ -3156,7 +3156,7 @@ CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
 CONFIG_VIDEO_EM28XX_RC=m
 CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_DM6446_CCDC=m
+# CONFIG_VIDEO_DM6446_CCDC is not set
 CONFIG_VIDEO_OMAP2_VOUT_VRFB=y
 CONFIG_VIDEO_OMAP2_VOUT=m
 # CONFIG_VIDEO_TIMBERDALE is not set
diff --git a/tools/config-checker.sh b/tools/config-checker.sh
index 67fa4daf6..0e9e5f701 100755
--- a/tools/config-checker.sh
+++ b/tools/config-checker.sh
@@ -2,6 +2,18 @@
 
 DIR=$PWD
 
+check_config_value () {
+	unset test_config
+	test_config=$(grep "${config}=" ${DIR}/patches/defconfig || true)
+	if [ "x${test_config}" = "x" ] ; then
+		echo "echo ${config}=${value} >> ./KERNEL/.config"
+	else
+		if [ ! "x${test_config}" = "x${config}=${value}" ] ; then
+			echo "sed -i -e 's:${test_config}:${config}=${value}:g' ./KERNEL/.config"
+		fi
+	fi
+}
+
 check_config_builtin () {
 	unset test_config
 	test_config=$(grep "${config}=y" ${DIR}/patches/defconfig || true)
diff --git a/tools/debian-checker.sh b/tools/debian-checker.sh
index 6685c03cf..7e5aa0c24 100755
--- a/tools/debian-checker.sh
+++ b/tools/debian-checker.sh
@@ -1242,12 +1242,6 @@ config="CONFIG_SERIAL_FSL_LPUART_CONSOLE"
 check_config_builtin
 config="CONFIG_VIRTIO_CONSOLE"
 check_config_disable
-config="CONFIG_HW_RANDOM"
-check_config_builtin
-config="CONFIG_HW_RANDOM_OMAP"
-check_config_builtin
-config="CONFIG_HW_RANDOM_OMAP3_ROM"
-check_config_builtin
 config="CONFIG_HW_RANDOM_VIRTIO"
 check_config_disable
 config="CONFIG_I2C_CHARDEV"
@@ -1645,8 +1639,6 @@ check_config_module
 #
 # Webcam, TV (analog/digital) USB devices
 #
-config="CONFIG_VIDEO_DM6446_CCDC"
-check_config_module
 config="CONFIG_VIDEO_OMAP3"
 check_config_module
 config="CONFIG_VIDEO_OMAP3_DEBUG"
@@ -1951,14 +1943,10 @@ check_config_builtin
 #
 config="CONFIG_HID_APPLEIR"
 check_config_module
-config="CONFIG_HID_ELO"
-check_config_module
 config="CONFIG_HID_PICOLCD_LCD"
 check_config_builtin
 config="CONFIG_SONY_FF"
 check_config_builtin
-config="CONFIG_HID_XINMO"
-check_config_module
 
 #
 # I2C HID support
diff --git a/version.sh b/version.sh
index 0d45c534d..ff598d7cb 100644
--- a/version.sh
+++ b/version.sh
@@ -29,7 +29,7 @@ toolchain="gcc_linaro_gnueabihf_4_8"
 #Kernel/Build
 KERNEL_REL=3.14
 KERNEL_TAG=${KERNEL_REL}-rc1
-BUILD=armv7-devel-r46
+BUILD=armv7-devel-r47
 
 #v3.X-rcX + upto SHA
 #KERNEL_SHA="8a1f006ad302ea178aefb1f8c67e679c696289e9"
-- 
GitLab