From 318625075d94f1c68b781255c21b77a17d5e55ab Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 1 Apr 2014 15:34:27 -0500
Subject: [PATCH] merge to:
https://github.com/RobertCNelson/linux/commit/683b6c6f82a60fabf47012581c2cfbf1b037ab95
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
patches/defconfig | 4 ++++
patches/example_imx_v6_v7_defconfig | 4 ++++
patches/example_omap2plus_defconfig | 4 ++++
patches/ref_multi_v7_defconfig | 4 ++++
version.sh | 4 ++--
5 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/patches/defconfig b/patches/defconfig
index ae63bd334..87f1f7bcc 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -4458,6 +4458,10 @@ CONFIG_SUN5I_HSTIMER=y
CONFIG_ARM_ARCH_TIMER=y
CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
CONFIG_VF_PIT_TIMER=y
+# CONFIG_SH_TIMER_CMT is not set
+# CONFIG_SH_TIMER_MTU2 is not set
+# CONFIG_SH_TIMER_TMU is not set
+# CONFIG_EM_TIMER_STI is not set
CONFIG_MAILBOX=y
CONFIG_OMAP_MBOX=y
CONFIG_OMAP2PLUS_MBOX=y
diff --git a/patches/example_imx_v6_v7_defconfig b/patches/example_imx_v6_v7_defconfig
index 9c9df35d4..65137b730 100644
--- a/patches/example_imx_v6_v7_defconfig
+++ b/patches/example_imx_v6_v7_defconfig
@@ -3006,6 +3006,10 @@ CONFIG_COMMON_CLK=y
CONFIG_CLKSRC_OF=y
CONFIG_CLKSRC_MMIO=y
CONFIG_VF_PIT_TIMER=y
+# CONFIG_SH_TIMER_CMT is not set
+# CONFIG_SH_TIMER_MTU2 is not set
+# CONFIG_SH_TIMER_TMU is not set
+# CONFIG_EM_TIMER_STI is not set
# CONFIG_MAILBOX is not set
# CONFIG_IOMMU_SUPPORT is not set
diff --git a/patches/example_omap2plus_defconfig b/patches/example_omap2plus_defconfig
index 05c464191..180084e09 100644
--- a/patches/example_omap2plus_defconfig
+++ b/patches/example_omap2plus_defconfig
@@ -2624,6 +2624,10 @@ CONFIG_CLKSRC_OF=y
CONFIG_CLKSRC_MMIO=y
CONFIG_ARM_ARCH_TIMER=y
CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+# CONFIG_SH_TIMER_CMT is not set
+# CONFIG_SH_TIMER_MTU2 is not set
+# CONFIG_SH_TIMER_TMU is not set
+# CONFIG_EM_TIMER_STI is not set
# CONFIG_MAILBOX is not set
CONFIG_IOMMU_SUPPORT=y
CONFIG_OF_IOMMU=y
diff --git a/patches/ref_multi_v7_defconfig b/patches/ref_multi_v7_defconfig
index 64e551b8b..a7fc922eb 100644
--- a/patches/ref_multi_v7_defconfig
+++ b/patches/ref_multi_v7_defconfig
@@ -3503,6 +3503,10 @@ CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
CONFIG_ARM_GLOBAL_TIMER=y
CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
CONFIG_VF_PIT_TIMER=y
+# CONFIG_SH_TIMER_CMT is not set
+# CONFIG_SH_TIMER_MTU2 is not set
+# CONFIG_SH_TIMER_TMU is not set
+# CONFIG_EM_TIMER_STI is not set
CONFIG_MAILBOX=y
CONFIG_PL320_MBOX=y
# CONFIG_OMAP2PLUS_MBOX is not set
diff --git a/version.sh b/version.sh
index 9e586533c..f4cc0de7a 100644
--- a/version.sh
+++ b/version.sh
@@ -29,10 +29,10 @@ toolchain="gcc_linaro_gnueabihf_4_8"
#Kernel/Build
KERNEL_REL=3.14
KERNEL_TAG=${KERNEL_REL}
-BUILD=armv7-devel-r1
+BUILD=armv7-devel-r2
#v3.X-rcX + upto SHA
-KERNEL_SHA="01d5f3b598b18a5035426c30801adf65822dbd0c"
+KERNEL_SHA="683b6c6f82a60fabf47012581c2cfbf1b037ab95"
#git branch
#BRANCH="v3.15.x"
--
GitLab