On Fri, May 03, 2024 at 05:00:18PM +0100, Conor Dooley wrote: > Hey Arnd, > > Please pull some SoC-related Kconfig changes for v6.10. LMK if you > think this stuff should really be going through the actual riscv tree > in the future and I'll just harass Palmer about it instead of taking > it myself. That said, Palmer did Ack it all... Whoops, $subject should be "RISC-V SoC Kconfig Updates for v6.10" to match the tag... I'll fix up my script if I send any more of these. > > Cheers, > Conor. > > The following changes since commit 4cece764965020c22cff7665b18a012006359095: > > Linux 6.9-rc1 (2024-03-24 14:10:05 -0700) > > are available in the Git repository at: > > https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/ riscv-config-for-v6.10 > > for you to fetch changes up to cd899f85b1e454188fa2f14c3396a894f440b15f: > > riscv: config: enable ARCH_CANAAN in defconfig (2024-04-10 11:42:13 +0100) > > ---------------------------------------------------------------- > 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: Conor Dooley > > ---------------------------------------------------------------- > Conor Dooley (4): > RISC-V: Drop unused SOC_CANAAN > RISC-V: drop SOC_MICROCHIP_POLARFIRE for ARCH_MICROCHIP > RISC-V: drop SOC_SIFIVE for ARCH_SIFIVE > RISC-V: drop SOC_VIRT for ARCH_VIRT > > Yangyu Chen (6): > riscv: Kconfig.socs: Split ARCH_CANAAN and SOC_CANAAN_K210 > soc: canaan: Deprecate SOC_CANAAN and use SOC_CANAAN_K210 for K210 > clk: k210: Deprecate SOC_CANAAN and use SOC_CANAAN_K210 > pinctrl: k210: Deprecate SOC_CANAAN and use SOC_CANAAN_K210 > reset: k210: Deprecate SOC_CANAAN and use SOC_CANAAN_K210 > riscv: config: enable ARCH_CANAAN in defconfig > > arch/riscv/Kconfig.socs | 22 +++++++++------------- > arch/riscv/Makefile | 2 +- > arch/riscv/configs/defconfig | 7 ++++--- > arch/riscv/configs/nommu_k210_defconfig | 3 ++- > arch/riscv/configs/nommu_k210_sdcard_defconfig | 3 ++- > arch/riscv/configs/nommu_virt_defconfig | 2 +- > drivers/clk/Kconfig | 4 ++-- > drivers/pinctrl/Kconfig | 4 ++-- > drivers/reset/Kconfig | 4 ++-- > drivers/soc/Makefile | 2 +- > drivers/soc/canaan/Kconfig | 4 ++-- > tools/testing/kunit/qemu_configs/riscv.py | 2 +- > .../selftests/wireguard/qemu/arch/riscv32.config | 2 +- > .../selftests/wireguard/qemu/arch/riscv64.config | 2 +- > 14 files changed, 31 insertions(+), 32 deletions(-)