From: Conor Dooley Date: Tue, 5 Mar 2024 18:37:05 +0000 (+0000) Subject: RISC-V: drop SOC_SIFIVE for ARCH_SIFIVE X-Git-Tag: v6.10-rc1~238^2~1^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d2a351e637794e3511ea35ef8109768c6efd89b4;p=thirdparty%2Fkernel%2Flinux.git RISC-V: drop SOC_SIFIVE for ARCH_SIFIVE All the users in the kernel are gone and generated .config files from previous LTS kernels will contain ARCH_SIFIVE. Drop SOC_SIFIVE and update the defconfig. Reviewed-by: Samuel Holland Acked-by: Palmer Dabbelt Signed-off-by: Conor Dooley --- diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs index 3915985c83e43..2797412a7ec98 100644 --- a/arch/riscv/Kconfig.socs +++ b/arch/riscv/Kconfig.socs @@ -14,9 +14,6 @@ config ARCH_RENESAS This enables support for the RISC-V based Renesas SoCs. config ARCH_SIFIVE - def_bool SOC_SIFIVE - -config SOC_SIFIVE bool "SiFive SoCs" select ERRATA_SIFIVE if !XIP_KERNEL help diff --git a/arch/riscv/configs/defconfig b/arch/riscv/configs/defconfig index 936015d9288ec..8f2bec476af21 100644 --- a/arch/riscv/configs/defconfig +++ b/arch/riscv/configs/defconfig @@ -27,7 +27,7 @@ CONFIG_EXPERT=y CONFIG_PROFILING=y CONFIG_ARCH_MICROCHIP=y CONFIG_ARCH_RENESAS=y -CONFIG_SOC_SIFIVE=y +CONFIG_ARCH_SIFIVE=y CONFIG_ARCH_SOPHGO=y CONFIG_SOC_STARFIVE=y CONFIG_ARCH_SUNXI=y