Browse Source

Merge branch 'starfive-kirkstone' into 'dev/dubhe_nfs_tty_mask'

# Conflicts:
#   recipes-bsp/u-boot/u-boot-starfive.bb
Rebecca Chang 5 months ago
parent
commit
8874eccc87
30 changed files with 134 additions and 107 deletions
  1. 1 1
      README.md
  2. 4 0
      conf/machine/starfive-dubhe.conf
  3. 3 0
      conf/machine/starfive-jh8100.conf
  4. 4 4
      conf/machine/starfive-visionfive2.conf
  5. 0 21
      recipes-benchmark/dhrystone/dhrystone/dhrystone-edit-compiler-flags.patch
  6. 0 26
      recipes-benchmark/dhrystone/dhrystone_2.1.bb
  7. 5 0
      recipes-benchmark/dhrystone/dhrystone_2.1.bbappend
  8. 41 0
      recipes-bsp/opensbi/opensbi_%.bbappend
  9. 0 18
      recipes-bsp/opensbi/opensbi_1.0.bbappend
  10. 3 23
      recipes-bsp/opensbi/opensbi_1.2.bb
  11. 2 2
      recipes-bsp/starfive-tool/starfive-tool.bb
  12. BIN
      recipes-bsp/u-boot/files/run_qemu_virt.dtb
  13. 7 3
      recipes-bsp/u-boot/u-boot-starfive.bb
  14. 0 0
      recipes-devtools/openocd/openocd/0001-autosetup-cc-check-tools-check-only-the-name.patch
  15. 0 0
      recipes-devtools/openocd/openocd/Dubhe_FPGA_openocd.patch
  16. 0 0
      recipes-devtools/openocd/openocd/dubhe_olimex-openocd_s5.cfg
  17. 0 0
      recipes-devtools/openocd/openocd/dubhe_olimex_flash_write.cfg
  18. 0 0
      recipes-devtools/openocd/openocd/jh8100_0150_f1.cfg
  19. 0 0
      recipes-devtools/openocd/openocd/jh8100_0150_f2.cfg
  20. 0 0
      recipes-devtools/openocd/openocd/jh8100_jrc.cfg
  21. 16 0
      recipes-devtools/openocd/openocd_riscv.bb
  22. 6 2
      recipes-devtools/openocd/openocd_riscv.bbappend
  23. 38 0
      recipes-kernel/linux/files/0001-riscv-fix-building-external-modules.patch
  24. 0 1
      recipes-kernel/linux/linux-mainline_%.bbappend
  25. 1 0
      recipes-kernel/linux/linux-starfive-dev_5.15.0.bb
  26. 1 1
      recipes-kernel/modules/jpu-module/Makefile
  27. 1 1
      recipes-kernel/modules/vdec-module/Makefile
  28. 1 1
      recipes-kernel/modules/venc-module/Makefile
  29. 0 1
      setup.sh
  30. 0 2
      tools/manifests/starfive.xml

+ 1 - 1
README.md

@@ -1,7 +1,7 @@
 # StarFive Linux Software Development Kit (SDK)
 
 The StarFive Dubhe Linux SDK is based on Yocto Project. It enables the creation of Linux distributions for any embedded project, as well as easy migration from a different architecture platform. 
-The meta-starfive layer is built on top of meta-riscv to provide additional modifications such as Linux Kernel, and toolchains like GCC and LLVM.
+The meta-starfive layer provides additional modifications such as Linux Kernel, and toolchains like GCC and LLVM.
 
 
 ## Supported Features

+ 4 - 0
conf/machine/starfive-dubhe.conf

@@ -51,12 +51,16 @@ BINUVERSION = "2.39"
 GCCVERSION = "12.2.0"
 QEMUVERSION = "7.2.0"
 PREFERRED_VERSION_opensbi = "1.2"
+PREFERRED_VERSION_openocd = "riscv"
+PREFERRED_VERSION_openocd-native = "riscv"
 #
 ###IMAGE_FSTYPES += "wic.gz wic.bmap ext4 cpio"
 
 #UBOOT_CONFIG = "defconfig"
 
 UBOOT_MACHINE = "starfive_dubhe_fpga_defconfig"
