From 50aaadc70da1c7a849ded83517f5a4965871b5e7 Mon Sep 17 00:00:00 2001
From: Jens Lucius <info@jenslucius.de>
Date: Mon, 29 Feb 2016 21:15:23 +0100
Subject: [PATCH 1/7] Bump kernel and U-Boot

Bump mainline kernel to 4.4.3 (from 4.1.15)
Bump git kernel to 4.5 rc6 (from 4.4 rc5)
Bump U-Boot to 2016.01 (from 2015.10)

Signed-off-by: Jens Lucius info@jenslucius.com
---
 .../u-boot/{u-boot_2015.10.bb => u-boot_2016.01.bb}       | 4 ++--
 recipes-kernel/linux/{linux_4.1.15.bb => linux_4.4.3.bb}  | 4 ++--
 recipes-kernel/linux/linux_git.bb                         | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename recipes-bsp/u-boot/{u-boot_2015.10.bb => u-boot_2016.01.bb} (94%)
 rename recipes-kernel/linux/{linux_4.1.15.bb => linux_4.4.3.bb} (79%)

diff --git a/recipes-bsp/u-boot/u-boot_2015.10.bb b/recipes-bsp/u-boot/u-boot_2016.01.bb
similarity index 94%
rename from recipes-bsp/u-boot/u-boot_2015.10.bb
rename to recipes-bsp/u-boot/u-boot_2016.01.bb
index e8cdc11..5fcefbb 100644
--- a/recipes-bsp/u-boot/u-boot_2015.10.bb
+++ b/recipes-bsp/u-boot/u-boot_2016.01.bb
@@ -28,9 +28,9 @@ DEFAULT_PREFERENCE_sun7i="1"
 SRC_URI += "file://boot.cmd \
 "
 
-SRCREV = "5ec0003b19cbdf06ccd6941237cbc0d1c3468e2d"
+SRCREV = "fa85e826c16b9ce1ad302a57e9c4b24db0d8b930"
 
-PV = "v2015.10${SRCPV}"
+PV = "v2016.01${SRCPV}"
 
 PE = "1"
 
diff --git a/recipes-kernel/linux/linux_4.1.15.bb b/recipes-kernel/linux/linux_4.4.3.bb
similarity index 79%
rename from recipes-kernel/linux/linux_4.1.15.bb
rename to recipes-kernel/linux/linux_4.4.3.bb
index b565b3b..9fca467 100644
--- a/recipes-kernel/linux/linux_4.1.15.bb
+++ b/recipes-kernel/linux/linux_4.4.3.bb
@@ -16,8 +16,8 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
 S = "${WORKDIR}/linux-${PV}"
 	
-SRC_URI[md5sum] = "b227333912b161c96ff3e30f5041e1c0"
-SRC_URI[sha256sum] = "472288cc966188c5d7c511c6be0f78682843c9ca2d5d6c4d67d77455680359a3"
+SRC_URI[md5sum] = "5feab5a2c016e186e3088d4fae963ed7"
+SRC_URI[sha256sum] = "0b379cb19bbd7e38fc5a9a000ea927db55cce519a7400ec7fa705c581a6491dd"
 
 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 c22c062..079628a 100644
--- a/recipes-kernel/linux/linux_git.bb
+++ b/recipes-kernel/linux/linux_git.bb
@@ -14,13 +14,13 @@ RDEPENDS_kernel-base += "kernel-devicetree"
 
 # Default is to use stable kernel version
 # If you want to use latest git version set to "1"
-DEFAULT_PREFERENCE = "-1" 
+DEFAULT_PREFERENCE = "1" 
 
 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 	
-# 4.4 rc5
-PV = "4.3+4.4rc5.git${SRCPV}"
-SRCREV_pn-${PN} = "9f9499ae8e6415cefc4fe0a96ad0e27864353c89"
+# 4.5 rc6
+PV = "4.4+4.5rc6.git${SRCPV}"
+SRCREV_pn-${PN} = "fc77dbd34c5c99bce46d40a2491937c3bcbd10af"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;branch=master \
         file://defconfig \

From a5a64795223f0bd8d4f89e86e07fdb96913488e4 Mon Sep 17 00:00:00 2001
From: Jens Lucius <info@jenslucius.de>
Date: Tue, 1 Mar 2016 14:42:15 +0100
Subject: [PATCH 2/7] set default preference to mainline kernel

Signed-off-by: Jens Lucius info@jenslucius.com
---
 recipes-kernel/linux/linux_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-kernel/linux/linux_git.bb b/recipes-kernel/linux/linux_git.bb
