RISC-V: drop SOC_MICROCHIP_POLARFIRE for ARCH_MICROCHIP

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.

Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>

diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs
index a4468deef99f6f17aea47a992000c9047ba3132b..3915985c83e43ae4959be819f0c3d759ed73f9ec 100644 (file)
--- 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 fc0ec2ee13bc22c842e7ce4025e92e05599b5e1c..936015d9288ec7abe21e193e60f314f4c6e4936c 100644 (file)
--- 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