+#UBOOT_MACHINE = "qemu-riscv64_spl_defconfig"
+
 UBOOT_DTB_BINARY = "dubhe_fpga.dtb"
 
 SPL_BINARY = "spl/u-boot-spl.bin"

+ 3 - 0
conf/machine/starfive-jh8100.conf

@@ -28,6 +28,8 @@ GLIBCVERSION = "2.36"
 BINUVERSION = "2.39"
 GCCVERSION = "12.2.0"
 QEMUVERSION = "7.2.0"
+PREFERRED_VERSION_openocd = "riscv"
+PREFERRED_VERSION_openocd-native = "riscv"
 PREFERRED_VERSION_opensbi ?= "1.2"
 PREFERRED_VERSION_xserver-xorg = "1.20.13"
 PREFERRED_VERSION_mbedtls = "3.4.0"
@@ -51,6 +53,7 @@ UBOOT_ENV ?= "boot"
 UBOOT_ENV_SUFFIX = "scr.uimg"
 
 UBOOT_MACHINE = "starfive_jh8100_defconfig"
+#UBOOT_MACHINE = "qemu-riscv64_spl_defconfig"
 UBOOT_DTB_BINARY = "jh8100-fpga.dtb"
 
 SPL_BINARY = "spl/u-boot-spl.bin"

+ 4 - 4
conf/machine/starfive-visionfive2.conf

@@ -22,10 +22,10 @@ PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa-pvr"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "visionfive2-pvr-graphics"
 PREFERRED_PROVIDER_virtual/libomxil ?= "libsf-omxil"
 
-PREFERRED_VERSION_linux-starfive-dev = "5.15.0+gitAUTOINC+d9eee31aae"
-PREFERRED_VERSION_glibc ?= "2.35"
-PREFERRED_VERSION_gcc ?= "11.3.0"
-PREFERRED_VERSION_binutils ?= "2.38"
+PREFERRED_VERSION_linux-starfive-dev = "5.15%"
+GLIBCVERSION ?= "2.35"
+GCCVERSION ?= "11.4.0"
+BINUVERSION ?= "2.38"
 PREFERRED_VERSION_opensbi ?= "1.2"
 PREFERRED_VERSION_xserver-xorg = "1.20.13"
 

+ 0 - 21
recipes-benchmark/dhrystone/dhrystone/dhrystone-edit-compiler-flags.patch

@@ -1,21 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 6fb3e5a..6fe5fd4 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,10 +1,13 @@
- DHRY-LFLAGS =
- 
--DHRY-CFLAGS := -O3 -DTIME -DNOENUM -Wno-implicit -save-temps
--DHRY-CFLAGS += -fno-builtin-printf -fno-common -falign-functions=4
-+# Best effort
-+DHRY-CFLAGS := -O2 -DTIME -Wno-implicit -fno-builtin-printf -fno-common -static -mcmodel=medany -ffast-math -fno-common -falign-jumps=8 -falign-loops=8 -falign-functions=8
-+
-+# Legal
-+#DHRY-CFLAGS := -O2 -DTIME -Wno-implicit -fno-builtin-printf -fno-common -static -mcmodel=medany -ffast-math -fno-common -falign-jumps=8 -falign-loops=8 -falign-functions=8 -fno-inline
- 
- #Uncomment below for FPGA run, default DHRY_ITERS is 2000 for RTL
--#DHRY-CFLAGS += -DDHRY_ITERS=20000000
-+DHRY-CFLAGS += -DDHRY_ITERS=20000000
- 
- SRC = dhry_1.c dhry_2.c strcmp.S
- HDR = dhry.h

+ 0 - 26
recipes-benchmark/dhrystone/dhrystone_2.1.bb

