aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@redhat.com>2021-05-13 08:07:56 +0200
committerPhilippe Mathieu-Daudé <philmd@redhat.com>2021-07-20 15:32:49 +0200
commit6e4dd94f77d769daa5a56d1b02b9c6a697db5270 (patch)
treee7ab9adfd2575917b9c9147d24db23a4c3c92e50
parent8cbb537ea979c5312cbcb2770d1afae3779be7a1 (diff)
downloadqemu-6e4dd94f77d769daa5a56d1b02b9c6a697db5270.zip
qemu-6e4dd94f77d769daa5a56d1b02b9c6a697db5270.tar.gz
qemu-6e4dd94f77d769daa5a56d1b02b9c6a697db5270.tar.bz2
hw/riscv/Kconfig: Restrict NUMA to Virt & Spike machines
Only the Virt and Spike machines use NUMA. Add a RISCV_NUMA Kconfig symbol and only have these machines select it. Adapt the Meson file to only built it if required. Acked-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20210515173716.358295-8-philmd@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
-rw-r--r--hw/riscv/Kconfig5
-rw-r--r--hw/riscv/meson.build2
2 files changed, 6 insertions, 1 deletions
diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig
index 86957ec..0590f44 100644
--- a/hw/riscv/Kconfig
+++ b/hw/riscv/Kconfig
@@ -1,3 +1,6 @@
+config RISCV_NUMA
+ bool
+
config IBEX
bool
@@ -34,6 +37,7 @@ config RISCV_VIRT
imply PCI_DEVICES
imply VIRTIO_VGA
imply TEST_DEVICES
+ select RISCV_NUMA
select GOLDFISH_RTC
select MSI_NONBROKEN
select PCI
@@ -74,6 +78,7 @@ config SIFIVE_U
config SPIKE
bool
+ select RISCV_NUMA
select HTIF
select MSI_NONBROKEN
select SIFIVE_CLINT
diff --git a/hw/riscv/meson.build b/hw/riscv/meson.build
index a974546..ab6cae5 100644
--- a/hw/riscv/meson.build
+++ b/hw/riscv/meson.build
@@ -1,6 +1,6 @@
riscv_ss = ss.source_set()
riscv_ss.add(files('boot.c'), fdt)
-riscv_ss.add(files('numa.c'))
+riscv_ss.add(when: 'CONFIG_RISCV_NUMA', if_true: files('numa.c'))
riscv_ss.add(files('riscv_hart.c'))
riscv_ss.add(when: 'CONFIG_OPENTITAN', if_true: files('opentitan.c'))
riscv_ss.add(when: 'CONFIG_RISCV_VIRT', if_true: files('virt.c'))