diff options
| author | Aleksandar Markovic | 2020-05-18 22:09:20 +0200 |
|---|---|---|
| committer | Philippe Mathieu-Daudé | 2020-05-26 13:21:12 +0200 |
| commit | 5298722edad2d40baac9c2326c6d492ad2b0211a (patch) | |
| tree | d180c4669bee04d99a70f0bcd9072f26a13c4fa8 | |
| parent | hw/mips/fuloong2e: Fix typo in Fuloong machine name (diff) | |
| download | qemu-5298722edad2d40baac9c2326c6d492ad2b0211a.tar.gz qemu-5298722edad2d40baac9c2326c6d492ad2b0211a.tar.xz qemu-5298722edad2d40baac9c2326c6d492ad2b0211a.zip | |
hw/mips: Rename malta/mipssim/r4k/jazz files
Machine file names should not have prefix "mips_".
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Message-id: <20200518200920.17344-22-aleksandar.qemu.devel@gmail.com>
[PMD: Fixed Fuloong line conflict due to rebase]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
| -rw-r--r-- | MAINTAINERS | 8 | ||||
| -rw-r--r-- | hw/mips/Makefile.objs | 8 | ||||
| -rw-r--r-- | hw/mips/jazz.c (renamed from hw/mips/mips_jazz.c) | 0 | ||||
| -rw-r--r-- | hw/mips/malta.c (renamed from hw/mips/mips_malta.c) | 0 | ||||
| -rw-r--r-- | hw/mips/mipssim.c (renamed from hw/mips/mips_mipssim.c) | 0 | ||||
| -rw-r--r-- | hw/mips/r4k.c (renamed from hw/mips/mips_r4k.c) | 0 |
6 files changed, 8 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8136a0e56c..f46ab150dc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1050,7 +1050,7 @@ Jazz M: Hervé Poussineau <hpoussin@reactos.org> R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com> S: Maintained -F: hw/mips/mips_jazz.c +F: hw/mips/jazz.c F: hw/display/jazz_led.c F: hw/dma/rc4030.c @@ -1061,7 +1061,7 @@ R: Aurelien Jarno <aurelien@aurel32.net> S: Maintained F: hw/isa/piix4.c F: hw/acpi/piix4.c -F: hw/mips/mips_malta.c +F: hw/mips/malta.c F: hw/mips/gt64xxx_pci.c F: include/hw/southbridge/piix.h F: tests/acceptance/linux_ssh_mips_malta.py @@ -1071,7 +1071,7 @@ Mipssim M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com> S: Odd Fixes -F: hw/mips/mips_mipssim.c +F: hw/mips/mipssim.c F: hw/net/mipsnet.c R4000 @@ -1079,7 +1079,7 @@ M: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> R: Aurelien Jarno <aurelien@aurel32.net> R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com> S: Obsolete -F: hw/mips/mips_r4k.c +F: hw/mips/r4k.c Fuloong 2E M: Huacai Chen <chenhc@lemote.com> diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs index 8ab41edc3f..739e2b7b40 100644 --- a/hw/mips/Makefile.objs +++ b/hw/mips/Makefile.objs @@ -1,8 +1,8 @@ obj-y += addr.o mips_int.o -obj-$(CONFIG_R4K) += mips_r4k.o -obj-$(CONFIG_MALTA) += gt64xxx_pci.o mips_malta.o -obj-$(CONFIG_MIPSSIM) += mips_mipssim.o -obj-$(CONFIG_JAZZ) += mips_jazz.o +obj-$(CONFIG_R4K) += r4k.o +obj-$(CONFIG_MALTA) += gt64xxx_pci.o malta.o +obj-$(CONFIG_MIPSSIM) += mipssim.o +obj-$(CONFIG_JAZZ) += jazz.o obj-$(CONFIG_FULOONG) += fuloong2e.o obj-$(CONFIG_MIPS_CPS) += cps.o obj-$(CONFIG_MIPS_BOSTON) += boston.o diff --git a/hw/mips/mips_jazz.c b/hw/mips/jazz.c index afea52b41b..afea52b41b 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/jazz.c diff --git a/hw/mips/mips_malta.c b/hw/mips/malta.c index e4c4de1b4e..e4c4de1b4e 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/malta.c diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mipssim.c index d220318939..d220318939 100644 --- a/hw/mips/mips_mipssim.c +++ b/hw/mips/mipssim.c diff --git a/hw/mips/mips_r4k.c b/hw/mips/r4k.c index 3487013a4a..3487013a4a 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/r4k.c |