OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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: Aleksandar Markovic <amarkovic@wavecomp.com>
Reviewed-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Message-id: <20200526104726.11273-11-f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Philippe Mathieu-Daudé 2020-04-26 12:16:37 +02:00
parent 3e5fe8dd1f
commit c3a09ff68d
10 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MAINTAINERS
View File

@ -1081,13 +1081,13 @@ R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com>
S: Obsolete S: Obsolete
F: hw/mips/mips_r4k.c F: hw/mips/mips_r4k.c
Fulong 2E Fuloong 2E
M: Huacai Chen <chenhc@lemote.com> M: Huacai Chen <chenhc@lemote.com>
M: Philippe Mathieu-Daudé <f4bug@amsat.org> M: Philippe Mathieu-Daudé <f4bug@amsat.org>
M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
R: Jiaxun Yang <jiaxun.yang@flygoat.com> R: Jiaxun Yang <jiaxun.yang@flygoat.com>
S: Odd Fixes S: Odd Fixes
F: hw/mips/mips_fulong2e.c F: hw/mips/fuloong2e.c
F: hw/isa/vt82c686.c F: hw/isa/vt82c686.c
F: hw/pci-host/bonito.c F: hw/pci-host/bonito.c
F: include/hw/isa/vt82c686.h F: include/hw/isa/vt82c686.h

2
default-configs/mips64el-softmmu.mak
View File

@ -2,7 +2,7 @@
include mips-softmmu-common.mak include mips-softmmu-common.mak
CONFIG_IDE_VIA=y CONFIG_IDE_VIA=y
CONFIG_FULONG=y CONFIG_FULOONG=y
CONFIG_ATI_VGA=y CONFIG_ATI_VGA=y
CONFIG_RTL8139_PCI=y CONFIG_RTL8139_PCI=y
CONFIG_JAZZ=y CONFIG_JAZZ=y

5
docs/system/deprecated.rst
View File

@ -368,6 +368,11 @@ mips ``r4k`` platform (since 5.0)
This machine type is very old and unmaintained. Users should use the ``malta`` This machine type is very old and unmaintained. Users should use the ``malta``
machine type instead. 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) ``pc-1.0``, ``pc-1.1``, ``pc-1.2`` and ``pc-1.3`` (since 5.0)
''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''

2
docs/system/target-mips.rst
View File

@ -74,7 +74,7 @@ The MIPS Magnum R4000 emulation supports:
- G364 framebuffer - G364 framebuffer
The Fulong 2E emulation supports: The Fuloong 2E emulation supports:
- Loongson 2E CPU - Loongson 2E CPU

2
hw/isa/vt82c686.c
View File

