On Sat, Mar 23, 2024 at 08:12:17PM +0800, Yangyu Chen wrote: > Since SOC_FOO should be deprecated from patch [1], and cleanup for other > SoCs is already on the mailing list [2,3,4], we remove the use of > SOC_CANAAN and use ARCH_CANAAN for SoCs vendored by Canaan instead from > now on. And allows ARCH_CANAAN to be selected for other Canaan SoCs. > > Then, since we have Canaan Kendryte K230 with MMU now, the use of > SOC_CANAAN is no longer only referred to K210. Thus, we introduce a new > symbol SOC_CANAAN_K210 for any conditional code or driver selection > specific to the K210, so users will not try to build some K210-specific > things when MMU is enabled and see it fails to boot on K210. > > [1] https://lore.kernel.org/linux-riscv/20221121221414.109965-1-conor@xxxxxxxxxx/ > [2] https://lore.kernel.org/linux-riscv/20240305-praying-clad-c4fbcaa7ed0a@spud/ > [3] https://lore.kernel.org/linux-riscv/20240305-fled-undrilled-41dc0c46bb29@spud/ > [4] https://lore.kernel.org/linux-riscv/20240305-stress-earflap-d7ddb8655a4d@spud/ > > Signed-off-by: Yangyu Chen <cyy@xxxxxxxxxxxx> > --- > arch/riscv/Kconfig.socs | 8 +++++--- > arch/riscv/Makefile | 2 +- > arch/riscv/configs/nommu_k210_defconfig | 3 ++- > arch/riscv/configs/nommu_k210_sdcard_defconfig | 3 ++- > 4 files changed, 10 insertions(+), 6 deletions(-) > > diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs > index 623de5f8a208..5710aee456ac 100644 > --- a/arch/riscv/Kconfig.socs > +++ b/arch/riscv/Kconfig.socs > @@ -72,11 +72,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 SoC platform hardware. > > -config SOC_CANAAN > +config SOC_CANAAN_K210 This breaks git bisect, right? There are references to SOC_CANAAN that are get updated later in the patch series. You can't delete SOC_CANAAN and leave the other references dangling. regards, dan carpenter
