| Message ID | 20240305-fled-undrilled-41dc0c46bb29@spud (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v1] RISC-V: drop SOC_MICROCHIP_POLARFIRE for ARCH_MICROCHIP | expand |
On Tue, 05 Mar 2024 11:20:28 PST (-0800), Conor Dooley wrote: > From: Conor Dooley <conor.dooley@microchip.com> > > SOC_MICROCHIP_POLARFIRE doesn't have any remaining in-kernel users, so > time has come to remove it. Foolish auld me left the "POLARFIRE" in the > new, hidden, config option when I renamed it and changed all of the > users however. As HPSC has been announced, and is not a PolarFire, > drop mention of that specific FPGA family from the new user-visible > config option. > > Signed-off-by: Conor Dooley <conor.dooley@microchip.com> > --- > CC: Paul Walmsley <paul.walmsley@sifive.com> > CC: Palmer Dabbelt <palmer@dabbelt.com> > CC: Conor Dooley <conor.dooley@microchip.com> > CC: linux-riscv@lists.infradead.org > --- > arch/riscv/Kconfig.socs | 8 ++++---- > arch/riscv/configs/defconfig | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs > index e08e91c49abe..5fd2e9f425d1 100644 > --- a/arch/riscv/Kconfig.socs > +++ b/arch/riscv/Kconfig.socs > @@ -1,12 +1,12 @@ > 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" > diff --git a/arch/riscv/configs/defconfig b/arch/riscv/configs/defconfig > index 89a009a580fe..5cfc0338ad5c 100644 > --- a/arch/riscv/configs/defconfig > +++ b/arch/riscv/configs/defconfig > @@ -25,7 +25,7 @@ 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_SOPHGO=y Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
From: Conor Dooley <conor.dooley@microchip.com> On Tue, 05 Mar 2024 19:20:28 +0000, Conor Dooley wrote: > SOC_MICROCHIP_POLARFIRE doesn't have any remaining in-kernel users, so > time has come to remove it. Foolish auld me left the "POLARFIRE" in the > new, hidden, config option when I renamed it and changed all of the > users however. As HPSC has been announced, and is not a PolarFire, > drop mention of that specific FPGA family from the new user-visible > config option. > > [...] Applied to riscv-soc-for-next, thanks! [1/1] RISC-V: drop SOC_MICROCHIP_POLARFIRE for ARCH_MICROCHIP https://git.kernel.org/conor/c/37c09ed41925 Thanks, Conor.
diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs index e08e91c49abe..5fd2e9f425d1 100644 --- a/arch/riscv/Kconfig.socs +++ b/arch/riscv/Kconfig.socs @@ -1,12 +1,12 @@ 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" diff --git a/arch/riscv/configs/defconfig b/arch/riscv/configs/defconfig index 89a009a580fe..5cfc0338ad5c 100644 --- a/arch/riscv/configs/defconfig +++ b/arch/riscv/configs/defconfig @@ -25,7 +25,7 @@ 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_SOPHGO=y