Merge branch 'master' of gogs.waldemar-brodkorb.de:linux/embedded-test

1 files changed, 33 insertions, 9 deletions

diff --git a/embedded-test.sh b/embedded-test.sh
index d87906d..8c866d7 100755
--- a/embedded-test.sh
+++ b/embedded-test.sh
@@ -26,21 +26,21 @@
 arch_list_uclibcng="aarch64 aarch64be alpha arcv1 arcv2 arcv1-be \
   arcv2-be arm-nommu armv5 armv7 armv7-thumb2 armeb avr32 \
   bf512-flat bf512-fdpic c6x crisv10 crisv32 frv h8300 hppa ia64 \
-  lm32 m68k m68k-nommu metag microblazeel microblazebe mips \
-  mipssf mipsel mipselsf mips64 mips64n32 mips64n64 mips64el \
+  lm32 m68k m68k-nommu metag microblazeel microblazebe mips32 mips32r6 \
+  mips32sf mips32el mips32elsf mips64 mips64n32 mips64n64 mips64el \
   mips64eln32 mips64eln64 nds32le nios2 or1k ppc ppcsf sh2 sh3 \
   sh4 sh4eb sparc sparc-leon3 x86 x86_64 xtensa xtensabe \
   xtensa-nommu"
 
 # musl
 arch_list_musl="aarch64 aarch64be armv5 armv7 armeb microblazeel \
-  microblazebe mips mipssf mipsel mipselsf mips64n32 mips64n64 \
+  microblazebe mips32 mips32r6 mips32sf mips32el mips32elsf mips64n32 mips64n64 \
   mips64eln32 mips64eln64 or1k ppc ppcsf ppc64 ppc64le s390 sh4 \
   sh4eb x86 x86_64 x86_64_x32"
 
 # glibc
 arch_list_glibc="aarch64 aarch64be alpha armv5 armv7 armeb \
-  ia64 microblazeel microblazebe mips mipssf mipsel mipselsf \
+  ia64 microblazeel microblazebe mips32 mips32r6 mips32sf mips32el mips32elsf \
   mips64 mips64n32 mips64n64 mips64el mips64eln32 mips64eln64 \
   nios2 ppc ppcsf ppc64 ppc64le s390 sh3 sh4 sh4eb sparc64 tilegx \
   x86 x86_64 x86_64_x32"
@@ -48,7 +48,7 @@ arch_list_glibc="aarch64 aarch64be alpha armv5 armv7 armeb \
 # newlib
 arch_list_newlib="aarch64 aarch64be arcv1 armv5 armeb bfin crisv10 \
   crisv32 epiphany frv h8300 ia64 lm32 m32r m68k microblazeel \
-  microblazebe mips mipsel mn10300 moxie msp430 nds32le nds32be \
+  microblazebe mips32 mips32el mn10300 moxie msp430 nds32le nds32be \
   nios2 or1k ppc rx sh sparc sparc64 v850 x86 x86_64"
 
 topdir=$(pwd)
@@ -576,7 +576,7 @@ get_arch_info() {
       suffix=${cpu_arch}
       skipssp=microblazebe
       ;;
-    mips)
+    mips32)
       allowed_libc="uclibc-ng musl glibc newlib"
       runtime_test="uclibc-ng musl glibc"
       allowed_tests="toolchain boot libc libcmusl mksh ltp native"
@@ -590,7 +590,20 @@ get_arch_info() {
       qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
       suffix=${cpu_arch}_hard
       ;;
-    mipssf)
+    mips32r6)
+      allowed_libc="uclibc-ng musl glibc"
+      runtime_test="uclibc-ng musl glibc"
+      allowed_tests="toolchain boot libc libcmusl mksh ltp native"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_OS=linux ADK_TARGET_ARCH=mips ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips ADK_TARGET_ENDIAN=big ADK_TARGET_FLOAT=hard ADK_TARGET_CPU=mips32r6"
+      default_musl="ADK_APPLIANCE=test ADK_TARGET_OS=linux ADK_TARGET_ARCH=mips ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips ADK_TARGET_ENDIAN=big ADK_TARGET_FLOAT=hard ADK_TARGET_CPU=mips32r6"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_OS=linux ADK_TARGET_ARCH=mips ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips ADK_TARGET_ENDIAN=big ADK_TARGET_FLOAT=hard ADK_TARGET_CPU=mips32r6"
+      cpu_arch=mips32r6
+      qemu=qemu-system-mips
+      qemu_machine=malta
+      qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
+      suffix=${cpu_arch}_hard
+      ;;
+    mips32sf)
       allowed_libc="uclibc-ng musl glibc"
       runtime_test="uclibc-ng musl glibc"
       allowed_tests="toolchain boot libc libcmusl mksh ltp native"
@@ -604,7 +617,7 @@ get_arch_info() {
       qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
       suffix=${cpu_arch}_soft
       ;;
-    mipsel)
+    mips32el)
       allowed_libc="uclibc-ng musl glibc newlib"
       runtime_test="uclibc-ng musl glibc"
       allowed_tests="toolchain boot libc libcmusl mksh ltp native"
@@ -620,7 +633,7 @@ get_arch_info() {
       qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
       suffix=${cpu_arch}${endian}_hard
       ;;
-    mipselsf)
+    mips32elsf)
       allowed_libc="uclibc-ng musl glibc"
       runtime_test="uclibc-ng musl glibc"
       allowed_tests="toolchain boot libc libcmusl mksh ltp native"
@@ -646,6 +659,17 @@ get_arch_info() {
       qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
       suffix=${cpu_arch}_o32
       ;;
+    mips64r6n32)
+      allowed_libc="uclibc-ng glibc"
+      runtime_test="uclibc-ng glibc"
+      allowed_tests="toolchain boot libc libcmusl mksh ltp native"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_OS=linux ADK_TARGET_ARCH=mips64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips64 ADK_TARGET_ENDIAN=big ADK_TARGET_ABI=n32 ADK_TARGET_CPU=mips64r6"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_OS=linux ADK_TARGET_ARCH=mips64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips64 ADK_TARGET_ENDIAN=big ADK_TARGET_ABI=n32 ADK_TARGET_CPU=mips64r6"
+      cpu_arch=mips64r6
+      qemu_machine=malta
+      qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
+      suffix=${cpu_arch}_n32
+      ;;
     mips64n32)
       allowed_libc="uclibc-ng musl glibc"
       runtime_test="uclibc-ng musl glibc"