diff --git a/3rdparty/opensbi b/3rdparty/opensbi
index 215421ca61..5019fd124b 160000
--- a/3rdparty/opensbi
+++ b/3rdparty/opensbi
@@ -1 +1 @@
-Subproject commit 215421ca610a64b8ec188c96ea8588ae2de41fb7
+Subproject commit 5019fd124b4c46e1581129c5154fc2cdd3b777ed
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