summaryrefslogtreecommitdiff
path: root/target/riscv32
diff options
context:
space:
mode:
Diffstat (limited to 'target/riscv32')
-rw-r--r--target/riscv32/Makefile4
-rw-r--r--target/riscv32/kernel/qemu-riscv326
-rw-r--r--target/riscv32/uclibc-ng.config5
3 files changed, 9 insertions, 6 deletions
diff --git a/target/riscv32/Makefile b/target/riscv32/Makefile
index 3d34f7f09..1d628402f 100644
--- a/target/riscv32/Makefile
+++ b/target/riscv32/Makefile
@@ -8,11 +8,9 @@ include $(ADK_TOPDIR)/mk/image.mk
KERNEL:=$(LINUX_DIR)/arch/riscv/boot/Image
QEMU_ARGS:=-M virt -m 512 -nographic
ifeq ($(ADK_TARGET_WITH_MMU),)
-QEMU_ARGS+=-bios none
+QEMU_ARGS+=-bios none -cpu rv32,mmu=off
endif
-ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
QEMU_ARGS+=-netdev user,id=eth0 -device virtio-net-device,netdev=eth0
-endif
ifeq ($(ADK_TARGET_FS),archive)
QEMU_ARGS+=-device virtio-blk-device,drive=vda -drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=none,id=vda,format=raw
endif
diff --git a/target/riscv32/kernel/qemu-riscv32 b/target/riscv32/kernel/qemu-riscv32
index 0aab14765..0bf3ba78f 100644
--- a/target/riscv32/kernel/qemu-riscv32
+++ b/target/riscv32/kernel/qemu-riscv32
@@ -1,7 +1,9 @@
CONFIG_RISCV=y
CONFIG_32BIT=y
CONFIG_FPU=y
-CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_ARCH_RV32I=y
+CONFIG_ARCH_VIRT=y
CONFIG_SOC_VIRT=y
+CONFIG_ARCH_RV32I=y
+CONFIG_RISCV_M_MODE=y
+CONFIG_PAGE_OFFSET=0x80000000
CONFIG_NONPORTABLE=y
diff --git a/target/riscv32/uclibc-ng.config b/target/riscv32/uclibc-ng.config
index 63047370c..adb0a1de7 100644
--- a/target/riscv32/uclibc-ng.config
+++ b/target/riscv32/uclibc-ng.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# uClibc-ng 1.0.45 C Library Configuration
+# uClibc-ng 1.0.52 C Library Configuration
#
# TARGET_aarch64 is not set
# TARGET_alpha is not set
@@ -58,6 +58,7 @@ UCLIBC_HAS_FLOATS=y
UCLIBC_HAS_FPU=y
DO_C99_MATH=y
DO_XSI_MATH=y
+UCLIBC_HAS_FENV=y
UCLIBC_HAS_LONG_DOUBLE_MATH=y
KERNEL_HEADERS=""
HAVE_DOT_CONFIG=y
@@ -66,6 +67,7 @@ HAVE_DOT_CONFIG=y
# General Library Settings
#
DOPIC=y
+# STATIC_PIE is not set
HAVE_LDSO=y
HAVE_SHARED=y
# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
@@ -85,6 +87,7 @@ LDSO_LD_LIBRARY_PATH=y
UCLIBC_CTOR_DTOR=y
# LDSO_GNU_HASH_SUPPORT is not set
# HAS_NO_THREADS is not set
+# UCLIBC_HAS_LINUXTHREADS is not set
UCLIBC_HAS_THREADS_NATIVE=y
UCLIBC_HAS_THREADS=y
UCLIBC_HAS_TLS=y