[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/14] hw/mips: Rename malta/mipssim/r4k/jazz files
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 11/14] hw/mips: Rename malta/mipssim/r4k/jazz files |
Date: |
Tue, 26 May 2020 15:32:44 +0200 |
From: Aleksandar Markovic <address@hidden>
Machine file names should not have prefix "mips_".
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Aleksandar Markovic <address@hidden>
Message-id: <address@hidden>
[PMD: Fixed Fuloong line conflict due to rebase]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/mips/{mips_jazz.c => jazz.c} | 0
hw/mips/{mips_malta.c => malta.c} | 0
hw/mips/{mips_mipssim.c => mipssim.c} | 0
hw/mips/{mips_r4k.c => r4k.c} | 0
MAINTAINERS | 8 ++++----
hw/mips/Makefile.objs | 8 ++++----
6 files changed, 8 insertions(+), 8 deletions(-)
rename hw/mips/{mips_jazz.c => jazz.c} (100%)
rename hw/mips/{mips_malta.c => malta.c} (100%)
rename hw/mips/{mips_mipssim.c => mipssim.c} (100%)
rename hw/mips/{mips_r4k.c => r4k.c} (100%)
diff --git a/hw/mips/mips_jazz.c b/hw/mips/jazz.c
similarity index 100%
rename from hw/mips/mips_jazz.c
rename to hw/mips/jazz.c
diff --git a/hw/mips/mips_malta.c b/hw/mips/malta.c
similarity index 100%
rename from hw/mips/mips_malta.c
rename to hw/mips/malta.c
diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mipssim.c
similarity index 100%
rename from hw/mips/mips_mipssim.c
rename to hw/mips/mipssim.c
diff --git a/hw/mips/mips_r4k.c b/hw/mips/r4k.c
similarity index 100%
rename from hw/mips/mips_r4k.c
rename to hw/mips/r4k.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 8136a0e56c..f46ab150dc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1050,7 +1050,7 @@ Jazz
M: Hervé Poussineau <address@hidden>
R: Aleksandar Rikalo <address@hidden>
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 <address@hidden>
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 <address@hidden>
R: Aleksandar Rikalo <address@hidden>
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 <address@hidden>
R: Aurelien Jarno <address@hidden>
R: Aleksandar Rikalo <address@hidden>
S: Obsolete
-F: hw/mips/mips_r4k.c
+F: hw/mips/r4k.c
Fuloong 2E
M: Huacai Chen <address@hidden>
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
--
2.21.3
- [PULL 03/14] hw/pci-host/bonito: Fix DPRINTF() format strings, (continued)
- [PULL 03/14] hw/pci-host/bonito: Fix DPRINTF() format strings, Philippe Mathieu-Daudé, 2020/05/26
- [PULL 04/14] hw/pci-host/bonito: Map peripheral using physical address, Philippe Mathieu-Daudé, 2020/05/26
- [PULL 05/14] hw/pci-host/bonito: Map all the Bonito64 I/O range, Philippe Mathieu-Daudé, 2020/05/26
- [PULL 06/14] hw/pci-host/bonito: Map the different PCI ranges more detailed, Philippe Mathieu-Daudé, 2020/05/26
- [PULL 07/14] hw/pci-host/bonito: Better describe the I/O CS regions, Philippe Mathieu-Daudé, 2020/05/26
- [PULL 08/14] hw/pci-host/bonito: Set the Config register reset value with FIELD_DP32, Philippe Mathieu-Daudé, 2020/05/26
- [PULL 09/14] hw/mips/fuloong2e: Move code and update a comment, Philippe Mathieu-Daudé, 2020/05/26
- [PULL 10/14] hw/mips/fuloong2e: Fix typo in Fuloong machine name, Philippe Mathieu-Daudé, 2020/05/26
- [PULL 12/14] hw/mips/malta: Add some logging for bad register offset cases, Philippe Mathieu-Daudé, 2020/05/26
- [PULL 14/14] MAINTAINERS: Change Aleksandar Rikalo's email address, Philippe Mathieu-Daudé, 2020/05/26
- [PULL 11/14] hw/mips: Rename malta/mipssim/r4k/jazz files,
Philippe Mathieu-Daudé <=
- [PULL 13/14] hw/mips/mips_int: De-duplicate KVM interrupt delivery, Philippe Mathieu-Daudé, 2020/05/26
- Re: [PULL 00/14] mips-hw-next patches for 2020-05-26, Peter Maydell, 2020/05/27