4 files changed, 8 insertions, 16 deletions
diff --git a/src/mainboard/emulation/qemu-riscv/Kconfig b/src/mainboard/emulation/qemu-riscv/Kconfig
index 5e4ea2d487..45ef629157 100644
--- a/src/mainboard/emulation/qemu-riscv/Kconfig
+++ b/src/mainboard/emulation/qemu-riscv/Kconfig
@@ -15,7 +15,7 @@
 # To execute, do:
 # qemu-system-arm -M vexpress-a9 -m 1024M -nographic -kernel build/coreboot.rom
 
-if BOARD_EMULATION_QEMU_UCB_RISCV
+if BOARD_EMULATION_QEMU_RISCV
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
@@ -36,12 +36,8 @@ config MAX_CPUS
 	int
 	default 1
 
-config MAINBOARD_VENDOR
-	string
-	default "UCB"
-
 config DRAM_SIZE_MB
 	int
 	default 32768
 
-endif #  BOARD_EMULATION_QEMU_UCB_RISCV
+endif #  BOARD_EMULATION_QEMU_RISCV
diff --git a/src/mainboard/emulation/qemu-riscv/Kconfig.name b/src/mainboard/emulation/qemu-riscv/Kconfig.name
index 5482f22c34..e9243e6837 100644
--- a/src/mainboard/emulation/qemu-riscv/Kconfig.name
+++ b/src/mainboard/emulation/qemu-riscv/Kconfig.name
@@ -1,2 +1,2 @@
-config BOARD_EMULATION_QEMU_UCB_RISCV
-	bool "QEMU ucb riscv"
+config BOARD_EMULATION_QEMU_RISCV
+	bool "QEMU riscv"
diff --git a/src/mainboard/emulation/spike-riscv/Kconfig b/src/mainboard/emulation/spike-riscv/Kconfig
index 67161f331a..43d14cb774 100644
--- a/src/mainboard/emulation/spike-riscv/Kconfig
+++ b/src/mainboard/emulation/spike-riscv/Kconfig
@@ -12,7 +12,7 @@
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
 
-if BOARD_EMULATION_SPIKE_UCB_RISCV
+if BOARD_EMULATION_SPIKE_RISCV
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
@@ -33,8 +33,4 @@ config MAX_CPUS
 	int
 	default 1
 
-config MAINBOARD_VENDOR
-	string
-	default "UCB"
-
-endif #  BOARD_EMULATION_SPIKE_UCB_RISCV
+endif #  BOARD_EMULATION_SPIKE_RISCV
diff --git a/src/mainboard/emulation/spike-riscv/Kconfig.name b/src/mainboard/emulation/spike-riscv/Kconfig.name
index 2869425dd0..3a82ab1a66 100644
--- a/src/mainboard/emulation/spike-riscv/Kconfig.name
+++ b/src/mainboard/emulation/spike-riscv/Kconfig.name
@@ -1,5 +1,5 @@
-config BOARD_EMULATION_SPIKE_UCB_RISCV
-	bool "SPIKE ucb riscv"
+config BOARD_EMULATION_SPIKE_RISCV
+	bool "SPIKE riscv"
 	help
 	  To run coreboot in spike:
 	  * run "make" as usual