@@ -1,26 +0,0 @@
-SUMMARY = "Dhrystone CPU benchmark"
-LICENSE = "PD"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/PD;md5=b3597d12946881e13cb3b548d1173851"
-
-INHIBIT_PACKAGE_STRIP = "1"
-
-BRANCH = "master"
-SRC_URI = "git://github.com/sifive/benchmark-dhrystone.git;protocol=ssh;branch=${BRANCH} \
-           file://dhrystone-edit-compiler-flags.patch \
-           "
-SRCREV = "0ddff533cc9052c524990d5ace4560372053314b"
-
-S = "${WORKDIR}/git"
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-EXTRA_OEMAKE += "'CC=${CC}'"
-
-do_compile(){
-	oe_runmake dhrystone
-}
-
-do_install() {
-    install -d ${D}${bindir}
-    install -m 0755 dhrystone ${D}${bindir}
-}
-

+ 5 - 0
recipes-benchmark/dhrystone/dhrystone_2.1.bbappend

@@ -0,0 +1,5 @@
+# Best effort
+CFLAGS = "-O2 -DTIME -Wno-implicit -fno-builtin-printf -fno-common -static -mcmodel=medany -ffast-math -fno-common -falign-jumps=8 -falign-loops=8 -falign-functions=8"
+
+# Legal
+#CFLAGS = "-O2 -DTIME -Wno-implicit -fno-builtin-printf -fno-common -static -mcmodel=medany -ffast-math -fno-common -falign-jumps=8 -falign-loops=8 -falign-functions=8 -fno-inline"

+ 41 - 0
recipes-bsp/opensbi/opensbi_%.bbappend

@@ -0,0 +1,41 @@
+FORK:starfive-dubhe = "starfive-tech"
+BRANCH:starfive-dubhe = "starfive-v1.2-dubhe"
+SRCREV:starfive-dubhe = "a10e0837f215fb4ed25f195f2c511a41deb9c324"
+
+FORK:starfive-visionfive2 = "starfive-tech"
+BRANCH:starfive-visionfive2 = "master"
+SRCREV:starfive-visionfive2 = "c6a092cd80112529cb2e92e180767ff5341b22a3"
+
+FORK:starfive-jh8100 = "starfive-tech"
+BRANCH:starfive-jh8100 = "fpga-starfive-v1.2-jh8100"
+SRCREV:starfive-jh8100 = "06c3d05b7f5f1e0aa24141e4de487313b620cea9"
+
+SRC_URI:starfive-dubhe = "\
+	git://github.com/${FORK}/opensbi.git;protocol=https;branch=${BRANCH} \
+	"
+
+SRC_URI:starfive-visionfive2 = "\
+	git://github.com/${FORK}/opensbi.git;protocol=https;branch=${BRANCH} \
+	file://visionfive2-uboot-fit-image.its \
+	"
+
+SRC_URI:starfive-jh8100 = "\
+        git://git@192.168.110.45/${FORK}/opensbi.git;protocol=ssh;branch=${BRANCH} \
+        "
+
+SRC_URI:remove:nezha = "\
+        file://0001-lib-utils-fdt-Require-match-data-to-be-const.patch \
+        file://0002-lib-utils-timer-Add-a-separate-compatible-for-the-D1.patch \
+        "
+
+EXTRA_OEMAKE:starfive-dubhe = "PLATFORM=${RISCV_SBI_PLAT} I=${D} FW_PIC=n CLANG_TARGET= FW_OPTIONS=0 FW_TEXT_START=0x80100000 PLATFORM_DEFCONFIG=starfive_defconfig"
+EXTRA_OEMAKE:starfive-visionfive2 = "PLATFORM=${RISCV_SBI_PLAT} I=${D} FW_PIC=n CLANG_TARGET= FW_TEXT_START=0x40000000"
+EXTRA_OEMAKE:starfive-jh8100 = "PLATFORM=${RISCV_SBI_PLAT} I=${D} FW_PIC=n CLANG_TARGET= FW_OPTIONS=0 FW_TEXT_START=0x40000000 PLATFORM_DEFCONFIG=starfive_defconfig"
+
+DEPENDS:starfive-visionfive2 += "u-boot-tools-native dtc-native"
+
+do_deploy:append:starfive-visionfive2() {
+	install -m 0644 ${WORKDIR}/visionfive2-uboot-fit-image.its ${DEPLOYDIR}/visionfive2-uboot-fit-image.its
+	cd ${DEPLOYDIR}
+	mkimage -f visionfive2-uboot-fit-image.its -A riscv -O u-boot -T firmware visionfive2_fw_payload.img
+}

