From 8d94747b33471ff0cc3e4db2459f23b9b34ca0cc Mon Sep 17 00:00:00 2001 From: Kilian Zinnecker Date: Sat, 28 Dec 2024 20:23:41 +0100 Subject: [PATCH] boot/opensbi: bump version to 1.6 Release notes at: https://github.com/riscv-software-src/opensbi/releases/tag/v1.6 From release notes: "Overall, this release adds more ISA extensions, drivers, and other improvements." This OpenSBI version 1.6 can be tested in qemu with the commands: cat <.config BR2_riscv=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_PLAT="generic" BR2_TOOLCHAIN_EXTERNAL=y EOF make olddefconfig make Then: qemu-system-riscv64 \ -M virt \ -bios output/images/fw_jump.bin \ -kernel output/images/Image \ -append "rootwait root=/dev/vda ro" \ -drive file=output/images/rootfs.ext2,format=raw \ -nographic Note that in the previous qemu command line, the OpenSBI ".bin" image is passed rather than the ".elf" image. Loading the ".elf" image in qemu can now lead to the following qemu error: qemu-system-riscv64: Some ROM regions are overlapping These ROM regions might have been loaded by direct user request or by default. They could be BIOS/firmware images, a guest kernel, initrd or some other file loaded into guest memory. Check whether you intended to load all this guest code, and whether it has been built to load to the correct addresses. The following two regions overlap (in the memory address space): fw_jump.elf ELF program header segment 1 (addresses 0x0000000000000000 - 0x00000000000271e0) mrom.reset (addresses 0x0000000000001000 - 0x0000000000001028) See: https://github.com/riscv-software-src/opensbi/issues/372 Signed-off-by: Kilian Zinnecker Tested-by: Julien Olivain [Julien: reworded the commit log about testing] Signed-off-by: Julien Olivain --- boot/opensbi/Config.in | 4 ++-- boot/opensbi/opensbi.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/opensbi/Config.in b/boot/opensbi/Config.in index 7604be29d9..98d6103ed6 100644 --- a/boot/opensbi/Config.in +++ b/boot/opensbi/Config.in @@ -19,7 +19,7 @@ choice Select the specific OpenSBI version you want to use config BR2_TARGET_OPENSBI_LATEST_VERSION - bool "1.5" + bool "1.6" config BR2_TARGET_OPENSBI_CUSTOM_VERSION bool "Custom version" @@ -57,7 +57,7 @@ endif config BR2_TARGET_OPENSBI_VERSION string - default "1.5" if BR2_TARGET_OPENSBI_LATEST_VERSION + default "1.6" if BR2_TARGET_OPENSBI_LATEST_VERSION default BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE \ if BR2_TARGET_OPENSBI_CUSTOM_VERSION default "custom" if BR2_TARGET_OPENSBI_CUSTOM_TARBALL diff --git a/boot/opensbi/opensbi.hash b/boot/opensbi/opensbi.hash index c69bcf7150..84ad67b2e3 100644 --- a/boot/opensbi/opensbi.hash +++ b/boot/opensbi/opensbi.hash @@ -1,3 +1,3 @@ # locally computed -sha256 9880485672a3a2c48a81d373df6707517b568402f2d3f9eecbfa9d83f8e6f22f opensbi-1.5.tar.gz +sha256 d11702103f177a2914e94eec57ce5ed820296d874f6b6525c4482e55d71a3667 opensbi-1.6.tar.gz sha256 82d13fb1bf6bb162629deeea9eb9c117e74548d3b707e478967691fe79a68e21 COPYING.BSD