Skip to content

Commit d34a6b7

Browse files
ConchuODpalmer-dabbelt
authored andcommitted
RISC-V: convert new selectors of RISCV_ALTERNATIVE to dependencies
for-next contains two additional extensions that select RISCV_ALTERNATIVE. RISCV_ALTERNATIVE no longer needs to be selected by individual config options as it is now selected for !XIP_KERNEL builds by the top level RISCV option. These extensions rely on the alternative framework, so convert the "select"s to "depends on"s instead. Signed-off-by: Conor Dooley <conor.dooley@microchip.com> Reviewed-by: Andrew Jones <ajones@ventanamicro.com> Link: https://lore.kernel.org/r/20230324121240.3594777-1-conor.dooley@microchip.com Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
1 parent be693ef commit d34a6b7

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

arch/riscv/Kconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -402,8 +402,8 @@ config RISCV_ISA_C
402402
config RISCV_ISA_SVNAPOT
403403
bool "SVNAPOT extension support"
404404
depends on 64BIT && MMU
405+
depends on RISCV_ALTERNATIVE
405406
default y
406-
select RISCV_ALTERNATIVE
407407
help
408408
Allow kernel to detect the SVNAPOT ISA-extension dynamically at boot
409409
time and enable its usage.
@@ -478,8 +478,8 @@ config RISCV_ISA_ZICBOM
478478

479479
config RISCV_ISA_ZICBOZ
480480
bool "Zicboz extension support for faster zeroing of memory"
481-
depends on !XIP_KERNEL && MMU
482-
select RISCV_ALTERNATIVE
481+
depends on MMU
482+
depends on RISCV_ALTERNATIVE
483483
default y
484484
help
485485
Enable the use of the ZICBOZ extension (cbo.zero instruction)

0 commit comments

Comments
 (0)