diff --git a/patches/defconfig b/patches/defconfig
index ae63bd334c44ce15cc60848ccf7f1b65816085f5..87f1f7bcc45d99bcdbd54e7a42e6070d9a609a60 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 9c9df35d4716cbafa36076cb4a0df42c1d4dbe5c..65137b730da150ed525c6d8cc93df9ea797711d4 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 05c464191c6f53ab868d897ac06293f8235f6eb3..180084e09c2a39f51f8af022b7744b6d0720f2ea 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 64e551b8bb5f675d2c6e9e9dd697cf6353d8a6f9..a7fc922ebb09cb52bd458df4a9bc97a41ec9e3d6 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 9e586533ca486d6476d077740d599b52de3e01b7..f4cc0de7a02bb55f8322e52cc1085fc8688be63f 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"