[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 21/25] hw/core: Move the ARM sysbus-fdt to core
From: |
Alistair Francis |
Subject: |
[PULL 21/25] hw/core: Move the ARM sysbus-fdt to core |
Date: |
Fri, 29 Apr 2022 14:31:15 +1000 |
From: Alistair Francis <alistair.francis@wdc.com>
The ARM virt machine currently uses sysbus-fdt to create device tree
entries for dynamically created MMIO devices.
The RISC-V virt machine can also benefit from this, so move the code to
the core directory.
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@amd.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Message-Id: <20220427234146.1130752-3-alistair.francis@opensource.wdc.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
include/hw/{arm => core}/sysbus-fdt.h | 0
hw/arm/virt.c | 2 +-
hw/arm/xlnx-versal-virt.c | 1 -
hw/{arm => core}/sysbus-fdt.c | 2 +-
hw/arm/meson.build | 1 -
hw/core/meson.build | 1 +
6 files changed, 3 insertions(+), 4 deletions(-)
rename include/hw/{arm => core}/sysbus-fdt.h (100%)
rename hw/{arm => core}/sysbus-fdt.c (99%)
diff --git a/include/hw/arm/sysbus-fdt.h b/include/hw/core/sysbus-fdt.h
similarity index 100%
rename from include/hw/arm/sysbus-fdt.h
rename to include/hw/core/sysbus-fdt.h
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 5bdd98e4a1..f94278935f 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -56,7 +56,7 @@
#include "qemu/module.h"
#include "hw/pci-host/gpex.h"
#include "hw/virtio/virtio-pci.h"
-#include "hw/arm/sysbus-fdt.h"
+#include "hw/core/sysbus-fdt.h"
#include "hw/platform-bus.h"
#include "hw/qdev-properties.h"
#include "hw/arm/fdt.h"
diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c
index 66a2de7e13..37fc9b919c 100644
--- a/hw/arm/xlnx-versal-virt.c
+++ b/hw/arm/xlnx-versal-virt.c
@@ -15,7 +15,6 @@
#include "sysemu/device_tree.h"
#include "hw/boards.h"
#include "hw/sysbus.h"
-#include "hw/arm/sysbus-fdt.h"
#include "hw/arm/fdt.h"
#include "cpu.h"
#include "hw/qdev-properties.h"
diff --git a/hw/arm/sysbus-fdt.c b/hw/core/sysbus-fdt.c
similarity index 99%
rename from hw/arm/sysbus-fdt.c
rename to hw/core/sysbus-fdt.c
index 48c5fe9bf1..19d22cbe73 100644
--- a/hw/arm/sysbus-fdt.c
+++ b/hw/core/sysbus-fdt.c
@@ -27,7 +27,7 @@
#ifdef CONFIG_LINUX
#include <linux/vfio.h>
#endif
-#include "hw/arm/sysbus-fdt.h"
+#include "hw/core/sysbus-fdt.h"
#include "qemu/error-report.h"
#include "sysemu/device_tree.h"
#include "sysemu/tpm.h"
diff --git a/hw/arm/meson.build b/hw/arm/meson.build
index 721a8eb8be..122e5dd992 100644
--- a/hw/arm/meson.build
+++ b/hw/arm/meson.build
@@ -1,6 +1,5 @@
arm_ss = ss.source_set()
arm_ss.add(files('boot.c'), fdt)
-arm_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('sysbus-fdt.c'))
arm_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c'))
arm_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c'))
arm_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic_boards.c'))
diff --git a/hw/core/meson.build b/hw/core/meson.build
index 0f884d6fd4..7a4d02b6c0 100644
--- a/hw/core/meson.build
+++ b/hw/core/meson.build
@@ -33,6 +33,7 @@ softmmu_ss.add(when: 'CONFIG_PTIMER', if_true:
files('ptimer.c'))
softmmu_ss.add(when: 'CONFIG_REGISTER', if_true: files('register.c'))
softmmu_ss.add(when: 'CONFIG_SPLIT_IRQ', if_true: files('split-irq.c'))
softmmu_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('stream.c'))
+softmmu_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('sysbus-fdt.c'))
softmmu_ss.add(files(
'cpu-sysemu.c',
--
2.35.1
- [PULL 11/25] target/riscv: rvk: add support for sha256 related instructions in zknh extension, (continued)
- [PULL 11/25] target/riscv: rvk: add support for sha256 related instructions in zknh extension, Alistair Francis, 2022/04/29
- [PULL 12/25] target/riscv: rvk: add support for sha512 related instructions for RV32 in zknh extension, Alistair Francis, 2022/04/29
- [PULL 13/25] target/riscv: rvk: add support for sha512 related instructions for RV64 in zknh extension, Alistair Francis, 2022/04/29
- [PULL 14/25] target/riscv: rvk: add support for zksed/zksh extension, Alistair Francis, 2022/04/29
- [PULL 15/25] target/riscv: rvk: add CSR support for Zkr, Alistair Francis, 2022/04/29
- [PULL 16/25] disas/riscv.c: rvk: add disas support for Zbk* and Zk* instructions, Alistair Francis, 2022/04/29
- [PULL 17/25] target/riscv: rvk: expose zbk* and zk* properties, Alistair Francis, 2022/04/29
- [PULL 18/25] target/riscv: Fix incorrect PTE merge in walk_pte, Alistair Francis, 2022/04/29
- [PULL 19/25] target/riscv: add scalar crypto related extenstion strings to isa_string, Alistair Francis, 2022/04/29
- [PULL 20/25] hw/riscv: virt: Add a machine done notifier, Alistair Francis, 2022/04/29
- [PULL 21/25] hw/core: Move the ARM sysbus-fdt to core,
Alistair Francis <=
- [PULL 22/25] hw/riscv: virt: Create a platform bus, Alistair Francis, 2022/04/29
- [PULL 23/25] hw/riscv: virt: Add support for generating platform FDT entries, Alistair Francis, 2022/04/29
- [PULL 24/25] hw/riscv: virt: Add device plug support, Alistair Francis, 2022/04/29
- [PULL 25/25] hw/riscv: Enable TPM backends, Alistair Francis, 2022/04/29
- Re: [PULL 00/25] riscv-to-apply queue, Richard Henderson, 2022/04/29