[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/17] hw/riscv/Kconfig: Restrict NUMA to Virt & Spike machines
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 11/17] hw/riscv/Kconfig: Restrict NUMA to Virt & Spike machines |
Date: |
Tue, 20 Jul 2021 17:41:35 +0200 |
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>
---
hw/riscv/Kconfig | 5 +++++
hw/riscv/meson.build | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig
index 86957ec7b06..0590f443fdf 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 a97454661c0..ab6cae57eae 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'))
--
2.31.1
- [PULL 00/17] Kconfig patches for 2021-07-20, Philippe Mathieu-Daudé, 2021/07/20
- [PULL 01/17] hw/mips: Add dependency MIPS_CPS -> MIPS_ITU, Philippe Mathieu-Daudé, 2021/07/20
- [PULL 02/17] hw/mips: Express dependencies of the Boston machine with Kconfig, Philippe Mathieu-Daudé, 2021/07/20
- [PULL 03/17] hw/acpi: Do not restrict ACPI core routines to x86 architecture, Philippe Mathieu-Daudé, 2021/07/20
- [PULL 04/17] hw/acpi/Kconfig: Add missing Kconfig dependencies (build error), Philippe Mathieu-Daudé, 2021/07/20
- [PULL 05/17] hw/i386/Kconfig: Add missing Kconfig dependency (runtime error), Philippe Mathieu-Daudé, 2021/07/20
- [PULL 06/17] hw/ide/Kconfig: Add missing dependency PCI -> IDE_QDEV, Philippe Mathieu-Daudé, 2021/07/20
- [PULL 07/17] hw/arm/Kconfig: Add missing dependency NPCM7XX -> SMBUS, Philippe Mathieu-Daudé, 2021/07/20
- [PULL 08/17] hw/arm/Kconfig: Remove unused DS1338 symbol from i.MX25 PDK Board, Philippe Mathieu-Daudé, 2021/07/20
- [PULL 09/17] hw/arm/Kconfig: Add missing SDHCI symbol to FSL_IMX25, Philippe Mathieu-Daudé, 2021/07/20
- [PULL 11/17] hw/riscv/Kconfig: Restrict NUMA to Virt & Spike machines,
Philippe Mathieu-Daudé <=
- [PULL 12/17] hw/ppc/Kconfig: Add missing dependency E500 -> DS1338 RTC, Philippe Mathieu-Daudé, 2021/07/20
- [PULL 13/17] hw/pci-host/Kconfig: Add missing dependency MV64361 -> I8259, Philippe Mathieu-Daudé, 2021/07/20
- [PULL 14/17] hw/isa/vt82c686: Add missing Kconfig dependencies (build error), Philippe Mathieu-Daudé, 2021/07/20
- [PULL 15/17] hw/isa/vt82c686: Add missing Kconfig dependency (runtime error), Philippe Mathieu-Daudé, 2021/07/20
- [PULL 16/17] hw/ppc/Kconfig: Add dependency PEGASOS2 -> ATI_VGA, Philippe Mathieu-Daudé, 2021/07/20
- [PULL 17/17] hw/tricore: fix inclusion of tricore_testboard, Philippe Mathieu-Daudé, 2021/07/20
- [PULL 10/17] hw/riscv/Kconfig: Add missing dependency MICROCHIP_PFSOC -> SERIAL, Philippe Mathieu-Daudé, 2021/07/20
- Re: [PULL 00/17] Kconfig patches for 2021-07-20, Peter Maydell, 2021/07/21