summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorJonathan Neuschäfer <j.neuschaefer@gmx.net>2018-10-06 00:04:33 +0200
committerRonald G. Minnich <rminnich@gmail.com>2018-10-06 21:30:18 +0000
commit5fba1ea5bcb4c804fe40bfe7da9cf8681ab806eb (patch)
tree968e8e11057808ad544627328359ac6cc262cb10 /src/mainboard
parent6bedbd6116099f1373f6989ab43daf1164c2fbfe (diff)
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 <j.neuschaefer@gmx.net> Reviewed-on: https://review.coreboot.org/28951 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/emulation/qemu-riscv/Kconfig8
-rw-r--r--src/mainboard/emulation/qemu-riscv/Kconfig.name4
-rw-r--r--src/mainboard/emulation/spike-riscv/Kconfig8
-rw-r--r--src/mainboard/emulation/spike-riscv/Kconfig.name4
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