index 079628a..22f8ca5 100644
--- a/recipes-kernel/linux/linux_git.bb
+++ b/recipes-kernel/linux/linux_git.bb
@@ -14,7 +14,7 @@ RDEPENDS_kernel-base += "kernel-devicetree"
 
 # Default is to use stable kernel version
 # If you want to use latest git version set to "1"
-DEFAULT_PREFERENCE = "1" 
+DEFAULT_PREFERENCE = "-1" 
 
 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 	

From ae9ea2876a994d63f38bf22877e6eea5543d2b8d Mon Sep 17 00:00:00 2001
From: Jens Lucius <info@jenslucius.de>
Date: Tue, 1 Mar 2016 14:51:31 +0100
Subject: [PATCH 3/7] fix u-boot build break with current master

The current yocto master adds a patch for the beaglebone to the u-boot.inc, which breaks the build.
Explicitly set SRC_URI to prevent that.

Signed-off-by: Jens Lucius info@jenslucius.com
---
 recipes-bsp/u-boot/u-boot_2016.01.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot_2016.01.bb b/recipes-bsp/u-boot/u-boot_2016.01.bb
index 5fcefbb..2a0ebbd 100644
--- a/recipes-bsp/u-boot/u-boot_2016.01.bb
+++ b/recipes-bsp/u-boot/u-boot_2016.01.bb
@@ -25,8 +25,8 @@ DEFAULT_PREFERENCE_sun4i="1"
 DEFAULT_PREFERENCE_sun5i="1"
 DEFAULT_PREFERENCE_sun7i="1"
 
-SRC_URI += "file://boot.cmd \
-"
+SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
+           file://boot.cmd"
 
 SRCREV = "fa85e826c16b9ce1ad302a57e9c4b24db0d8b930"
 

From eb616d74b2e45a88563c54bc3837321e7b3d9e9c Mon Sep 17 00:00:00 2001
From: Jens Lucius <info@jenslucius.de>
Date: Tue, 1 Mar 2016 15:01:00 +0100
Subject: [PATCH 4/7] Add CONFIG_INPUT_EVDEV to kernel config

Signed-off-by: Jens Lucius info@jenslucius.com
---
 recipes-kernel/linux/linux/defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-kernel/linux/linux/defconfig b/recipes-kernel/linux/linux/defconfig
index d16d39f..c1737b9 100644
--- a/recipes-kernel/linux/linux/defconfig
+++ b/recipes-kernel/linux/linux/defconfig
@@ -491,6 +491,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_SUN4I=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_AXP20X_PEK=y
+CONFIG_INPUT_EVDEV=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_NR_UARTS=8

From 5d98843b7dbf72705983f1abe418828644ab5ba2 Mon Sep 17 00:00:00 2001
From: Jens Lucius <info@jenslucius.de>
Date: Sun, 20 Mar 2016 19:15:03 +0100
Subject: [PATCH 5/7] Bump U-Boot to 2016.03

---
 recipes-bsp/u-boot/u-boot_2016.03.bb | 44 ++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 recipes-bsp/u-boot/u-boot_2016.03.bb

diff --git a/recipes-bsp/u-boot/u-boot_2016.03.bb b/recipes-bsp/u-boot/u-boot_2016.03.bb
new file mode 100644
index 0000000..e138287
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot_2016.03.bb
@@ -0,0 +1,44 @@
+DESCRIPTION="Upstream's U-boot configured for sunxi devices"
+
+require recipes-bsp/u-boot/u-boot.inc
+
+DEPENDS += "dtc-native"
+
+LICENSE = "GPLv2"
+
+LIC_FILES_CHKSUM = "\
+file://Licenses/Exceptions;md5=338a7cb1e52d0d1951f83e15319a3fe7 \
+file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
+file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
+file://Licenses/eCos-2.0.txt;md5=b338cb12196b5175acd3aa63b0a0805c \
+file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+file://Licenses/ibm-pibs.txt;md5=c49502a55e35e0a8a1dc271d944d6dba \
+file://Licenses/isc.txt;md5=ec65f921308235311f34b79d844587eb \
+file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
+file://Licenses/x11.txt;md5=b46f176c847b8742db02126fb8af92e2 \
+"
+
+COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i)"
+
+DEFAULT_PREFERENCE_sun4i="1"
+DEFAULT_PREFERENCE_sun5i="1"
+DEFAULT_PREFERENCE_sun7i="1"
+
+SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
+           file://boot.cmd"
+
+SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa"
+
+PV = "v2016.03${SRCPV}"
+
+PE = "1"
+
+SPL_BINARY="u-boot-sunxi-with-spl.bin"
+
+UBOOT_ENV_SUFFIX = "scr"
+UBOOT_ENV = "boot"
+
+do_compile_append() {
+    ${S}/tools/mkimage -C none -A arm -T script -d ${WORKDIR}/boot.cmd ${WORKDIR}/${UBOOT_ENV_BINARY}
+}

