From cee21cdad9a4686842ccb54ef3b4485dcb4ab1f7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 9 Jan 2023 16:55:58 +0100 Subject: riscv32: add basic nommu support --- target/riscv32/Makefile | 3 +++ target/riscv32/kernel/qemu-riscv32 | 22 ++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) (limited to 'target/riscv32') diff --git a/target/riscv32/Makefile b/target/riscv32/Makefile index 577ef3f15..08d4d57ba 100644 --- a/target/riscv32/Makefile +++ b/target/riscv32/Makefile @@ -7,6 +7,9 @@ include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/riscv/boot/Image QEMU_ARGS:=-M virt -m 512 -nographic +ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y) +QEMU_ARGS+=-bios none +endif ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) QEMU_ARGS+=-netdev user,id=eth0 -device virtio-net-device,netdev=eth0 endif diff --git a/target/riscv32/kernel/qemu-riscv32 b/target/riscv32/kernel/qemu-riscv32 index a1ef83228..8fa8b13ac 100644 --- a/target/riscv32/kernel/qemu-riscv32 +++ b/target/riscv32/kernel/qemu-riscv32 @@ -1,14 +1,12 @@ CONFIG_RISCV=y -CONFIG_ARCH_RV32I=y -CONFIG_CMODEL_MEDANY=y -CONFIG_CPU_RV_GENERIC=y -CONFIG_RV_SYSRISCV_ATOMIC=y -CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y CONFIG_32BIT=y -CONFIG_HVC_DRIVER=y -CONFIG_HVC_RISCV_SBI=y -CONFIG_SERIAL_EARLYCON_RISCV_SBI=y -CONFIG_CMDLINE_BOOL=y -CONFIG_SOC_SIFIVE=y -CONFIG_SERIAL_SIFIVE=y -CONFIG_SERIAL_SIFIVE_CONSOLE=y +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 -- cgit v1.2.3