Martin Roth merged this change.

View Change

Approvals: build bot (Jenkins): Verified Patrick Rudolph: Looks good to me, approved
arch/riscv: Make RISCV specific options depend on ARCH_RISCV

Also don't define the default as this results in spurious lines in the
.config.

The only difference in the generated config.h is that for most board
ARCH_RISCV_M goes from 1 to 0. This should not matter.

Change-Id: I3e8c1cc5696d621e243696a3b5e34f62ab69a688
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31311
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M src/arch/riscv/Kconfig
1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/arch/riscv/Kconfig b/src/arch/riscv/Kconfig
index 25a3980..a4f1788 100644
--- a/src/arch/riscv/Kconfig
+++ b/src/arch/riscv/Kconfig
@@ -1,6 +1,15 @@
+config ARCH_RISCV_RV64
+ bool
+ select ARCH_RISCV
+
+config ARCH_RISCV_RV32
+ bool
+ select ARCH_RISCV
+
config ARCH_RISCV
bool
- default n
+
+if ARCH_RISCV

config RISCV_ARCH
string
@@ -37,16 +46,6 @@
bool
default n

-config ARCH_RISCV_RV64
- bool
- default n
- select ARCH_RISCV
-
-config ARCH_RISCV_RV32
- bool
- default n
- select ARCH_RISCV
-
config ARCH_RISCV_PMP
bool
default n
@@ -74,3 +73,5 @@

config RISCV_WORKING_HARTID
int
+
+endif # if ARCH_RISCV

To view, visit change 31311. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I3e8c1cc5696d621e243696a3b5e34f62ab69a688
Gerrit-Change-Number: 31311
Gerrit-PatchSet: 8
Gerrit-Owner: Arthur Heymans <arthur@aheymans.xyz>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Arthur Heymans <arthur@aheymans.xyz>
Gerrit-Reviewer: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Gerrit-Reviewer: Julius Werner <jwerner@chromium.org>
Gerrit-Reviewer: Martin Roth <martinroth@google.com>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: Patrick Rudolph <siro@das-labor.org>
Gerrit-Reviewer: Philipp Hug <philipp@hug.cx>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-Reviewer: ron minnich <rminnich@gmail.com>
Gerrit-CC: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-MessageType: merged