diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2017-12-22 00:11:36 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2017-12-22 00:11:36 +0000 |
commit | 281f327487c9c9b1599f93c589a408bbf4a651b8 (patch) | |
tree | 118c1f7771a424841bcb921148c9b76b696eb82a /tests | |
parent | 43ab9a5376c95c61ae898a222c4d04bdf60e239b (diff) | |
parent | 598a29f3606c4c7042a1ca3f1116663d0a60867c (diff) | |
download | qemu-281f327487c9c9b1599f93c589a408bbf4a651b8.zip qemu-281f327487c9c9b1599f93c589a408bbf4a651b8.tar.gz qemu-281f327487c9c9b1599f93c589a408bbf4a651b8.tar.bz2 |
Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.12-pull-request' into staging
# gpg: Signature made Thu 21 Dec 2017 19:35:00 GMT
# gpg: using RSA key 0xF30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg: aka "Laurent Vivier <laurent@vivier.eu>"
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier/tags/m68k-for-2.12-pull-request:
tests/boot-serial-test: Add support for the mcf5208evb board
target/m68k: fix set_cc_op()
target/m68k: add monitor.c
target/m68k: remove unused variable gen_throws_exception
Split adb.c into adb.c, adb-mouse.c and adb-kbd.c
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Makefile.include | 2 | ||||
-rw-r--r-- | tests/boot-serial-test.c | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include index f8e20d9..77f8183 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -297,6 +297,8 @@ gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y) check-qtest-alpha-y = tests/boot-serial-test$(EXESUF) +check-qtest-m68k-y = tests/boot-serial-test$(EXESUF) + check-qtest-mips-y = tests/endianness-test$(EXESUF) check-qtest-mips64-y = tests/endianness-test$(EXESUF) diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c index d997269..dd3828c 100644 --- a/tests/boot-serial-test.c +++ b/tests/boot-serial-test.c @@ -16,6 +16,14 @@ #include "qemu/osdep.h" #include "libqtest.h" +static const uint8_t kernel_mcf5208[] = { + 0x41, 0xf9, 0xfc, 0x06, 0x00, 0x00, /* lea 0xfc060000,%a0 */ + 0x10, 0x3c, 0x00, 0x54, /* move.b #'T',%d0 */ + 0x11, 0x7c, 0x00, 0x04, 0x00, 0x08, /* move.b #4,8(%a0) Enable TX */ + 0x11, 0x40, 0x00, 0x0c, /* move.b %d0,12(%a0) Print 'T' */ + 0x60, 0xfa /* bra.s loop */ +}; + typedef struct testdef { const char *arch; /* Target architecture */ const char *machine; /* Name of the machine */ @@ -41,6 +49,8 @@ static testdef_t tests[] = { { "x86_64", "q35", "-device sga", "SGABIOS" }, { "s390x", "s390-ccw-virtio", "-nodefaults -device sclpconsole,chardev=serial0", "virtio device" }, + { "m68k", "mcf5208evb", "", "TT", sizeof(kernel_mcf5208), kernel_mcf5208 }, + { NULL } }; |