Merge branch 'starfive-scarthgap' into 'starfive-scarthgap'

Dubhe Q3 release See merge request starfive-tech/meta-starfive!58
starfive-tech · Nov 26, 2024 · bb6fc3f · bb6fc3f
2 parents 085f5ad + 3ea2755
commit bb6fc3f
Show file tree

Hide file tree

Showing 8 changed files with 522 additions and 7 deletions.
diff --git a/conf/machine/starfive-dubhe.conf b/conf/machine/starfive-dubhe.conf
@@ -51,7 +51,7 @@ GLIBCVERSION = "2.39%"
 BINUVERSION = "2.42"
 GCCVERSION = "14.1.1"
 QEMUVERSION = "7.2.0"
-PREFERRED_VERSION_opensbi = "1.4"
+PREFERRED_VERSION_opensbi = "1.5%"
 PREFERRED_VERSION_gdb = "14.2"
 PREFERRED_VERSION_openocd = "riscv"
 PREFERRED_VERSION_openocd-native = "riscv"

diff --git a/recipes-bsp/opensbi/opensbi_%.bbappend b/recipes-bsp/opensbi/opensbi_%.bbappend
@@ -1,8 +1,8 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 FORK:starfive-dubhe = "starfive-tech"
-BRANCH:starfive-dubhe = "starfive-v1.4-dubhe"
-SRCREV:starfive-dubhe = "6e71d90592d81a41335c480f7704250ba9592fee"
+BRANCH:starfive-dubhe = "starfive-v1.5.1-dubhe"
+SRCREV:starfive-dubhe = "a5fb0ad5354cf3179a0d63200161f0a9f7edbdda"
 
 FORK:starfive-visionfive2 = "starfive-tech"
 BRANCH:starfive-visionfive2 = "master"

diff --git a/recipes-bsp/opensbi/opensbi_1.5.1.bb b/recipes-bsp/opensbi/opensbi_1.5.1.bb
@@ -0,0 +1,48 @@
+SUMMARY = "RISC-V Open Source Supervisor Binary Interface (OpenSBI)"
+DESCRIPTION = "OpenSBI aims to provide an open-source and extensible implementation of the RISC-V SBI specification for a platform specific firmware (M-mode) and a general purpose OS, hypervisor or bootloader (S-mode or HS-mode). OpenSBI implementation can be easily extended by RISC-V platform or System-on-Chip vendors to fit a particular hadware configuration."
+HOMEPAGE = "https://github.com/riscv/opensbi"
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=42dd9555eb177f35150cf9aa240b61e5"
+
+require opensbi-payloads.inc
+
+inherit autotools-brokensep deploy
+
+SRCREV = "43cace6c3671e5172d0df0a8963e552bb04b7b20"
+SRC_URI = "git://github.com/riscv/opensbi.git;branch=release-1.5.x;protocol=https"
+
+S = "${WORKDIR}/git"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+RISCV_SBI_FW_TEXT_START ??= "0x80000000"
+EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D} FW_TEXT_START=${RISCV_SBI_FW_TEXT_START}"
+# 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)}"
+
+# Required if specifying a custom payload
+do_compile[depends] += "${@riscv_get_do_compile_depends(d)}"
+
+do_install:append() {
+	# In the future these might be required as a dependency for other packages.
+	# At the moment just delete them to avoid warnings
+	rm -r ${D}/include
+	rm -r ${D}/lib*
+	rm -r ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/payloads
+}
+
+do_deploy () {
+	install -m 755 ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_payload.* ${DEPLOYDIR}/
+	install -m 755 ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_jump.* ${DEPLOYDIR}/
+	install -m 755 ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_dynamic.* ${DEPLOYDIR}/
+}
+
+addtask deploy before do_build after do_install
+
+FILES:${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_jump.*"
+FILES:${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_payload.*"
+FILES:${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*"
+
+COMPATIBLE_HOST = "(riscv64|riscv32).*"
+INHIBIT_PACKAGE_STRIP = "1"
diff --git a/recipes-bsp/u-boot/u-boot-starfive.bb b/recipes-bsp/u-boot/u-boot-starfive.bb
@@ -11,7 +11,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 FORK:starfive-dubhe = "starfive-tech"
 BRANCH:starfive-dubhe = "dubhe_fpga_dev_v2023.10"
-SRCREV:starfive-dubhe = "89b6b13a57b2fa437ca21fe27148eb80fee4ea19"
+SRCREV:starfive-dubhe = "d9b70aaf1a76ce48374e83c323bdd4ed98871f56"
 
 FORK:starfive-visionfive2 = "starfive-tech"
 BRANCH:starfive-visionfive2 = "JH7110_VisionFive2_devel-v3.9.3"

diff --git a/recipes-kernel/linux/linux-starfive-dev_6.6.bb b/recipes-kernel/linux/linux-starfive-dev_6.6.bb
@@ -9,15 +9,15 @@ SRCREV = "${AUTOREV}"
 BRANCH = "master"
 
 FORK:starfive-dubhe = "starfive-tech"
-BRANCH:starfive-dubhe = "starfive-6.6.31-dubhe"
-SRCREV:starfive-dubhe = "6c96d5ea01245001abf386db780cd14584d1df7c"
+BRANCH:starfive-dubhe = "starfive-6.6.48-dubhe"
+SRCREV:starfive-dubhe = "7a7045d0a38c375a00d8c0c5c1e7c4154cd5cace"
 
 FORK:starfive-jh8100 = "starfive-tech"
 BRANCH:starfive-jh8100 = "starfive-6.6.10-dev-external-jh8100"
 SRCREV:starfive-jh8100 = "9da8129da97b9fb9fb1662475935f52e546b9385"
 
 LINUX_VERSION ?= "6.6.10"
-LINUX_VERSION:starfive-dubhe = "6.6.31"
+LINUX_VERSION:starfive-dubhe = "6.6.48"
 LINUX_VERSION:starfive-jh8100 = "6.6.10"
 
 LINUX_VERSION_EXTENSTION:append:starfive-dubhe = "-starlight"

diff --git a/recipes-kernel/perf/perf-perl.inc b/recipes-kernel/perf/perf-perl.inc
@@ -0,0 +1,7 @@
+inherit perlnative cpan-base
+
+# Env var which tells perl if it should use host (no) or target (yes) settings
+export PERLCONFIGTARGET = "${@is_target(d)}"
+export PERL_INC = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}/CORE"
+export PERL_LIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}"
+export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}"