summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <patrick@coreboot.org>2022-09-08 20:19:39 +0200
committerPatrick Georgi <patrick@coreboot.org>2022-09-14 20:12:56 +0000
commit41a8043bdf394e3420f79dd421486f137d899d55 (patch)
tree9841b12238116809ccfa5767245b6c0227d022a6
parent40a38cc8f0c30aef4675fbf3096cb3a9b225fc11 (diff)
downloadcoreboot-41a8043bdf394e3420f79dd421486f137d899d55.tar.gz
3rdparty/opensbi: Update to latest ToT
That's 3 years of development, including adapting to new, shiny, Cascade of Attention-Deficit Teenagers[0] induced incompatible assembler syntaxes. Signed-off-by: Patrick Georgi <patrick@coreboot.org> [0] https://web.archive.org/web/20220824045741/https://www.jwz.org/doc/cadt.html Change-Id: I8606700149ca74e93b85d78546a29df2916d39b2 Reviewed-on: https://review.coreboot.org/c/coreboot/+/67456 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Felix Singer <felixsinger@posteo.net>
m---------3rdparty/opensbi0
-rw-r--r--src/arch/riscv/opensbi.c1
-rw-r--r--src/mainboard/emulation/qemu-riscv/Kconfig2
3 files changed, 2 insertions, 1 deletions
diff --git a/3rdparty/opensbi b/3rdparty/opensbi
-Subproject 215421ca610a64b8ec188c96ea8588ae2de41fb
+Subproject 5019fd124b4c46e1581129c5154fc2cdd3b777e
diff --git a/src/arch/riscv/opensbi.c b/src/arch/riscv/opensbi.c
index eb557d240a..48f0f2a9cd 100644
--- a/src/arch/riscv/opensbi.c
+++ b/src/arch/riscv/opensbi.c
@@ -3,6 +3,7 @@
/* OpenSBI wants to make its own definitions for some of our compiler.h macros. */
#undef __packed
#undef __noreturn
+#undef __aligned
#include <sbi/fw_dynamic.h>
#include <arch/boot.h>
diff --git a/src/mainboard/emulation/qemu-riscv/Kconfig b/src/mainboard/emulation/qemu-riscv/Kconfig
index bec992dfa5..0af309a2cd 100644
--- a/src/mainboard/emulation/qemu-riscv/Kconfig
+++ b/src/mainboard/emulation/qemu-riscv/Kconfig
@@ -50,7 +50,7 @@ config DRAM_SIZE_MB
config OPENSBI_PLATFORM
string
- default "qemu/virt"
+ default "generic"
# ugly, but CBFS is placed in DRAM...
config OPENSBI_TEXT_START