+ 0 - 18
recipes-bsp/opensbi/opensbi_1.0.bbappend

@@ -1,18 +0,0 @@
-FORK:starfive-visionfive2 = "starfive-tech"
-BRANCH:starfive-visionfive2 = "master"
-SRCREV:starfive-visionfive2 = "c6a092cd80112529cb2e92e180767ff5341b22a3"
-
-SRC_URI:starfive-visionfive2 = "\
-	git://github.com/${FORK}/opensbi.git;protocol=https;branch=${BRANCH} \
-	file://visionfive2-uboot-fit-image.its \
-	"
-
-EXTRA_OEMAKE:starfive-visionfive2 += "PLATFORM=${RISCV_SBI_PLAT} I=${D} FW_PIC=n CLANG_TARGET= FW_TEXT_START=0x40000000"
-
-DEPENDS:starfive-visionfive2 += "u-boot-tools-native dtc-native"
-
-do_deploy:append:starfive-visionfive2() {
-	install -m 0644 ${WORKDIR}/visionfive2-uboot-fit-image.its ${DEPLOYDIR}/visionfive2-uboot-fit-image.its
-	cd ${DEPLOYDIR}
-	mkimage -f visionfive2-uboot-fit-image.its -A riscv -O u-boot -T firmware visionfive2_fw_payload.img
-}

+ 3 - 23
recipes-bsp/opensbi/opensbi_1.2.bb

@@ -8,32 +8,12 @@ require opensbi-payloads.inc
 
 inherit autotools-brokensep deploy
 
-FORK:starfive-dubhe = "starfive-tech"
-BRANCH:starfive-dubhe = "starfive-v1.2-dubhe"
-SRCREV:starfive-dubhe = "a10e0837f215fb4ed25f195f2c511a41deb9c324"
-
-FORK:starfive-jh8100 = "starfive-tech"
-BRANCH:starfive-jh8100 = "fpga-starfive-v1.2-jh8100"
-SRCREV:starfive-jh8100 = "06c3d05b7f5f1e0aa24141e4de487313b620cea9"
-
-SRC_URI:starfive-dubhe = "\
-	git://github.com/${FORK}/opensbi.git;protocol=https;branch=${BRANCH} \
-	"
-
-SRC_URI:starfive-jh8100 = "\
-	git://git@192.168.110.45/${FORK}/opensbi.git;protocol=ssh;branch=${BRANCH} \
-	"
-
-SRC_URI:remove:nezha = "\
-	file://0001-lib-utils-fdt-Require-match-data-to-be-const.patch \
-	file://0002-lib-utils-timer-Add-a-separate-compatible-for-the-D1.patch \
-	"
+SRCREV = "6b5188ca14e59ce7bf71afe4e7d3d557c3d31bf8"
+SRC_URI = "git://github.com/riscv/opensbi.git;branch=master;protocol=https"
 
 S = "${WORKDIR}/git"
 
-EXTRA_OEMAKE:starfive-dubhe = "PLATFORM=${RISCV_SBI_PLAT} I=${D} FW_PIC=n CLANG_TARGET= FW_OPTIONS=0 FW_TEXT_START=0x80100000 PLATFORM_DEFCONFIG=starfive_defconfig"
-EXTRA_OEMAKE:starfive-jh8100 = "PLATFORM=${RISCV_SBI_PLAT} I=${D} FW_PIC=n CLANG_TARGET= FW_OPTIONS=0 FW_TEXT_START=0x40000000 PLATFORM_DEFCONFIG=starfive_defconfig"
-
+EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D} FW_PIC=n CLANG_TARGET= "
 # If RISCV_SBI_PAYLOAD is set then include it as a payload
 EXTRA_OEMAKE:append = " ${@riscv_get_extra_oemake_image(d)}"
 EXTRA_OEMAKE:append = " ${@riscv_get_extra_oemake_fdt(d)}"

