Skip to content

Commit bf3d7b1

Browse files
ConchuODpalmer-dabbelt
authored andcommitted
RISC-V: stop selecting SIFIVE_PLIC at the SoC level
The SIFIVE_PLIC driver is used by all current RISC-V SoCs & will be, where possible, used for future implementations. Rather than having each driver select the option on a case-by-case basis, do so at the arch level. Signed-off-by: Conor Dooley <[email protected]> Acked-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent d8fb130 commit bf3d7b1

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

arch/riscv/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ config RISCV
123123
select PCI_MSI if PCI
124124
select RISCV_INTC
125125
select RISCV_TIMER if RISCV_SBI
126+
select SIFIVE_PLIC
126127
select SPARSE_IRQ
127128
select SYSCTL_EXCEPTION_TRACE
128129
select THREAD_INFO_IN_TASK

arch/riscv/Kconfig.socs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ menu "SoC selection"
33
config SOC_MICROCHIP_POLARFIRE
44
bool "Microchip PolarFire SoCs"
55
select MCHP_CLK_MPFS
6-
select SIFIVE_PLIC
76
help
87
This enables support for Microchip PolarFire SoC platforms.
98

@@ -13,7 +12,6 @@ config SOC_SIFIVE
1312
select SERIAL_SIFIVE_CONSOLE if TTY
1413
select CLK_SIFIVE
1514
select CLK_SIFIVE_PRCI
16-
select SIFIVE_PLIC
1715
select ERRATA_SIFIVE if !XIP_KERNEL
1816
help
1917
This enables support for SiFive SoC platform hardware.
@@ -22,7 +20,6 @@ config SOC_STARFIVE
2220
bool "StarFive SoCs"
2321
select PINCTRL
2422
select RESET_CONTROLLER
25-
select SIFIVE_PLIC
2623
help
2724
This enables support for StarFive SoC platform hardware.
2825

@@ -34,7 +31,6 @@ config SOC_VIRT
3431
select POWER_RESET_SYSCON_POWEROFF
3532
select GOLDFISH
3633
select RTC_DRV_GOLDFISH if RTC_CLASS
37-
select SIFIVE_PLIC
3834
select PM_GENERIC_DOMAINS if PM
3935
select PM_GENERIC_DOMAINS_OF if PM && OF
4036
select RISCV_SBI_CPUIDLE if CPU_IDLE && RISCV_SBI
@@ -47,7 +43,6 @@ config SOC_CANAAN
4743
select CLINT_TIMER if RISCV_M_MODE
4844
select SERIAL_SIFIVE if TTY
4945
select SERIAL_SIFIVE_CONSOLE if TTY
50-
select SIFIVE_PLIC
5146
select ARCH_HAS_RESET_CONTROLLER
5247
select PINCTRL
5348
select COMMON_CLK

0 commit comments

Comments
 (0)