Commit c3a09ff6 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé
Browse files

hw/mips/fuloong2e: Fix typo in Fuloong machine name 



We always miswrote the Fuloong machine... Fix its name.
Add an machine alias to the previous name for backward
compatibility.

Suggested-by: default avatarAleksandar Markovic <amarkovic@wavecomp.com>
Reviewed-by: default avatarAleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Message-id: <20200526104726.11273-11-f4bug@amsat.org>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
parent 3e5fe8dd

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -1081,13 +1081,13 @@ R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com> 
S: Obsolete

F: hw/mips/mips_r4k.c



Fulong 2E

Fuloong 2E

M: Huacai Chen <chenhc@lemote.com>

M: Philippe Mathieu-Daudé <f4bug@amsat.org>

M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>

R: Jiaxun Yang <jiaxun.yang@flygoat.com>

S: Odd Fixes

F: hw/mips/mips_fulong2e.c

F: hw/mips/fuloong2e.c

F: hw/isa/vt82c686.c

F: hw/pci-host/bonito.c

F: include/hw/isa/vt82c686.h

default-configs/mips64el-softmmu.mak

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


include mips-softmmu-common.mak

CONFIG_IDE_VIA=y

CONFIG_FULONG=y

CONFIG_FULOONG=y

CONFIG_ATI_VGA=y

CONFIG_RTL8139_PCI=y

CONFIG_JAZZ=y

docs/system/deprecated.rst

+5 −0
Original line number Diff line number Diff line
@@ -368,6 +368,11 @@ mips ``r4k`` platform (since 5.0) 
This machine type is very old and unmaintained. Users should use the ``malta``

machine type instead.



mips ``fulong2e`` machine (since 5.1)

'''''''''''''''''''''''''''''''''''''



This machine has been renamed ``fuloong2e``.



``pc-1.0``, ``pc-1.1``, ``pc-1.2`` and ``pc-1.3`` (since 5.0)

'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''

docs/system/target-mips.rst

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ The MIPS Magnum R4000 emulation supports: 


-  G364 framebuffer



The Fulong 2E emulation supports:

The Fuloong 2E emulation supports:



-  Loongson 2E CPU

hw/isa/vt82c686.c

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ static void via_class_init(ObjectClass *klass, void *data) 
    dc->vmsd = &vmstate_via;

    /*

     * Reason: part of VIA VT82C686 southbridge, needs to be wired up,

     * e.g. by mips_fulong2e_init()

     * e.g. by mips_fuloong2e_init()

     */

    dc->user_creatable = false;

}