diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-05-01 15:26:06 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-05-01 15:26:06 +0100 |
| commit | 26bd8d98c4b3284a4c6fe3b67c98b1edd00e9beb (patch) | |
| tree | a401e3a96e85b5df3a9045c33c0d0885c1b91f7a /hw | |
| parent | e0eff721e186d48dc4890414cfe117a61c103804 (diff) | |
| parent | 83dc62f6ed6b4f2afce71d579a630441cca0957c (diff) | |
| download | qemu-26bd8d98c4b3284a4c6fe3b67c98b1edd00e9beb.zip qemu-26bd8d98c4b3284a4c6fe3b67c98b1edd00e9beb.tar.gz qemu-26bd8d98c4b3284a4c6fe3b67c98b1edd00e9beb.tar.bz2 | |
Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.13-pull-request' into staging
# gpg: Signature made Tue 01 May 2018 14:53:58 BST
# gpg: using RSA key F30C38BD3F2FBE3C
# 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.13-pull-request:
hw/m68k/mcf5208: Fix trivial typo in board description
m68k: remove dead code (Coverity CID1390617)
m68k: Fix floatx80_lognp1 (Coverity CID1390587)
m68k: fix subx mem, mem instruction
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/m68k/mcf5208.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index 7aca585..ae3dcc9 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -315,7 +315,7 @@ static void mcf5208evb_init(MachineState *machine) static void mcf5208evb_machine_init(MachineClass *mc) { - mc->desc = "MCF5206EVB"; + mc->desc = "MCF5208EVB"; mc->init = mcf5208evb_init; mc->is_default = 1; mc->default_cpu_type = M68K_CPU_TYPE_NAME("m5208"); |