From 4e261ffb96d8fd76803aa17bc21ded0d4d2157ca Mon Sep 17 00:00:00 2001
From: Jens Lucius <info@jenslucius.de>
Date: Mon, 21 Sep 2015 15:51:56 +0200
Subject: [PATCH] update kernel versions

- Update kernel from 4.1.3 to 4.1.7
- Update git kernel from 4.2rc4 to 4.3rc2
- Sync defconfig with latest version

Signed-off-by: Jens Lucius <info@jenslucius.com>
---
 recipes-kernel/linux/linux/defconfig                    | 8 ++++++++
 recipes-kernel/linux/{linux_4.1.3.bb => linux_4.1.7.bb} | 4 ++--
 recipes-kernel/linux/linux_git.bb                       | 6 +++---
 3 files changed, 13 insertions(+), 5 deletions(-)
 rename recipes-kernel/linux/{linux_4.1.3.bb => linux_4.1.7.bb} (79%)

diff --git a/recipes-kernel/linux/linux/defconfig b/recipes-kernel/linux/linux/defconfig
index b5527e7..d16d39f 100644
--- a/recipes-kernel/linux/linux/defconfig
+++ b/recipes-kernel/linux/linux/defconfig
@@ -3,6 +3,7 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_FHANDLE=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
+CONFIG_CGROUPS=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASKSTATS=y
@@ -500,6 +501,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MV64XXX=y
+CONFIG_I2C_SUN6I_P2WI=y
 CONFIG_SPI=y
 CONFIG_SPI_SUN4I=y
 CONFIG_SPI_SUN6I=y
@@ -716,7 +718,12 @@ CONFIG_RTC_CLASS=y
 # CONFIG_RTC_INTF_PROC is not set
 CONFIG_RTC_DRV_SUN6I=y
 CONFIG_RTC_DRV_SUNXI=y
+CONFIG_DMADEVICES=y
+CONFIG_DMA_SUN6I=y
 # CONFIG_IOMMU_SUPPORT is not set
+CONFIG_EXTCON=y
+CONFIG_PWM=y
+CONFIG_PWM_SUN4I=y
 CONFIG_PHY_SUN4I_USB=y
 CONFIG_PHY_SUN9I_USB=y
 CONFIG_EXT4_FS=y
@@ -732,6 +739,7 @@ CONFIG_ROOT_NFS=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_PRINTK_TIME=y
+CONFIG_CRYPTO_DEV_SUN4I_SS=y
 CONFIG_ARM_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM_NEON=y
 CONFIG_CRYPTO_SHA256_ARM=y
diff --git a/recipes-kernel/linux/linux_4.1.3.bb b/recipes-kernel/linux/linux_4.1.7.bb
similarity index 79%
rename from recipes-kernel/linux/linux_4.1.3.bb
rename to recipes-kernel/linux/linux_4.1.7.bb
index e8a0a5f..8a5e4a0 100644
--- a/recipes-kernel/linux/linux_4.1.3.bb
+++ b/recipes-kernel/linux/linux_4.1.7.bb
@@ -16,8 +16,8 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
 S = "${WORKDIR}/linux-${PV}"
 	
-SRC_URI[md5sum] = "96c2c77b1c54ba01cfd8fc2d13fbf828"
-SRC_URI[sha256sum] = "96dd2c30984408a8a2211463618c3564514239f1e4335f6bc461c4b9a9bae30b"
+SRC_URI[md5sum] = "e94aaf24b20aa8d148a271398cdafa40"
+SRC_URI[sha256sum] = "76719c1c9326b7ab7f4305a82478389813c3571120f858491ba05d30d5b62d3c"
 
 SRC_URI += "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \
         file://defconfig \
diff --git a/recipes-kernel/linux/linux_git.bb b/recipes-kernel/linux/linux_git.bb
index 4c3386c..a9ce67f 100644
--- a/recipes-kernel/linux/linux_git.bb
+++ b/recipes-kernel/linux/linux_git.bb
@@ -18,9 +18,9 @@ DEFAULT_PREFERENCE = "-1"
 
 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 	
-# 4.2 rc4
-PV = "4.1+4.2rc4.git${SRCPV}"
-SRCREV_pn-${PN} = "cbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f"
+# 4.3 rc2
+PV = "4.1+4.3rc2.git${SRCPV}"
+SRCREV_pn-${PN} = "1f93e4a96c9109378204c147b3eec0d0e8100fde"
 
 SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;branch=master \
         file://defconfig \