+ 2 - 2
recipes-bsp/starfive-tool/starfive-tool.bb

@@ -3,8 +3,8 @@ DESCRIPTION = "Starfive Visionfive2 Tools"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e6dc25dc2418b8831c906d43809d8336"
 
-SRC_URI = "git://git@192.168.110.45/sdk/soft_3rdpart;protocol=ssh;nobranch=1"
-SRCREV = "10f543ca35e14809a9b4e9df814b798aa4362d14"
+SRC_URI = "git://github.com/starfive-tech/tools.git;protocol=https;nobranch=1"
+SRCREV = "6067c32c4cc11749a503b0708d98d6d45022cc0c"
 
 S = "${WORKDIR}/git/spl_tool"
 

BIN
recipes-bsp/u-boot/files/run_qemu_virt.dtb


+ 7 - 3
recipes-bsp/u-boot/u-boot-starfive.bb

@@ -19,11 +19,12 @@ SRCREV:starfive-visionfive2 = "b6e2b0e85c774a18ae668223a6e5f7d335895243"
 
 FORK:starfive-jh8100 = "starfive-tech"
 BRANCH:starfive-jh8100 = "jh8100_fpga_dev_v2023.01_bmc"
-SRCREV:starfive-jh8100 = "163e8d28c905711d76cbd5d78dafbd6e24b3f21d"
+SRCREV:starfive-jh8100 = "94b4b620567e8b87fe9002b5b623043830aff8a8"
 
 SRC_URI:starfive-dubhe = "\
-	git://git@192.168.110.45/${FORK}/u-boot.git;protocol=ssh;branch=${BRANCH} \
-	file://0001-include-configs-starfive-dubhe-fpga.h-Mask-ttyS0-and.patch \
+	git://github.com/${FORK}/u-boot.git;protocol=https;branch=${BRANCH} \
+	file://run_qemu_virt.dtb \
+    file://0001-include-configs-starfive-dubhe-fpga.h-Mask-ttyS0-and.patch \
 	"
 
 SRC_URI:starfive-visionfive2 = "\
@@ -38,6 +39,7 @@ SRC_URI:starfive-visionfive2 = "\
 SRC_URI:starfive-jh8100 = "\
 	git://git@192.168.110.45/${FORK}/u-boot.git;protocol=ssh;branch=${BRANCH} \
 	file://tftp-mmc-boot.txt \
+	file://run_qemu_virt.dtb \
 	"
 
 DEPENDS:append:starfive-dubhe = " u-boot-tools-native bmap-tools-native opensbi"
