diff --git a/recipes-kernel/linux/linux-riscv-common.inc b/recipes-kernel/linux/linux-riscv-common.inc
new file mode 100644
index 0000000..75c0181
--- /dev/null
+++ b/recipes-kernel/linux/linux-riscv-common.inc
@@ -0,0 +1,28 @@
+DESCRIPTION = "RISC-V Linux Kernel"
+SECTION = "kernel"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+inherit kernel
+require recipes-kernel/linux/linux-yocto.inc
+
+SRC_URI = "\
+    git://github.com/riscv/riscv-linux.git;branch=${BRANCH} \
+    file://earlyprintk.cfg \
+"
+
+LINUX_VERSION_EXTENSION = "-riscv"
+
+PV = "${LINUX_VERSION}+git${SRCPV}"
+
+DEPENDS_append = " libgcc"
+
+KBUILD_DEFCONFIG_qemuriscv64 = "defconfig"
+KCONFIG_MODE="--alldefconfig"
+
+KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS} ${SECURITY_NOPIE_CFLAGS}"
+KERNEL_LD_append = " -no-pie"
+
+COMPATIBLE_MACHINE = "(qemuriscv64)"
+
+KERNEL_FEATURES_remove = "features/debug/printk.scc"
diff --git a/recipes-kernel/linux/linux-riscv_4.15.bb b/recipes-kernel/linux/linux-riscv_4.15.bb
index a4414c4..e91fb61 100644
--- a/recipes-kernel/linux/linux-riscv_4.15.bb
+++ b/recipes-kernel/linux/linux-riscv_4.15.bb
@@ -1,32 +1,6 @@
-DESCRIPTION = "RISC-V Linux Kernel"
-SECTION = "kernel"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-
-inherit kernel
-require recipes-kernel/linux/linux-yocto.inc
-
-SRC_URI = "\
-    git://github.com/riscv/riscv-linux.git;branch=${BRANCH} \
-    file://earlyprintk.cfg \
-"
+require recipes-kernel/linux/linux-riscv-common.inc
 
 LINUX_VERSION ?= "4.15"
-LINUX_VERSION_EXTENSION_append = "-riscv"
 
 BRANCH = "riscv-linux-4.15"
 SRCREV = "2b0aa1de45f63535f6d26757aa22b48515289302"
-
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-DEPENDS_append = " libgcc"
-
-KBUILD_DEFCONFIG_qemuriscv64 = "defconfig"
-KCONFIG_MODE="--alldefconfig"
-
-KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS} ${SECURITY_NOPIE_CFLAGS}"
-KERNEL_LD_append = " -no-pie"
-
-COMPATIBLE_MACHINE = "(qemuriscv64)"
-
-KERNEL_FEATURES_remove = "features/debug/printk.scc"
diff --git a/recipes-kernel/linux/linux-riscv_4.16.bb b/recipes-kernel/linux/linux-riscv_4.16.bb
index 256891c..8ea11c6 100644
--- a/recipes-kernel/linux/linux-riscv_4.16.bb
+++ b/recipes-kernel/linux/linux-riscv_4.16.bb
@@ -1,32 +1,6 @@
-DESCRIPTION = "RISC-V Linux Kernel"
-SECTION = "kernel"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-
-inherit kernel
-require recipes-kernel/linux/linux-yocto.inc
-
-SRC_URI = "\
-    git://github.com/riscv/riscv-linux.git;branch=${BRANCH} \
-    file://earlyprintk.cfg \
-"
+require recipes-kernel/linux/linux-riscv-common.inc
 
 LINUX_VERSION ?= "4.16-rc5"
-LINUX_VERSION_EXTENSION_append = "-riscv"
 
 BRANCH = "riscv-all"
 SRCREV = "7f82cffaad50273eedb654b58167c662383eac99"
-
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-DEPENDS_append = " libgcc"
-
-KBUILD_DEFCONFIG_qemuriscv64 = "defconfig"
-KCONFIG_MODE="--alldefconfig"
-
-KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS} ${SECURITY_NOPIE_CFLAGS}"
-KERNEL_LD_append = " -no-pie"
-
-COMPATIBLE_MACHINE = "(qemuriscv64)"
-
-KERNEL_FEATURES_remove = "features/debug/printk.scc"