@ -503,7 +503,7 @@ static void via_class_init(ObjectClass *klass, void *data)
dc->vmsd = &vmstate_via; dc->vmsd = &vmstate_via;
/* /*
* Reason: part of VIA VT82C686 southbridge, needs to be wired up, * 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; dc->user_creatable = false;
} }

2
hw/mips/Kconfig
View File

@ -41,7 +41,7 @@ config JAZZ
select DS1225Y select DS1225Y
select JAZZ_LED select JAZZ_LED
config FULONG config FULOONG
bool bool
select PCI_BONITO select PCI_BONITO

2
hw/mips/Makefile.objs
View File

@ -3,6 +3,6 @@ obj-$(CONFIG_R4K) += mips_r4k.o
obj-$(CONFIG_MALTA) += gt64xxx_pci.o mips_malta.o obj-$(CONFIG_MALTA) += gt64xxx_pci.o mips_malta.o
obj-$(CONFIG_MIPSSIM) += mips_mipssim.o obj-$(CONFIG_MIPSSIM) += mips_mipssim.o
obj-$(CONFIG_JAZZ) += mips_jazz.o obj-$(CONFIG_JAZZ) += mips_jazz.o
obj-$(CONFIG_FULONG) += mips_fulong2e.o obj-$(CONFIG_FULOONG) += fuloong2e.o
obj-$(CONFIG_MIPS_CPS) += cps.o obj-$(CONFIG_MIPS_CPS) += cps.o
obj-$(CONFIG_MIPS_BOSTON) += boston.o obj-$(CONFIG_MIPS_BOSTON) += boston.o

41
hw/mips/mips_fulong2e.c → hw/mips/fuloong2e.c
View File

@ -1,5 +1,5 @@
/* /*
* QEMU fulong 2e mini pc support * QEMU fuloong 2e mini pc support
* *
* Copyright (c) 2008 yajin (yajin@vm-kernel.org) * Copyright (c) 2008 yajin (yajin@vm-kernel.org)
* Copyright (c) 2009 chenming (chenming@rdc.faw.com.cn) * Copyright (c) 2009 chenming (chenming@rdc.faw.com.cn)
@ -11,8 +11,8 @@
*/ */
/* /*
* Fulong 2e mini pc is based on ICT/ST Loongson 2e CPU (MIPS III like, 800MHz) * Fuloong 2e mini pc is based on ICT/ST Loongson 2e CPU (MIPS III like, 800MHz)
* http://www.linux-mips.org/wiki/Fulong * https://www.linux-mips.org/wiki/Fuloong_2E
* *
* Loongson 2e user manual: * Loongson 2e user manual:
* http://www.loongsondeveloper.com/doc/Loongson2EUserGuide.pdf * http://www.loongsondeveloper.com/doc/Loongson2EUserGuide.pdf
@ -45,13 +45,13 @@
#include "sysemu/reset.h" #include "sysemu/reset.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#define DEBUG_FULONG2E_INIT #define DEBUG_FULOONG2E_INIT
#define ENVP_ADDR 0x80002000l #define ENVP_ADDR 0x80002000l
#define ENVP_NB_ENTRIES 16 #define ENVP_NB_ENTRIES 16
#define ENVP_ENTRY_SIZE 256 #define ENVP_ENTRY_SIZE 256
/* fulong 2e has a 512k flash: Winbond W39L040AP70Z */ /* Fuloong 2e has a 512k flash: Winbond W39L040AP70Z */
#define BIOS_SIZE (512 * KiB) #define BIOS_SIZE (512 * KiB)
#define MAX_IDE_BUS 2 #define MAX_IDE_BUS 2
@ -68,12 +68,12 @@
* 2, use "Bonito2edev" to replace "dir_corresponding_to_your_target_hardware" * 2, use "Bonito2edev" to replace "dir_corresponding_to_your_target_hardware"
* in the "Compile Guide". * in the "Compile Guide".
*/ */
#define FULONG_BIOSNAME "pmon_fulong2e.bin" #define FULOONG_BIOSNAME "pmon_2e.bin"
/* PCI SLOT in fulong 2e */ /* PCI SLOT in Fuloong 2e */
#define FULONG2E_VIA_SLOT 5 #define FULOONG2E_VIA_SLOT 5
#define FULONG2E_ATI_SLOT 6 #define FULOONG2E_ATI_SLOT 6
#define FULONG2E_RTL8139_SLOT 7 #define FULOONG2E_RTL8139_SLOT 7
static struct _loaderparams { static struct _loaderparams {
int ram_size; int ram_size;
@ -278,7 +278,7 @@ static void network_init(PCIBus *pci_bus)
const char *default_devaddr = NULL; const char *default_devaddr = NULL;
if (i == 0 && (!nd->model || strcmp(nd->model, "rtl8139") == 0)) { if (i == 0 && (!nd->model || strcmp(nd->model, "rtl8139") == 0)) {
/* The fulong board has a RTL8139 card using PCI SLOT 7 */ /* The Fuloong board has a RTL8139 card using PCI SLOT 7 */
default_devaddr = "07"; default_devaddr = "07";
} }
@ -286,7 +286,7 @@ static void network_init(PCIBus *pci_bus)
} }
} }
static void mips_fulong2e_init(MachineState *machine) static void mips_fuloong2e_init(MachineState *machine)
{ {
const char *kernel_filename = machine->kernel_filename; const char *kernel_filename = machine->kernel_filename;
const char *kernel_cmdline = machine->kernel_cmdline; const char *kernel_cmdline = machine->kernel_cmdline;
@ -318,7 +318,7 @@ static void mips_fulong2e_init(MachineState *machine)
memory_region_add_subregion(address_space_mem, 0, machine->ram); memory_region_add_subregion(address_space_mem, 0, machine->ram);
/* Boot ROM */ /* Boot ROM */
memory_region_init_rom(bios, NULL, "fulong2e.bios", BIOS_SIZE, memory_region_init_rom(bios, NULL, "fuloong2e.bios", BIOS_SIZE,
&error_fatal); &error_fatal);
memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios); memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios);
@ -336,7 +336,7 @@ static void mips_fulong2e_init(MachineState *machine)
write_bootloader(env, memory_region_get_ram_ptr(bios), kernel_entry); write_bootloader(env, memory_region_get_ram_ptr(bios), kernel_entry);
} else { } else {
if (bios_name == NULL) { if (bios_name == NULL) {
bios_name = FULONG_BIOSNAME; bios_name = FULOONG_BIOSNAME;
} }
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
if (filename) { if (filename) {
@ -362,7 +362,7 @@ static void mips_fulong2e_init(MachineState *machine)
pci_bus = bonito_init((qemu_irq *)&(env->irq[2])); pci_bus = bonito_init((qemu_irq *)&(env->irq[2]));
/* South bridge -> IP5 */ /* South bridge -> IP5 */
vt82c686b_southbridge_init(pci_bus, FULONG2E_VIA_SLOT, env->irq[5], vt82c686b_southbridge_init(pci_bus, FULOONG2E_VIA_SLOT, env->irq[5],
&smbus, &isa_bus); &smbus, &isa_bus);
/* GPU */ /* GPU */
@ -383,14 +383,15 @@ static void mips_fulong2e_init(MachineState *machine)
network_init(pci_bus); network_init(pci_bus);
} }
static void mips_fulong2e_machine_init(MachineClass *mc) static void mips_fuloong2e_machine_init(MachineClass *mc)
{ {
mc->desc = "Fulong 2e mini pc"; mc->desc = "Fuloong 2e mini pc";
mc->init = mips_fulong2e_init; mc->alias = "fulong2e"; /* Incorrect name used up to QEMU 4.2 */
mc->init = mips_fuloong2e_init;
mc->block_default_type = IF_IDE; mc->block_default_type = IF_IDE;
mc->default_cpu_type = MIPS_CPU_TYPE_NAME("Loongson-2E"); mc->default_cpu_type = MIPS_CPU_TYPE_NAME("Loongson-2E");
mc->default_ram_size = 256 * MiB; mc->default_ram_size = 256 * MiB;
mc->default_ram_id = "fulong2e.ram"; mc->default_ram_id = "fuloong2e.ram";
} }
DEFINE_MACHINE("fulong2e", mips_fulong2e_machine_init) DEFINE_MACHINE("fuloong2e", mips_fuloong2e_machine_init)

8
hw/pci-host/bonito.c
View File

@ -11,7 +11,7 @@
*/ */
/* /*
* fulong 2e mini pc has a bonito north bridge. * fuloong 2e mini pc has a bonito north bridge.
*/ */
/* /*
@ -573,11 +573,11 @@ static int pci_bonito_map_irq(PCIDevice *pci_dev, int irq_num)
slot = (pci_dev->devfn >> 3); slot = (pci_dev->devfn >> 3);
switch (slot) { switch (slot) {
case 5: /* FULONG2E_VIA_SLOT, SouthBridge, IDE, USB, ACPI, AC97, MC97 */ case 5: /* FULOONG2E_VIA_SLOT, SouthBridge, IDE, USB, ACPI, AC97, MC97 */
return irq_num % 4 + BONITO_IRQ_BASE; return irq_num % 4 + BONITO_IRQ_BASE;
case 6: /* FULONG2E_ATI_SLOT, VGA */ case 6: /* FULOONG2E_ATI_SLOT, VGA */
return 4 + BONITO_IRQ_BASE; return 4 + BONITO_IRQ_BASE;
case 7: /* FULONG2E_RTL_SLOT, RTL8139 */ case 7: /* FULOONG2E_RTL_SLOT, RTL8139 */
return 5 + BONITO_IRQ_BASE; return 5 + BONITO_IRQ_BASE;
case 8 ... 12: /* PCI slot 1 to 4 */ case 8 ... 12: /* PCI slot 1 to 4 */
return (slot - 8 + irq_num) + 6 + BONITO_IRQ_BASE; return (slot - 8 + irq_num) + 6 + BONITO_IRQ_BASE;

2
tests/qtest/endianness-test.c
View File

@ -33,7 +33,7 @@ static const TestCase test_cases[] = {
{ "mips64", "pica61", 0x90000000, .bswap = true }, { "mips64", "pica61", 0x90000000, .bswap = true },
{ "mips64", "mips", 0x14000000, .bswap = true }, { "mips64", "mips", 0x14000000, .bswap = true },
{ "mips64", "malta", 0x10000000, .bswap = true }, { "mips64", "malta", 0x10000000, .bswap = true },
{ "mips64el", "fulong2e", 0x1fd00000 }, { "mips64el", "fuloong2e", 0x1fd00000 },
{ "ppc", "g3beige", 0xfe000000, .bswap = true, .superio = "i82378" }, { "ppc", "g3beige", 0xfe000000, .bswap = true, .superio = "i82378" },
{ "ppc", "40p", 0x80000000, .bswap = true }, { "ppc", "40p", 0x80000000, .bswap = true },
{ "ppc", "bamboo", 0xe8000000, .bswap = true, .superio = "i82378" }, { "ppc", "bamboo", 0xe8000000, .bswap = true, .superio = "i82378" },