From 41a8043bdf394e3420f79dd421486f137d899d55 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Thu, 8 Sep 2022 20:19:39 +0200 Subject: 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 [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) Reviewed-by: Felix Singer --- src/arch/riscv/opensbi.c | 1 + src/mainboard/emulation/qemu-riscv/Kconfig | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src') 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 #include 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 -- cgit v1.2.3