@@ -81,11 +83,13 @@ do_deploy:append:starfive-visionfive2() {
 do_deploy:append:starfive-dubhe() {
     install -m 644 ${WORKDIR}/build/u-boot.itb ${DEPLOYDIR}/u-boot.itb
     rm ${WORKDIR}/build/fw_dynamic.bin
+    install -m 644 ${WORKDIR}/run_qemu_virt.dtb ${DEPLOYDIR}/run_qemu_virt.dtb
 }
 
 do_deploy:append:starfive-jh8100() {
     install -m 644 ${WORKDIR}/build/u-boot.itb ${DEPLOYDIR}/u-boot.itb
     rm ${WORKDIR}/build/fw_dynamic.bin
+    install -m 644 ${WORKDIR}/run_qemu_virt.dtb ${DEPLOYDIR}/run_qemu_virt.dtb
 }
 
 TOOLCHAIN = "gcc"

+ 0 - 0
dynamic-layers/openembedded-layer/recipes-devtools/openocd/openocd/0001-autosetup-cc-check-tools-check-only-the-name.patch → recipes-devtools/openocd/openocd/0001-autosetup-cc-check-tools-check-only-the-name.patch


+ 0 - 0
dynamic-layers/openembedded-layer/recipes-devtools/openocd/openocd/Dubhe_FPGA_openocd.patch → recipes-devtools/openocd/openocd/Dubhe_FPGA_openocd.patch


+ 0 - 0
dynamic-layers/openembedded-layer/recipes-devtools/openocd/openocd/dubhe_olimex-openocd_s5.cfg → recipes-devtools/openocd/openocd/dubhe_olimex-openocd_s5.cfg


+ 0 - 0
dynamic-layers/openembedded-layer/recipes-devtools/openocd/openocd/dubhe_olimex_flash_write.cfg → recipes-devtools/openocd/openocd/dubhe_olimex_flash_write.cfg


+ 0 - 0
dynamic-layers/openembedded-layer/recipes-devtools/openocd/openocd/jh8100_0150_f1.cfg → recipes-devtools/openocd/openocd/jh8100_0150_f1.cfg


+ 0 - 0
dynamic-layers/openembedded-layer/recipes-devtools/openocd/openocd/jh8100_0150_f2.cfg → recipes-devtools/openocd/openocd/jh8100_0150_f2.cfg


+ 0 - 0
dynamic-layers/openembedded-layer/recipes-devtools/openocd/openocd/jh8100_jrc.cfg → recipes-devtools/openocd/openocd/jh8100_jrc.cfg


+ 16 - 0
recipes-devtools/openocd/openocd_riscv.bb

@@ -0,0 +1,16 @@
+require recipes-devtools/openocd/openocd_git.bb
+
+PV = "riscv"
+
+SRC_URI = " \
+    git://github.com/riscv/riscv-openocd.git;protocol=https;branch=riscv;name=openocd \
+    git://repo.or.cz/r/git2cl.git;protocol=http;branch=master;destsuffix=tools/git2cl;name=git2cl \
+    git://repo.or.cz/r/jimtcl.git;protocol=http;branch=master;destsuffix=git/jimtcl;name=jimtcl \
+    git://repo.or.cz/r/libjaylink.git;protocol=http;branch=master;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink \
+"
+
+SRCREV_openocd = "50a5971be27ff11061776afc8014bbff22870b7c"
+
+EXTRA_OECONF = "--enable-ftdi --disable-doxygen-html --disable-werror --enable-jtag_vpi"
+
+COMPATIBLE_HOST = "(x86_64.*|i.86.*|riscv32|riscv64).*-linux"

+ 6 - 2
dynamic-layers/openembedded-layer/recipes-devtools/openocd/openocd_riscv.bbappend → recipes-devtools/openocd/openocd_riscv.bbappend

@@ -1,8 +1,10 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/openocd:"
+require recipes-devtools/openocd/openocd_git.bb
+
+#FILESEXTRAPATHS:prepend := "${THISDIR}/openocd:"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=599d2d1ee7fc84c0467b3d19801db870"
 
-PV = "riscv22"
+PV = "riscv"
 
 SRC_URI = " \
     git://github.com/riscv/riscv-openocd.git;protocol=https;branch=riscv;name=openocd \
@@ -34,3 +36,5 @@ do_deploy() {
 }
 
 addtask deploy before do_build after do_install
+
+COMPATIBLE_HOST = "(x86_64.*|i.86.*|riscv32|riscv64).*-linux"

+ 38 - 0
recipes-kernel/linux/files/0001-riscv-fix-building-external-modules.patch

@@ -0,0 +1,38 @@
+From 5a19c7e06236a9c55dfc001bb4d1a8f1950d23e7 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@suse.de>
+Date: Tue, 2 Nov 2021 16:51:43 +0100
+Subject: [PATCH] riscv: fix building external modules
+
+When building external modules, vdso_prepare should not be run.  If the
+kernel sources are read-only, it will fail.
+
+Fixes: fde9c59aebaf ("riscv: explicitly use symbol offsets for VDSO")
+Signed-off-by: Andreas Schwab <schwab@suse.de>
+Reviewed-by: Nathan Chancellor <nathan@kernel.org>
+Tested-by: Nathan Chancellor <nathan@kernel.org>
+Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
+---
+ arch/riscv/Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
+index 5927c94302b8..8a107ed18b0d 100644
+--- a/arch/riscv/Makefile
++++ b/arch/riscv/Makefile
+@@ -107,11 +107,13 @@ PHONY += vdso_install
+ vdso_install:
+ 	$(Q)$(MAKE) $(build)=arch/riscv/kernel/vdso $@
+ 
++ifeq ($(KBUILD_EXTMOD),)
+ ifeq ($(CONFIG_MMU),y)
+ prepare: vdso_prepare
+ vdso_prepare: prepare0
+ 	$(Q)$(MAKE) $(build)=arch/riscv/kernel/vdso include/generated/vdso-offsets.h
+ endif
++endif
+ 
+ ifneq ($(CONFIG_XIP_KERNEL),y)
+ ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_SOC_CANAAN),yy)
+-- 
+2.41.0
+

