Unverified Commit a3116c88 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'riscv-config-for-v6.10' of... 

Merge tag 'riscv-config-for-v6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux

 into soc/drivers

RISC-V SoC Kconfig Updates for v6.10

A few different bits of SoC-related Kconfig work. The first part of
this is shared with the DT updates - the modification of all SOC_CANAAN
users to SOC_CANAAN_K210 to split the existing m-mode nommu k210 away
from the k230 that is able to be used in a "common" kernel.

The other thing here is the removal of most of the SOC_VENDOR options,
with their ARCH_VENDOR equivalents that've been waiting in the wings for
1 year+ now made visible. Due a lapse on my part when originally adding
the ARCH_VENDOR stuff, the Microchip transition isn't complete - the
_POLARFIRE was a mistake to keep as there's gonna be non-PolarFire
RISC-V stuff from Microchip soonTM.

Signed-off-by: default avatarConor Dooley <conor.dooley@microchip.com>

* tag 'riscv-config-for-v6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux:
  riscv: config: enable ARCH_CANAAN in defconfig
  RISC-V: drop SOC_VIRT for ARCH_VIRT
  RISC-V: drop SOC_SIFIVE for ARCH_SIFIVE
  RISC-V: drop SOC_MICROCHIP_POLARFIRE for ARCH_MICROCHIP
  RISC-V: Drop unused SOC_CANAAN
  reset: k210: Deprecate SOC_CANAAN and use SOC_CANAAN_K210
  pinctrl: k210: Deprecate SOC_CANAAN and use SOC_CANAAN_K210
  clk: k210: Deprecate SOC_CANAAN and use SOC_CANAAN_K210
  soc: canaan: Deprecate SOC_CANAAN and use SOC_CANAAN_K210 for K210
  riscv: Kconfig.socs: Split ARCH_CANAAN and SOC_CANAAN_K210

Link: https://lore.kernel.org/r/20240503-mardi-underling-3d81a9f97329@spud


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e0678631 cd899f85

arch/riscv/Kconfig.socs

+9 −13
Original line number Diff line number Diff line 
menu "SoC selection"



config ARCH_MICROCHIP_POLARFIRE

	def_bool SOC_MICROCHIP_POLARFIRE

	def_bool ARCH_MICROCHIP



config SOC_MICROCHIP_POLARFIRE

	bool "Microchip PolarFire SoCs"

config ARCH_MICROCHIP

	bool "Microchip SoCs"

	help

	  This enables support for Microchip PolarFire SoC platforms.

	  This enables support for Microchip SoC platforms.



config ARCH_RENESAS

	bool "Renesas RISC-V SoCs"
@@ -14,9 +14,6 @@ config ARCH_RENESAS 
	  This enables support for the RISC-V based Renesas SoCs.



config ARCH_SIFIVE

	def_bool SOC_SIFIVE



config SOC_SIFIVE

	bool "SiFive SoCs"

	select ERRATA_SIFIVE if !XIP_KERNEL

	help
@@ -55,9 +52,6 @@ config ARCH_THEAD 
	  This enables support for the RISC-V based T-HEAD SoCs.



config ARCH_VIRT

	def_bool SOC_VIRT



config SOC_VIRT

	bool "QEMU Virt Machine"

	select CLINT_TIMER if RISCV_M_MODE

	select POWER_RESET
@@ -72,11 +66,13 @@ config SOC_VIRT 
	  This enables support for QEMU Virt Machine.



config ARCH_CANAAN

	def_bool SOC_CANAAN

	bool "Canaan Kendryte SoC"

	help

	  This enables support for Canaan Kendryte series SoC platform hardware.



config SOC_CANAAN

config SOC_CANAAN_K210

	bool "Canaan Kendryte K210 SoC"

	depends on !MMU

	depends on !MMU && ARCH_CANAAN

	select CLINT_TIMER if RISCV_M_MODE

	select ARCH_HAS_RESET_CONTROLLER

	select PINCTRL

arch/riscv/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ vdso-install-y += arch/riscv/kernel/vdso/vdso.so.dbg 
vdso-install-$(CONFIG_COMPAT)	+= arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg



ifneq ($(CONFIG_XIP_KERNEL),y)

ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_ARCH_CANAAN),yy)

ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_SOC_CANAAN_K210),yy)

KBUILD_IMAGE := $(boot)/loader.bin

else

ifeq ($(CONFIG_EFI_ZBOOT),)

arch/riscv/configs/defconfig

+4 −3
Original line number Diff line number Diff line
@@ -25,14 +25,15 @@ CONFIG_BLK_DEV_INITRD=y 
CONFIG_EXPERT=y

# CONFIG_SYSFS_SYSCALL is not set

CONFIG_PROFILING=y

CONFIG_SOC_MICROCHIP_POLARFIRE=y

CONFIG_ARCH_MICROCHIP=y

CONFIG_ARCH_RENESAS=y

CONFIG_SOC_SIFIVE=y

CONFIG_ARCH_SIFIVE=y

CONFIG_ARCH_SOPHGO=y

CONFIG_SOC_STARFIVE=y

CONFIG_ARCH_SUNXI=y

CONFIG_ARCH_THEAD=y

CONFIG_SOC_VIRT=y

CONFIG_ARCH_VIRT=y

CONFIG_ARCH_CANAAN=y

CONFIG_SMP=y

CONFIG_HOTPLUG_CPU=y

CONFIG_PM=y

arch/riscv/configs/nommu_k210_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ CONFIG_EXPERT=y 
CONFIG_SLUB=y

CONFIG_SLUB_TINY=y

# CONFIG_MMU is not set

CONFIG_SOC_CANAAN=y

CONFIG_ARCH_CANAAN=y

CONFIG_SOC_CANAAN_K210=y

CONFIG_NONPORTABLE=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2

arch/riscv/configs/nommu_k210_sdcard_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ CONFIG_EXPERT=y 
CONFIG_SLUB=y

CONFIG_SLUB_TINY=y

# CONFIG_MMU is not set

CONFIG_SOC_CANAAN=y

CONFIG_ARCH_CANAAN=y

CONFIG_SOC_CANAAN_K210=y

CONFIG_NONPORTABLE=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2