korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 04:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

RISC-V: drop SOC_VIRT for ARCH_VIRT

Browse Source 
The ARCH_ and SOC_ versions of this symbol have persisted for quite a
while now in parallel. Generated .config files from previous LTS kernels
should have both. Finally remove SOC_VIRT and update all config files
using it.

Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
This commit is contained in:
Conor Dooley 2024-03-05 18:37:06 +00:00
parent d2a351e637
commit 1553a1c482
6 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/riscv/Kconfig.socs
View File

@ -52,9 +52,6 @@ config ARCH_THEAD
This enables support for the RISC-V based T-HEAD SoCs. This enables support for the RISC-V based T-HEAD SoCs.
config ARCH_VIRT config ARCH_VIRT
def_bool SOC_VIRT
config SOC_VIRT
bool "QEMU Virt Machine" bool "QEMU Virt Machine"
select CLINT_TIMER if RISCV_M_MODE select CLINT_TIMER if RISCV_M_MODE
select POWER_RESET select POWER_RESET

2
arch/riscv/configs/defconfig
View File

@ -32,7 +32,7 @@ CONFIG_ARCH_SOPHGO=y
CONFIG_SOC_STARFIVE=y CONFIG_SOC_STARFIVE=y
CONFIG_ARCH_SUNXI=y CONFIG_ARCH_SUNXI=y
CONFIG_ARCH_THEAD=y CONFIG_ARCH_THEAD=y
CONFIG_SOC_VIRT=y CONFIG_ARCH_VIRT=y
CONFIG_SMP=y CONFIG_SMP=y
CONFIG_HOTPLUG_CPU=y CONFIG_HOTPLUG_CPU=y
CONFIG_PM=y CONFIG_PM=y

2
arch/riscv/configs/nommu_virt_defconfig
View File

@ -24,7 +24,7 @@ CONFIG_EXPERT=y
CONFIG_SLUB=y CONFIG_SLUB=y
CONFIG_SLUB_TINY=y CONFIG_SLUB_TINY=y
# CONFIG_MMU is not set # CONFIG_MMU is not set
CONFIG_SOC_VIRT=y CONFIG_ARCH_VIRT=y
CONFIG_NONPORTABLE=y CONFIG_NONPORTABLE=y
CONFIG_SMP=y CONFIG_SMP=y
CONFIG_CMDLINE="root=/dev/vda rw earlycon=uart8250,mmio,0x10000000,115200n8 console=ttyS0" CONFIG_CMDLINE="root=/dev/vda rw earlycon=uart8250,mmio,0x10000000,115200n8 console=ttyS0"

2
tools/testing/kunit/qemu_configs/riscv.py
View File

@ -13,7 +13,7 @@ if not os.path.isfile(OPENSBI_PATH):
QEMU_ARCH = QemuArchParams(linux_arch='riscv', QEMU_ARCH = QemuArchParams(linux_arch='riscv',
kconfig=''' kconfig='''
CONFIG_SOC_VIRT=y CONFIG_ARCH_VIRT=y
CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_OF_PLATFORM=y

2
tools/testing/selftests/wireguard/qemu/arch/riscv32.config
View File

@ -2,7 +2,7 @@ CONFIG_NONPORTABLE=y
CONFIG_ARCH_RV32I=y CONFIG_ARCH_RV32I=y
CONFIG_MMU=y CONFIG_MMU=y
CONFIG_FPU=y CONFIG_FPU=y
CONFIG_SOC_VIRT=y CONFIG_ARCH_VIRT=y
CONFIG_RISCV_ISA_FALLBACK=y CONFIG_RISCV_ISA_FALLBACK=y
CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_CONSOLE=y

2
tools/testing/selftests/wireguard/qemu/arch/riscv64.config
View File

@ -1,7 +1,7 @@
CONFIG_ARCH_RV64I=y CONFIG_ARCH_RV64I=y
CONFIG_MMU=y CONFIG_MMU=y
CONFIG_FPU=y CONFIG_FPU=y
CONFIG_SOC_VIRT=y CONFIG_ARCH_VIRT=y
CONFIG_RISCV_ISA_FALLBACK=y CONFIG_RISCV_ISA_FALLBACK=y
CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_CONSOLE=y