From d19f4e50aa84d7eec717cab980731a168e59d388 Mon Sep 17 00:00:00 2001 From: "Ronald G. Minnich" Date: Tue, 22 Jan 2019 20:46:10 +0000 Subject: [PATCH] riscv: ARCH_RISCV_RV{32,64} selects ARCH_RISCV ARCH_RISCV_RV{32,64} will now select ARCH_RISCV. Change-Id: Ia7a1a8f0bfab20e91b8429dd6dd3e9a4180a0a5b Signed-off-by: Ronald G. Minnich Reviewed-on: https://review.coreboot.org/c/31042 Tested-by: build bot (Jenkins) Reviewed-by: Philipp Hug --- src/arch/riscv/Kconfig | 3 ++- src/soc/sifive/fu540/Kconfig | 1 - src/soc/ucb/riscv/Kconfig | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/arch/riscv/Kconfig b/src/arch/riscv/Kconfig index 5bde804ce2..9d325af759 100644 --- a/src/arch/riscv/Kconfig +++ b/src/arch/riscv/Kconfig @@ -40,10 +40,12 @@ config ARCH_RISCV_U 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 @@ -52,7 +54,6 @@ config ARCH_RISCV_PMP config ARCH_BOOTBLOCK_RISCV bool default n - select ARCH_RISCV select C_ENVIRONMENT_BOOTBLOCK config ARCH_VERSTAGE_RISCV diff --git a/src/soc/sifive/fu540/Kconfig b/src/soc/sifive/fu540/Kconfig index 7910b37860..6ebde33da0 100644 --- a/src/soc/sifive/fu540/Kconfig +++ b/src/soc/sifive/fu540/Kconfig @@ -13,7 +13,6 @@ config SOC_SIFIVE_FU540 bool - select ARCH_RISCV select ARCH_RISCV_RV64 select ARCH_RISCV_S select ARCH_RISCV_U diff --git a/src/soc/ucb/riscv/Kconfig b/src/soc/ucb/riscv/Kconfig index 5a43aa63c6..aa352d932b 100644 --- a/src/soc/ucb/riscv/Kconfig +++ b/src/soc/ucb/riscv/Kconfig @@ -1,5 +1,4 @@ config SOC_UCB_RISCV - select ARCH_RISCV select ARCH_RISCV_RV64 select ARCH_RISCV_S select ARCH_RISCV_U