diff options
| -rw-r--r-- | target/config/Config.in.cpu | 18 | ||||
| -rw-r--r-- | target/riscv32/kernel/qemu-riscv32 | 6 |
2 files changed, 9 insertions, 15 deletions
diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index ef50f0303..bf4a588eb 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -1144,25 +1144,25 @@ config ADK_TARGET_CPU_PPC64_POWERPC64 # riscv config ADK_TARGET_CPU_RISCV32_RV32IMAC bool "rv32imac" - select ADK_TARGET_SUPPORTS_THREADS - select ADK_TARGET_SUPPORTS_NPTL - select ADK_TARGET_SUPPORTS_LT + select ADK_TARGET_SUPPORTS_THREADS if ADK_TARGET_WITH_MMU + select ADK_TARGET_SUPPORTS_NPTL if ADK_TARGET_WITH_MMU + select ADK_TARGET_SUPPORTS_LT if ADK_TARGET_WITH_MMU select ADK_TARGET_ABI_ILP32 depends on ADK_TARGET_ARCH_RISCV32 config ADK_TARGET_CPU_RISCV32_RV32IMAFC bool "rv32imafc" - select ADK_TARGET_SUPPORTS_THREADS - select ADK_TARGET_SUPPORTS_NPTL - select ADK_TARGET_SUPPORTS_LT + select ADK_TARGET_SUPPORTS_THREADS if ADK_TARGET_WITH_MMU + select ADK_TARGET_SUPPORTS_NPTL if ADK_TARGET_WITH_MMU + select ADK_TARGET_SUPPORTS_LT if ADK_TARGET_WITH_MMU select ADK_TARGET_ABI_ILP32F depends on ADK_TARGET_ARCH_RISCV32 config ADK_TARGET_CPU_RISCV32_RV32IMADC bool "rv32imadc" - select ADK_TARGET_SUPPORTS_THREADS - select ADK_TARGET_SUPPORTS_NPTL - select ADK_TARGET_SUPPORTS_LT + select ADK_TARGET_SUPPORTS_THREADS if ADK_TARGET_WITH_MMU + select ADK_TARGET_SUPPORTS_NPTL if ADK_TARGET_WITH_MMU + select ADK_TARGET_SUPPORTS_LT if ADK_TARGET_WITH_MMU select ADK_TARGET_ABI_ILP32D depends on ADK_TARGET_ARCH_RISCV32 diff --git a/target/riscv32/kernel/qemu-riscv32 b/target/riscv32/kernel/qemu-riscv32 index 8fa8b13ac..18c6f367d 100644 --- a/target/riscv32/kernel/qemu-riscv32 +++ b/target/riscv32/kernel/qemu-riscv32 @@ -4,9 +4,3 @@ CONFIG_COMPAT_32BIT_TIME=y CONFIG_ARCH_RV32I=y CONFIG_SOC_VIRT=y CONFIG_NONPORTABLE=y -CONFIG_VIRTIO_BLK=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_VIRTIO_MMIO=y -CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y |