include/hw/or1k: Rename from openrisc

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Stafford Horne <shorne@gmail.com>
Message-ID: <20260205030244.266447-3-richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 08bcd8892ac91b748ea95e7597dbc667d9bb999c..ea52060bfe7964ee550280c45672eb8ac8a7a71c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -305,7 +305,7 @@ S: Odd Fixes
 F: docs/system/openrisc/cpu-features.rst
 F: target/or1k/
 F: hw/openrisc/
-F: include/hw/openrisc/
+F: include/hw/or1k/
 F: tests/functional/or1k/meson.build
 F: tests/tcg/openrisc/
 

diff --git a/hw/openrisc/boot.c b/hw/openrisc/boot.c
index 6256babc42acc20aef495da72123819901b05cc4..c18f4a6a9fcafcf65cea0d6427ae115442f30f5a 100644 (file)
--- a/hw/openrisc/boot.c
+++ b/hw/openrisc/boot.c
@@ -12,7 +12,7 @@
 #include "exec/target_page.h"
 #include "elf.h"
 #include "hw/core/loader.h"
-#include "hw/openrisc/boot.h"
+#include "hw/or1k/boot.h"
 #include "system/device_tree.h"
 #include "system/qtest.h"
 #include "system/reset.h"

diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index 603d8ca0d990461d3f0558cb69441d4e668df177..f1b1f63274b97e794bc3e812e23b6289f2b6d552 100644 (file)
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -26,7 +26,7 @@
 #include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "net/net.h"
-#include "hw/openrisc/boot.h"
+#include "hw/or1k/boot.h"
 #include "hw/core/qdev-properties.h"
 #include "system/address-spaces.h"
 #include "system/device_tree.h"

diff --git a/hw/openrisc/virt.c b/hw/openrisc/virt.c
index 54ce96666e56504225873d4a9631e2fd71e38dc2..39f54058ab3515d5da635d890c8f9d206822c274 100644 (file)
--- a/hw/openrisc/virt.c
+++ b/hw/openrisc/virt.c
@@ -16,7 +16,7 @@
 #include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "hw/core/split-irq.h"
-#include "hw/openrisc/boot.h"
+#include "hw/or1k/boot.h"
 #include "hw/misc/sifive_test.h"
 #include "hw/pci/pci.h"
 #include "hw/pci-host/gpex.h"

diff --git a/include/hw/openrisc/boot.h b/include/hw/or1k/boot.h
similarity index 93%
rename from include/hw/openrisc/boot.h
rename to include/hw/or1k/boot.h
index 3c481bdea68ab3a53446a885f6f49e0e124eff66..2e6131580c7cd349e049b5723b721190168b4fab 100644 (file)
--- a/include/hw/openrisc/boot.h
+++ b/include/hw/or1k/boot.h
@@ -16,8 +16,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef OPENRISC_BOOT_H
-#define OPENRISC_BOOT_H
+#ifndef OR1K_BOOT_H
+#define OR1K_BOOT_H
 
 #include "exec/cpu-defs.h"
 #include "hw/core/boards.h"
@@ -32,4 +32,4 @@ hwaddr openrisc_load_initrd(void *fdt, const char *filename,
 uint32_t openrisc_load_fdt(MachineState *ms, void *fdt, hwaddr load_start,
                            uint64_t mem_size);
 
-#endif /* OPENRISC_BOOT_H */
+#endif /* OR1K_BOOT_H */