| Message ID | tencent_4F1B21F8A605B7B4091DBB70B5635442BE09@qq.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | riscv: add initial support for Canaan Kendryte K230 | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-fixes-PR | fail | merge-conflict |
On Sun, Mar 03, 2024 at 09:26:25PM +0800, Yangyu Chen wrote: > Since K230 was released, SOC_CANAAN is no longer only referred to the K210. > Remove it depends on !MMU will allow building dts for K230 and remove the > K210 string from the help message. > > Signed-off-by: Yangyu Chen <cyy@cyyself.name> Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Cheers, Conor. > --- > arch/riscv/Kconfig.socs | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs > index 623de5f8a208..b4e9b7f75510 100644 > --- a/arch/riscv/Kconfig.socs > +++ b/arch/riscv/Kconfig.socs > @@ -75,13 +75,12 @@ config ARCH_CANAAN > def_bool SOC_CANAAN > > config SOC_CANAAN > - bool "Canaan Kendryte K210 SoC" > - depends on !MMU > + bool "Canaan Kendryte SoC" > select CLINT_TIMER if RISCV_M_MODE > select ARCH_HAS_RESET_CONTROLLER > select PINCTRL > select COMMON_CLK > help > - This enables support for Canaan Kendryte K210 SoC platform hardware. > + This enables support for Canaan Kendryte SoC platform hardware. > > endmenu # "SoC selection" > -- > 2.43.0 >
diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs index 623de5f8a208..b4e9b7f75510 100644 --- a/arch/riscv/Kconfig.socs +++ b/arch/riscv/Kconfig.socs @@ -75,13 +75,12 @@ config ARCH_CANAAN def_bool SOC_CANAAN config SOC_CANAAN - bool "Canaan Kendryte K210 SoC" - depends on !MMU + bool "Canaan Kendryte SoC" select CLINT_TIMER if RISCV_M_MODE select ARCH_HAS_RESET_CONTROLLER select PINCTRL select COMMON_CLK help - This enables support for Canaan Kendryte K210 SoC platform hardware. + This enables support for Canaan Kendryte SoC platform hardware. endmenu # "SoC selection"
Since K230 was released, SOC_CANAAN is no longer only referred to the K210. Remove it depends on !MMU will allow building dts for K230 and remove the K210 string from the help message. Signed-off-by: Yangyu Chen <cyy@cyyself.name> --- arch/riscv/Kconfig.socs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)