From 06828aab99427057bddba93c9fe8dac6c19dcc25 Mon Sep 17 00:00:00 2001
From: Jens Lucius <info@jenslucius.de>
Date: Sun, 20 Mar 2016 19:16:33 +0100
Subject: [PATCH 6/7] Remove old U-Boot

---
 recipes-bsp/u-boot/u-boot_2016.01.bb | 44 ----------------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot_2016.01.bb

diff --git a/recipes-bsp/u-boot/u-boot_2016.01.bb b/recipes-bsp/u-boot/u-boot_2016.01.bb
deleted file mode 100644
index 2a0ebbd..0000000
--- a/recipes-bsp/u-boot/u-boot_2016.01.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-DESCRIPTION="Upstream's U-boot configured for sunxi devices"
-
-require recipes-bsp/u-boot/u-boot.inc
-
-DEPENDS += "dtc-native"
-
-LICENSE = "GPLv2"
-
-LIC_FILES_CHKSUM = "\
-file://Licenses/Exceptions;md5=338a7cb1e52d0d1951f83e15319a3fe7 \
-file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
-file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
-file://Licenses/eCos-2.0.txt;md5=b338cb12196b5175acd3aa63b0a0805c \
-file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-file://Licenses/ibm-pibs.txt;md5=c49502a55e35e0a8a1dc271d944d6dba \
-file://Licenses/isc.txt;md5=ec65f921308235311f34b79d844587eb \
-file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
-file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
-file://Licenses/x11.txt;md5=b46f176c847b8742db02126fb8af92e2 \
-"
-
-COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i)"
-
-DEFAULT_PREFERENCE_sun4i="1"
-DEFAULT_PREFERENCE_sun5i="1"
-DEFAULT_PREFERENCE_sun7i="1"
-
-SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
-           file://boot.cmd"
-
-SRCREV = "fa85e826c16b9ce1ad302a57e9c4b24db0d8b930"
-
-PV = "v2016.01${SRCPV}"
-
-PE = "1"
-
-SPL_BINARY="u-boot-sunxi-with-spl.bin"
-
-UBOOT_ENV_SUFFIX = "scr"
-UBOOT_ENV = "boot"
-
-do_compile_append() {
-    ${S}/tools/mkimage -C none -A arm -T script -d ${WORKDIR}/boot.cmd ${WORKDIR}/${UBOOT_ENV_BINARY}
-}

From 8c13f0de1beedb0f5fadae7be080381a0d837e13 Mon Sep 17 00:00:00 2001
From: Jens Lucius <info@jenslucius.de>
Date: Sun, 20 Mar 2016 19:17:15 +0100
Subject: [PATCH 7/7] Bump Kernel versions

Stable kernel to 4.4.6
Git kernel to 4.5

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

diff --git a/recipes-kernel/linux/linux_4.4.3.bb b/recipes-kernel/linux/linux_4.4.6.bb
similarity index 79%
rename from recipes-kernel/linux/linux_4.4.3.bb
rename to recipes-kernel/linux/linux_4.4.6.bb
index 9fca467..dd73ff4 100644
--- a/recipes-kernel/linux/linux_4.4.3.bb
+++ b/recipes-kernel/linux/linux_4.4.6.bb
@@ -16,8 +16,8 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
 S = "${WORKDIR}/linux-${PV}"
 	
-SRC_URI[md5sum] = "5feab5a2c016e186e3088d4fae963ed7"
-SRC_URI[sha256sum] = "0b379cb19bbd7e38fc5a9a000ea927db55cce519a7400ec7fa705c581a6491dd"
+SRC_URI[md5sum] = "efc822dad2149e40cc908718a4fea1d3"
+SRC_URI[sha256sum] = "a3bccec4c28939355cd415672414583ecaf5531a87ddb44c9dc036aeacec577d"
 
 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 22f8ca5..a958d51 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.5 rc6
-PV = "4.4+4.5rc6.git${SRCPV}"
-SRCREV_pn-${PN} = "fc77dbd34c5c99bce46d40a2491937c3bcbd10af"
+# 4.5.0
+PV = "4.4+4.5.0.git${SRCPV}"
+SRCREV_pn-${PN} = "b562e44f507e863c6792946e4e1b1449fbbac85d"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;branch=master \
         file://defconfig \