3 files changed, 21 insertions, 2 deletions
diff --git a/src/mainboard/emulation/qemu-riscv/Kconfig b/src/mainboard/emulation/qemu-riscv/Kconfig
index ecaa76468b..d15c99e966 100644
--- a/src/mainboard/emulation/qemu-riscv/Kconfig
+++ b/src/mainboard/emulation/qemu-riscv/Kconfig
@@ -16,6 +16,21 @@
 # util/riscv/make-spike-elf.sh build/coreboot.rom build/coreboot.elf
 # qemu-system-riscv64 -M virt -m 1024M -nographic -kernel build/coreboot.elf
 
+
+if BOARD_EMULATION_QEMU_RISCV_RV64
+
+config BOARD_EMULATION_QEMU_RISCV
+	def_bool y
+	select ARCH_RISCV_RV64
+endif
+
+if BOARD_EMULATION_QEMU_RISCV_RV32
+
+config BOARD_EMULATION_QEMU_RISCV
+	def_bool y
+	select ARCH_RISCV_RV32
+endif
+
 if BOARD_EMULATION_QEMU_RISCV
 
 config BOARD_SPECIFIC_OPTIONS
diff --git a/src/mainboard/emulation/qemu-riscv/Kconfig.name b/src/mainboard/emulation/qemu-riscv/Kconfig.name
index e9243e6837..61fd919e7c 100644
--- a/src/mainboard/emulation/qemu-riscv/Kconfig.name
+++ b/src/mainboard/emulation/qemu-riscv/Kconfig.name
@@ -1,2 +1,5 @@
-config BOARD_EMULATION_QEMU_RISCV
-	bool "QEMU riscv"
+config BOARD_EMULATION_QEMU_RISCV_RV64
+	bool "QEMU RISC-V rv64"
+
+config BOARD_EMULATION_QEMU_RISCV_RV32
+	bool "QEMU RISC-V rv32"
diff --git a/src/mainboard/emulation/spike-riscv/Kconfig b/src/mainboard/emulation/spike-riscv/Kconfig
index f8c98ab5b3..03046f723f 100644
--- a/src/mainboard/emulation/spike-riscv/Kconfig
+++ b/src/mainboard/emulation/spike-riscv/Kconfig
@@ -16,6 +16,7 @@ if BOARD_EMULATION_SPIKE_RISCV
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
+	select ARCH_RISCV_RV64
 	select SOC_UCB_RISCV
 	select BOARD_ROMSIZE_KB_4096
 	select DRIVERS_UART_8250MEM