+ 0 - 1
recipes-kernel/linux/linux-mainline_%.bbappend

@@ -1 +0,0 @@
-SRCPV = ""

+ 1 - 0
recipes-kernel/linux/linux-starfive-dev_5.15.0.bb

@@ -19,6 +19,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 SRC_URI:starfive-visionfive2 = " \
 	git://github.com/${FORK}/linux.git;protocol=https;branch=${BRANCH} \
+	file://0001-riscv-fix-building-external-modules.patch \
 	file://vf2.cfg \
 	"
 

+ 1 - 1
recipes-kernel/modules/jpu-module/Makefile

@@ -6,7 +6,7 @@ obj-m := jpu.o
 SRC := $(shell pwd)
 
 all:
-	$(MAKE) -C $(KERNEL_SRC) M=$(SRC)
+	$(MAKE) -C $(KERNEL_SRC) M=$(SRC) modules
 
 modules_install:
 	$(MAKE) -C $(KERNEL_SRC) M=$(SRC) modules_install

+ 1 - 1
recipes-kernel/modules/vdec-module/Makefile

@@ -6,7 +6,7 @@ obj-m := vdec.o
 SRC := $(shell pwd)
 
 all:
-	$(MAKE) -C $(KERNEL_SRC) M=$(SRC)
+	$(MAKE) -C $(KERNEL_SRC) M=$(SRC) modules
 
 modules_install:
 	$(MAKE) -C $(KERNEL_SRC) M=$(SRC) modules_install

+ 1 - 1
recipes-kernel/modules/venc-module/Makefile

@@ -6,7 +6,7 @@ obj-m := venc.o
 SRC := $(shell pwd)
 
 all:
-	$(MAKE) -C $(KERNEL_SRC) M=$(SRC)
+	$(MAKE) -C $(KERNEL_SRC) M=$(SRC) modules
 
 modules_install:
 	$(MAKE) -C $(KERNEL_SRC) M=$(SRC) modules_install

+ 0 - 1
setup.sh

@@ -51,7 +51,6 @@ bitbake-layers add-layer ../meta-openembedded/meta-networking
 bitbake-layers add-layer ../meta-openembedded/meta-gnome
 bitbake-layers add-layer ../meta-openembedded/meta-xfce
 bitbake-layers add-layer ../meta-openembedded/meta-webserver
-bitbake-layers add-layer ../meta-riscv
 bitbake-layers add-layer ../meta-starfive
 bitbake-layers add-layer ../meta-clang
 

+ 0 - 2
tools/manifests/starfive.xml

@@ -2,13 +2,11 @@
 
 <manifest>
   <remote name="openembedded" fetch="https://github.com/openembedded/" />
-  <remote name="riscv" fetch="https://github.com/riscv/" />
   <default remote="openembedded" revision="master" />
   <remote name="starfive" fetch="https://github.com/starfive-tech" />
   <remote name="kraj" fetch="https://github.com/kraj" />
   <remote name="yoctoproject" fetch="https://github.com/yoctoproject" />
 
-  <project name="meta-riscv" remote="riscv" path="meta-riscv" revision="kirkstone" />
   <project name="meta-openembedded" remote="openembedded" path="meta-openembedded" revision="kirkstone" />
   <project name="meta-starfive" remote="starfive" path="meta-starfive" revision="starfive-kirkstone" />
   <project name="meta-clang" remote="kraj" path="meta-clang" revision="kirkstone" />