diff --git a/recipes-kernel/linux/linux-starfive-dev.bb b/recipes-kernel/linux/linux-starfive-dev.bb
index 1e48995..06f3668 100644
--- a/recipes-kernel/linux/linux-starfive-dev.bb
+++ b/recipes-kernel/linux/linux-starfive-dev.bb
@@ -6,17 +6,33 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 KERNEL_VERSION_SANITY_SKIP = "1"
 
 SRCREV = "${AUTOREV}"
+
+# pin srcrev for now to have a fixed target
+# release v2.6.0
+SRCREV:visionfive2 = "162a9afb0b009393f4f21ee8c20d773131fd6b1e"
+
 BRANCH = "visionfive"
+BRANCH:visionfive2 = "JH7110_VisionFive2_devel"
 FORK ?= "starfive-tech"
 SRC_URI = "git://github.com/${FORK}/linux.git;protocol=https;branch=${BRANCH} \
-           file://extra.cfg \
            file://modules.cfg \
           "
+SRC_URI:append:beaglev-starlight-jh7100 = " \
+           file://extra.cfg \
+"
+SRC_URI:append:visionfive = " \
+           file://extra.cfg \
+"
+
+SRC_URI:append:visionfive2 = " \
+          file://0004-riscv-fix-build-with-binutils-2.38.patch \
+          "
 
 LINUX_VERSION ?= "6.2.0"
 LINUX_VERSION_EXTENSION:append:beaglev-starlight-jh7100 = "-starlight"
 
 KBUILD_DEFCONFIG:beaglev-starlight-jh7100 = "starfive_jh7100_fedora_defconfig"
 KBUILD_DEFCONFIG:visionfive = "visionfive_defconfig"
+KBUILD_DEFCONFIG:visionfive2 = "starfive_visionfive2_defconfig"
 
-COMPATIBLE_MACHINE = "(beaglev-starlight-jh7100|visionfive)"
+COMPATIBLE_MACHINE = "(beaglev-starlight-jh7100|visionfive|visionfive2)"
diff --git a/recipes-kernel/linux/linux-starfive/0004-riscv-fix-build-with-binutils-2.38.patch b/recipes-kernel/linux/linux-starfive/0004-riscv-fix-build-with-binutils-2.38.patch
new file mode 100644
index 0000000..15b5285
--- /dev/null
+++ b/recipes-kernel/linux/linux-starfive/0004-riscv-fix-build-with-binutils-2.38.patch
@@ -0,0 +1,55 @@
+From 46602fe7729b285a823a1bab49d5f77e643be021 Mon Sep 17 00:00:00 2001
+From: Cezary Sobczak <cezary.sobczak@3mdeb.com>
+Date: Wed, 23 Mar 2022 23:34:37 +0100
+Subject: [PATCH] riscv: fix build with binutils 2.38
+
+Original source of this patch:
+- https://lore.kernel.org/lkml/YgVRu9Z0BDyJdjR5@kroah.com/T/
+
+From version 2.38, binutils default to ISA spec version 20191213. This
+means that the csr read/write (csrr*/csrw*) instructions and fence.i
+instruction has separated from the `I` extension, become two standalone
+extensions: Zicsr and Zifencei. As the kernel uses those instruction,
+this causes the following build failure:
+
+  CC      arch/riscv/kernel/vdso/vgettimeofday.o
+  <<BUILDDIR>>/arch/riscv/include/asm/vdso/gettimeofday.h: Assembler messages:
+  <<BUILDDIR>>/arch/riscv/include/asm/vdso/gettimeofday.h:71: Error: unrecognized opcode `csrr a5,0xc01'
+  <<BUILDDIR>>/arch/riscv/include/asm/vdso/gettimeofday.h:71: Error: unrecognized opcode `csrr a5,0xc01'
+  <<BUILDDIR>>/arch/riscv/include/asm/vdso/gettimeofday.h:71: Error: unrecognized opcode `csrr a5,0xc01'
+  <<BUILDDIR>>/arch/riscv/include/asm/vdso/gettimeofday.h:71: Error: unrecognized opcode `csrr a5,0xc01'
+
+The fix is to specify those extensions explicitely in -march. However as
+older binutils version do not support this, we first need to detect
+that.
+
+Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
+Tested-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
+Cc: stable@vger.kernel.org
+Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Cezary Sobczak <cezary.sobczak@3mdeb.com>
+---
+ arch/riscv/Makefile | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
+index 8a107ed18b0d..7d81102cffd4 100644
+--- a/arch/riscv/Makefile
++++ b/arch/riscv/Makefile
+@@ -50,6 +50,12 @@ riscv-march-$(CONFIG_ARCH_RV32I)	:= rv32ima
+ riscv-march-$(CONFIG_ARCH_RV64I)	:= rv64ima
+ riscv-march-$(CONFIG_FPU)		:= $(riscv-march-y)fd
+ riscv-march-$(CONFIG_RISCV_ISA_C)	:= $(riscv-march-y)c
++
++# Newer binutils versions default to ISA spec version 20191213 which moves some
++# instructions from the I extension to the Zicsr and Zifencei extensions.
++toolchain-need-zicsr-zifencei := $(call cc-option-yn, -march=$(riscv-march-y)_zicsr_zifencei)
++riscv-march-$(toolchain-need-zicsr-zifencei) := $(riscv-march-y)_zicsr_zifencei
++
+ KBUILD_CFLAGS += -march=$(subst fd,,$(riscv-march-y))
+ KBUILD_AFLAGS += -march=$(riscv-march-y)
+ 
+-- 
+2.25.1
+