From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "open list:RISC-V TCG CPUs" <qemu-riscv@nongnu.org>,
"Bin Meng" <bin.meng@windriver.com>,
"Alistair Francis" <alistair.francis@wdc.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Palmer Dabbelt" <palmer@dabbelt.com>
Subject: [PATCH 07/10] hw/riscv/Kconfig: Restrict NUMA to Virt & Spike machines
Date: Thu, 13 May 2021 18:38:55 +0200 [thread overview]
Message-ID: <20210513163858.3928976-8-philmd@redhat.com> (raw)
In-Reply-To: <20210513163858.3928976-1-philmd@redhat.com>
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.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.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 b72a248809e..b22736169c1 100644
--- a/hw/riscv/Kconfig
+++ b/hw/riscv/Kconfig
@@ -1,3 +1,6 @@
+config RISCV_NUMA
+ bool
+
config IBEX
bool
@@ -35,6 +38,7 @@ config RISCV_VIRT
imply PCI_DEVICES
imply VIRTIO_VGA
imply TEST_DEVICES
+ select RISCV_NUMA
select GOLDFISH_RTC
select MSI_NONBROKEN
select PCI
@@ -75,6 +79,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.26.3
next prev parent reply other threads:[~2021-05-13 17:00 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-13 16:38 [PATCH 00/10] hw: Various Kconfig fixes Philippe Mathieu-Daudé
2021-05-13 16:38 ` [PATCH 01/10] hw/mem/nvdimm: Use Kconfig 'imply' instead of 'depends on' Philippe Mathieu-Daudé
2021-05-13 23:36 ` David Gibson
2021-05-14 3:02 ` Bin Meng
2021-05-15 17:33 ` Philippe Mathieu-Daudé
2021-05-16 0:50 ` Bin Meng
2021-05-16 12:42 ` Philippe Mathieu-Daudé
2021-05-16 14:15 ` Bin Meng
2021-05-13 16:38 ` [PATCH 02/10] hw/ide/Kconfig: Add missing dependency PCI -> QDEV Philippe Mathieu-Daudé
2021-05-14 3:03 ` Bin Meng
2021-05-13 16:38 ` [PATCH 03/10] hw/arm/Kconfig: Add missing dependency NPCM7XX -> SMBUS Philippe Mathieu-Daudé
2021-05-13 16:42 ` Hao Wu
2021-05-14 2:42 ` Bin Meng
2021-05-13 16:38 ` [PATCH 04/10] hw/arm/Kconfig: Remove unused DS1338 symbol from i.MX25 PDK Board Philippe Mathieu-Daudé
2021-05-14 2:43 ` Bin Meng
2021-05-13 16:38 ` [PATCH 05/10] hw/arm/Kconfig: Add missing SDHCI symbol to FSL_IMX25 Philippe Mathieu-Daudé
2021-05-14 2:45 ` Bin Meng
2021-05-13 16:38 ` [PATCH 06/10] hw/riscv/Kconfig: Add missing dependency MICROCHIP_PFSOC -> SERIAL Philippe Mathieu-Daudé
2021-05-14 2:47 ` Bin Meng
2021-05-14 8:14 ` Philippe Mathieu-Daudé
2021-05-13 16:38 ` Philippe Mathieu-Daudé [this message]
2021-05-14 2:49 ` [PATCH 07/10] hw/riscv/Kconfig: Restrict NUMA to Virt & Spike machines Bin Meng
2021-05-13 16:38 ` [PATCH 08/10] hw/ppc/Kconfig: Add missing dependency E500 -> DS1338 RTC Philippe Mathieu-Daudé
2021-05-13 23:36 ` David Gibson
2021-05-14 2:50 ` Bin Meng
2021-05-13 16:38 ` [PATCH 09/10] default-configs/devices: Remove implicy SEMIHOSTING config Philippe Mathieu-Daudé
2021-05-13 17:00 ` Philippe Mathieu-Daudé
2021-05-14 2:53 ` Bin Meng
2021-05-14 2:54 ` Bin Meng
2021-05-13 16:38 ` [PATCH 10/10] default-configs/devices: Clarify ARM_COMPATIBLE_SEMIHOSTING is required Philippe Mathieu-Daudé
2021-05-13 17:00 ` Philippe Mathieu-Daudé
2021-05-13 17:58 ` Paolo Bonzini
2021-05-13 18:16 ` Philippe Mathieu-Daudé
2021-05-13 17:59 ` [PATCH 00/10] hw: Various Kconfig fixes Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210513163858.3928976-8-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=alistair.francis@wdc.com \
--cc=bin.meng@windriver.com \
--cc=palmer@dabbelt.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).