diff --git a/conf/machine/include/sunxi.inc b/conf/machine/include/sunxi.inc
index ef03bed..ef8271f 100644
--- a/conf/machine/include/sunxi.inc
+++ b/conf/machine/include/sunxi.inc
@@ -12,7 +12,7 @@ XSERVER = "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
 PREFERRED_PROVIDER_u-boot ?= "u-boot"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
 
diff --git a/recipes-kernel/linux/linux_4.13.4.bb b/recipes-kernel/linux/linux-mainline_4.14.2.bb
similarity index 71%
rename from recipes-kernel/linux/linux_4.13.4.bb
rename to recipes-kernel/linux/linux-mainline_4.14.2.bb
index ab35e69..9f2078b 100644
--- a/recipes-kernel/linux/linux_4.13.4.bb
+++ b/recipes-kernel/linux/linux-mainline_4.14.2.bb
@@ -2,7 +2,7 @@ SECTION = "kernel"
 DESCRIPTION = "Mainline Linux kernel"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i)"
+COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i)"
 
 inherit kernel
 
@@ -15,8 +15,8 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
 S = "${WORKDIR}/linux-${PV}"
 	
-SRC_URI[md5sum] = "907447893b977c791934960a73b7fa00"
-SRC_URI[sha256sum] = "a09e95eb59de505cec462f3008148bcf7f5b8ed0e9e19f3e129d13a7a8d8f420"
+SRC_URI[md5sum] = "0164a000bd7b302037de4e91dff3018b"
+SRC_URI[sha256sum] = "e92690620a4e4811c6b37b2f1b6c9b32a1dde40aa12be6527c8dc215fb27464c"
 
 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-mainline_git.bb
similarity index 87%
rename from recipes-kernel/linux/linux_git.bb
rename to recipes-kernel/linux/linux-mainline_git.bb
index 4c33f7e..f57cc8c 100644
--- a/recipes-kernel/linux/linux_git.bb
+++ b/recipes-kernel/linux/linux-mainline_git.bb
@@ -17,9 +17,9 @@ DEFAULT_PREFERENCE = "-1"
 
 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 	
-# 4.14-rc3
-PV = "4.14+git${SRCPV}"
-SRCREV_pn-${PN} = "9e66317d3c92ddaab330c125dfe9d06eee268aff"
+# 4.15-rc1
+PV = "4.15+git${SRCPV}"
+SRCREV_pn-${PN} = "4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;branch=master \
         file://defconfig \
diff --git a/recipes-kernel/linux/linux_4.4.89.bb b/recipes-kernel/linux/linux_4.4.89.bb
deleted file mode 100644
index 00322dd..0000000
--- a/recipes-kernel/linux/linux_4.4.89.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "Mainline Linux kernel"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i)"
-
-inherit kernel
-
-require linux.inc
-
-# Pull in the devicetree files into the rootfs
-RDEPENDS_kernel-base += "kernel-devicetree"
-
-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
-
-S = "${WORKDIR}/linux-${PV}"
-
-SRC_URI[md5sum] = "5588e6bed5235a97d305dd82d0d4758f"
-SRC_URI[sha256sum] = "a81d1b1306e4fddee5d6f7219090a616073b02f4069e44522a9c0454b17f2b67"
-
-SRC_URI = "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \
-        file://defconfig \
-        "