Change in coreboot[master]: mb/emulation/*-riscv: Remove "UCB" from RISC-V board names

[Jonathan Neuschäfer (Code Review)]

Jonathan Neuschäfer has uploaded this change for review. ( https://review.coreboot.org/28951

Change subject: mb/emulation/*-riscv: Remove "UCB" from RISC-V board names
......................................................................

mb/emulation/*-riscv: Remove "UCB" from RISC-V board names

RISC-V is not a project of the University of California, Berkeley,
anymore; it stands on its own feet now.

Remove the "UCB" component from the RISC-V mainboards in the "emulation"
directory, and don't set MAINBOARD_VENDOR to UCB, either.

Change-Id: I301d9d0091a714e62375052e5af06a9197876688
Signed-off-by: Jonathan Neuschäfer 
---
M src/mainboard/emulation/qemu-riscv/Kconfig
M src/mainboard/emulation/qemu-riscv/Kconfig.name
M src/mainboard/emulation/spike-riscv/Kconfig
M src/mainboard/emulation/spike-riscv/Kconfig.name
4 files changed, 8 insertions(+), 16 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/28951/1

diff --git a/src/mainboard/emulation/qemu-riscv/Kconfig b/src/mainboard/emulation/qemu-riscv/Kconfig
index 5e4ea2d..45ef629 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 @@
    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 5482f22..e9243e6 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 67161f3..43d14cb 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 @@
    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 2869425..3a82ab1 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