summaryrefslogtreecommitdiffhomepage
path: root/src/tests/qemu
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2017-11-22 12:46:06 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2017-11-22 18:32:48 +0100
commite79be273d702b198c1718a6189fa752e28fd4c03 (patch)
tree5a1b733a39b09b4600ca2c5a75447449fb4acaa2 /src/tests/qemu
parent0aa65c6f0544bfa9ed9b5f73c4197e91bf2ed2d5 (diff)
poly1305: import MIPS64 primitive from OpenSSL
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'src/tests/qemu')
-rw-r--r--src/tests/qemu/Makefile8
-rw-r--r--src/tests/qemu/arch/mips64.config3
-rw-r--r--src/tests/qemu/arch/mips64el.config3
3 files changed, 8 insertions, 6 deletions
diff --git a/src/tests/qemu/Makefile b/src/tests/qemu/Makefile
index 2f288a5..875baf4 100644
--- a/src/tests/qemu/Makefile
+++ b/src/tests/qemu/Makefile
@@ -117,8 +117,8 @@ ifeq ($(CHOST),$(CBUILD))
QEMU_MACHINE := -cpu host -machine malta,accel=kvm
CFLAGS += -EB
else
-QEMU_MACHINE := -cpu 20Kc -machine malta -smp 1
-CFLAGS += -march=mips64r2 -EB
+QEMU_MACHINE := -cpu I6400 -machine malta
+CFLAGS += -march=mips64r6 -EB
endif
else ifeq ($(ARCH),mips64el)
QEMU_ARCH := mips64el
@@ -128,8 +128,8 @@ ifeq ($(CHOST),$(CBUILD))
QEMU_MACHINE := -cpu host -machine malta,accel=kvm
CFLAGS += -EL
else
-QEMU_MACHINE := -cpu 20Kc -machine malta -smp 1
-CFLAGS += -march=mips64r2 -EL
+QEMU_MACHINE := -cpu I6400 -machine malta
+CFLAGS += -march=mips64r6 -EL
endif
else ifeq ($(ARCH),mips)
QEMU_ARCH := mips
diff --git a/src/tests/qemu/arch/mips64.config b/src/tests/qemu/arch/mips64.config
index 6fc6bc4..37d8947 100644
--- a/src/tests/qemu/arch/mips64.config
+++ b/src/tests/qemu/arch/mips64.config
@@ -1,5 +1,6 @@
CONFIG_64BIT=y
-CONFIG_CPU_MIPS64_R2=y
+CONFIG_CPU_MIPS64_R6=y
+CONFIG_CPU_HAS_MSA=y
CONFIG_MIPS_MALTA=y
CONFIG_MIPS_CPS=y
CONFIG_POWER_RESET=y
diff --git a/src/tests/qemu/arch/mips64el.config b/src/tests/qemu/arch/mips64el.config
index fc1e43a..2529a60 100644
--- a/src/tests/qemu/arch/mips64el.config
+++ b/src/tests/qemu/arch/mips64el.config
@@ -1,5 +1,6 @@
CONFIG_64BIT=y
-CONFIG_CPU_MIPS64_R2=y
+CONFIG_CPU_MIPS64_R6=y
+CONFIG_CPU_HAS_MSA=y
CONFIG_MIPS_MALTA=y
CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_MIPS_CPS=y