RISC-V: drop SOC_VIRT for ARCH_VIRT
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:
parent
d2a351e637
commit
1553a1c482
@ -52,9 +52,6 @@ config ARCH_THEAD
|
||||
This enables support for the RISC-V based T-HEAD SoCs.
|
||||
|
||||
config ARCH_VIRT
|
||||
def_bool SOC_VIRT
|
||||
|
||||
config SOC_VIRT
|
||||
bool "QEMU Virt Machine"
|
||||
select CLINT_TIMER if RISCV_M_MODE
|
||||
select POWER_RESET
|
||||
|
@ -32,7 +32,7 @@ CONFIG_ARCH_SOPHGO=y
|
||||
CONFIG_SOC_STARFIVE=y
|
||||
CONFIG_ARCH_SUNXI=y
|
||||
CONFIG_ARCH_THEAD=y
|
||||
CONFIG_SOC_VIRT=y
|
||||
CONFIG_ARCH_VIRT=y
|
||||
CONFIG_SMP=y
|
||||
CONFIG_HOTPLUG_CPU=y
|
||||
CONFIG_PM=y
|
||||
|
@ -24,7 +24,7 @@ CONFIG_EXPERT=y
|
||||
CONFIG_SLUB=y
|
||||
CONFIG_SLUB_TINY=y
|
||||
# CONFIG_MMU is not set
|
||||
CONFIG_SOC_VIRT=y
|
||||
CONFIG_ARCH_VIRT=y
|
||||
CONFIG_NONPORTABLE=y
|
||||
CONFIG_SMP=y
|
||||
CONFIG_CMDLINE="root=/dev/vda rw earlycon=uart8250,mmio,0x10000000,115200n8 console=ttyS0"
|
||||
|
@ -13,7 +13,7 @@ if not os.path.isfile(OPENSBI_PATH):
|
||||
|
||||
QEMU_ARCH = QemuArchParams(linux_arch='riscv',
|
||||
kconfig='''
|
||||
CONFIG_SOC_VIRT=y
|
||||
CONFIG_ARCH_VIRT=y
|
||||
CONFIG_SERIAL_8250=y
|
||||
CONFIG_SERIAL_8250_CONSOLE=y
|
||||
CONFIG_SERIAL_OF_PLATFORM=y
|
||||
|
@ -2,7 +2,7 @@ CONFIG_NONPORTABLE=y
|
||||
CONFIG_ARCH_RV32I=y
|
||||
CONFIG_MMU=y
|
||||
CONFIG_FPU=y
|
||||
CONFIG_SOC_VIRT=y
|
||||
CONFIG_ARCH_VIRT=y
|
||||
CONFIG_RISCV_ISA_FALLBACK=y
|
||||
CONFIG_SERIAL_8250=y
|
||||
CONFIG_SERIAL_8250_CONSOLE=y
|
||||
|
@ -1,7 +1,7 @@
|
||||
CONFIG_ARCH_RV64I=y
|
||||
CONFIG_MMU=y
|
||||
CONFIG_FPU=y
|
||||
CONFIG_SOC_VIRT=y
|
||||
CONFIG_ARCH_VIRT=y
|
||||
CONFIG_RISCV_ISA_FALLBACK=y
|
||||
CONFIG_SERIAL_8250=y
|
||||
CONFIG_SERIAL_8250_CONSOLE=y
|
||||
|
Loading…
Reference in New Issue
Block a user