• Arnd Bergmann's avatar
    Merge tag 'riscv-config-for-v6.10' of... · a3116c88
    Arnd Bergmann authored
    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@spudSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    a3116c88
Makefile 6.14 KB