add riscv32-nommu-elf

1 files changed, 22 insertions, 8 deletions

diff --git a/embedded-test.sh b/embedded-test.sh
index 7501484..6b99a41 100755
--- a/embedded-test.sh
+++ b/embedded-test.sh
@@ -33,7 +33,8 @@ arch_list_uclibcng="aarch64 aarch64be alpha arcv2 arc32 \
   mips32 mips32r6 mips32sf mips32el mips32r6el mips32elsf \
   mips64 mips64n32 mips64n64 mips64el mips64eln32 mips64eln64 \
   mips64r6n32 mips64r6n64 mips64r6eln32 mips64r6eln64 nds32le \
-  nios2 or1k ppc ppcsf riscv32 riscv32-nommu riscv64 riscv64-nommu-flat riscv64-nommu-elf \
+  nios2 or1k ppc ppcsf riscv32 riscv32-nommu-flat riscv32-nommu-elf \
+  riscv64 riscv64-nommu-flat riscv64-nommu-elf \
   sh2 sh2eb sh3 sh3eb sh4 sh4eb sparc sparc-leon3 sparc64 tilegx x86 x86_64 \
   xtensa xtensabe xtensa-nommu"
 
@@ -1096,11 +1097,11 @@ get_arch_info() {
       qemu_machine=virt
       piggyback=1
       ;;
-    riscv32-nommu)
+    riscv32-nommu-flat)
       allowed_libc="uclibc-ng"
       runtime_test="uclibc-ng"
-      allowed_tests="toolchain boot libc ltp native"
-      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_OS=$os ADK_TARGET_ARCH=riscv32 ADK_TARGET_FS=initramfspiggyback ADK_TARGET_SYSTEM=qemu-riscv32 ADK_TARGET_MMU=no"
+      allowed_tests="toolchain boot libc native"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_OS=$os ADK_TARGET_ARCH=riscv32 ADK_TARGET_FS=initramfspiggyback ADK_TARGET_SYSTEM=qemu-riscv32 ADK_TARGET_MMU=no ADK_TARGET_BINFMT=flat"
       cpu_arch=riscv32
       march=riscv32
       qemu=qemu-system-${cpu_arch}
@@ -1109,6 +1110,19 @@ get_arch_info() {
       piggyback=1
       suffix=flat_nommu
       ;;
+    riscv32-nommu-elf)
+      allowed_libc="uclibc-ng"
+      runtime_test="uclibc-ng"
+      allowed_tests="toolchain boot libc native"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_OS=$os ADK_TARGET_ARCH=riscv32 ADK_TARGET_FS=initramfspiggyback ADK_TARGET_SYSTEM=qemu-riscv32 ADK_TARGET_MMU=no ADK_TARGET_BINFMT=elf"
+      cpu_arch=riscv32
+      march=riscv32
+      qemu=qemu-system-${cpu_arch}
+      qemu_args="${qemu_args} -bios none -m 512 -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -cpu rv32,mmu=off"
+      qemu_machine=virt
+      piggyback=1
+      suffix=elf_nommu
+      ;;
     riscv64)
       allowed_libc="uclibc-ng musl glibc newlib"
       runtime_test="uclibc-ng musl glibc"
@@ -1126,8 +1140,8 @@ get_arch_info() {
     riscv64-nommu-flat)
       allowed_libc="uclibc-ng"
       runtime_test="uclibc-ng"
-      allowed_tests="toolchain boot libc ltp native"
-      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_OS=$os ADK_TARGET_ARCH=riscv64 ADK_TARGET_FS=initramfspiggyback ADK_TARGET_SYSTEM=qemu-riscv64 ADK_TARGET_MMU=no ADK_TARGET_BINFMT=flat ADK_TARGET_THREADS=none"
+      allowed_tests="toolchain boot libc native"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_OS=$os ADK_TARGET_ARCH=riscv64 ADK_TARGET_FS=initramfspiggyback ADK_TARGET_SYSTEM=qemu-riscv64 ADK_TARGET_MMU=no ADK_TARGET_BINFMT=flat"
       cpu_arch=riscv64
       march=riscv64
       qemu=qemu-system-${cpu_arch}
@@ -1139,8 +1153,8 @@ get_arch_info() {
     riscv64-nommu-elf)
       allowed_libc="uclibc-ng"
       runtime_test="uclibc-ng"
-      allowed_tests="toolchain boot libc ltp native"
-      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_OS=$os ADK_TARGET_ARCH=riscv64 ADK_TARGET_FS=initramfspiggyback ADK_TARGET_SYSTEM=qemu-riscv64 ADK_TARGET_MMU=no ADK_TARGET_BINFMT=elf ADK_TARGET_THREADS=none"
+      allowed_tests="toolchain boot libc native"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_OS=$os ADK_TARGET_ARCH=riscv64 ADK_TARGET_FS=initramfspiggyback ADK_TARGET_SYSTEM=qemu-riscv64 ADK_TARGET_MMU=no ADK_TARGET_BINFMT=elf"
       cpu_arch=riscv64
       march=riscv64
       qemu=qemu-system-${cpu_arch}