From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: qemu-devel@nongnu.org Cc: "Alistair Francis" <alistair.francis@wdc.com>, qemu-riscv@nongnu.org, "Bin Meng" <bin.meng@windriver.com>, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>, "Bin Meng" <bmeng.cn@gmail.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Palmer Dabbelt" <palmer@dabbelt.com>, "David Gibson" <david@gibson.dropbear.id.au> Subject: [PATCH v2 07/12] hw/riscv/Kconfig: Restrict NUMA to Virt & Spike machines Date: Sat, 15 May 2021 19:37:11 +0200 [thread overview] Message-ID: <20210515173716.358295-8-philmd@redhat.com> (raw) In-Reply-To: <20210515173716.358295-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. Acked-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> 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 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.26.3
WARNING: multiple messages have this Message-ID (diff)
From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: qemu-devel@nongnu.org Cc: "Bin Meng" <bin.meng@windriver.com>, "Paolo Bonzini" <pbonzini@redhat.com>, qemu-riscv@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, "BALATON Zoltan" <balaton@eik.bme.hu>, "David Gibson" <david@gibson.dropbear.id.au>, "Alistair Francis" <alistair.francis@wdc.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Bin Meng" <bmeng.cn@gmail.com>, "Palmer Dabbelt" <palmer@dabbelt.com> Subject: [PATCH v2 07/12] hw/riscv/Kconfig: Restrict NUMA to Virt & Spike machines Date: Sat, 15 May 2021 19:37:11 +0200 [thread overview] Message-ID: <20210515173716.358295-8-philmd@redhat.com> (raw) In-Reply-To: <20210515173716.358295-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. Acked-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> 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 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.26.3
next prev parent reply other threads:[~2021-05-15 17:48 UTC|newest] Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-15 17:37 [PATCH v2 00/12] hw: Various Kconfig fixes Philippe Mathieu-Daudé 2021-05-15 17:37 ` Philippe Mathieu-Daudé 2021-05-15 17:37 ` [PATCH v2 01/12] hw/mem/nvdimm: Use Kconfig 'imply' instead of 'depends on' Philippe Mathieu-Daudé 2021-05-15 17:37 ` Philippe Mathieu-Daudé 2021-05-17 2:33 ` Bin Meng 2021-05-17 2:33 ` Bin Meng 2021-05-15 17:37 ` [PATCH v2 02/12] hw/ide/Kconfig: Add missing dependency PCI -> IDE_QDEV Philippe Mathieu-Daudé 2021-05-15 17:37 ` Philippe Mathieu-Daudé 2021-05-18 19:09 ` John Snow 2021-05-18 19:09 ` John Snow 2021-05-15 17:37 ` [PATCH v2 03/12] hw/arm/Kconfig: Add missing dependency NPCM7XX -> SMBUS Philippe Mathieu-Daudé 2021-05-15 17:37 ` Philippe Mathieu-Daudé 2021-05-15 17:37 ` [PATCH v2 04/12] hw/arm/Kconfig: Remove unused DS1338 symbol from i.MX25 PDK Board Philippe Mathieu-Daudé 2021-05-15 17:37 ` Philippe Mathieu-Daudé 2021-05-15 17:37 ` [PATCH v2 05/12] hw/arm/Kconfig: Add missing SDHCI symbol to FSL_IMX25 Philippe Mathieu-Daudé 2021-05-15 17:37 ` Philippe Mathieu-Daudé 2021-05-15 17:37 ` [PATCH v2 06/12] hw/riscv/Kconfig: Add missing dependency MICROCHIP_PFSOC -> SERIAL Philippe Mathieu-Daudé 2021-05-15 17:37 ` Philippe Mathieu-Daudé 2021-05-16 22:45 ` Alistair Francis 2021-05-16 22:45 ` Alistair Francis 2021-05-17 1:55 ` Bin Meng 2021-05-17 1:55 ` Bin Meng 2021-05-15 17:37 ` Philippe Mathieu-Daudé [this message] 2021-05-15 17:37 ` [PATCH v2 07/12] hw/riscv/Kconfig: Restrict NUMA to Virt & Spike machines Philippe Mathieu-Daudé 2021-05-16 22:46 ` Alistair Francis 2021-05-16 22:46 ` Alistair Francis 2021-05-15 17:37 ` [PATCH v2 08/12] hw/ppc/Kconfig: Add missing dependency E500 -> DS1338 RTC Philippe Mathieu-Daudé 2021-05-15 17:37 ` Philippe Mathieu-Daudé 2021-05-15 17:37 ` [PATCH v2 09/12] hw/pci-host/Kconfig: Add missing dependency MV64361 -> I8259 Philippe Mathieu-Daudé 2021-05-15 17:37 ` Philippe Mathieu-Daudé 2021-05-15 19:46 ` BALATON Zoltan 2021-05-15 19:46 ` BALATON Zoltan 2021-05-17 2:49 ` Bin Meng 2021-05-17 2:49 ` Bin Meng 2021-05-17 5:10 ` Philippe Mathieu-Daudé 2021-05-17 5:10 ` Philippe Mathieu-Daudé 2021-05-17 3:13 ` David Gibson 2021-05-17 3:13 ` David Gibson 2021-05-15 17:37 ` [PATCH v2 10/12] hw/isa/vt82c686: Add missing Kconfig dependencies (build error) Philippe Mathieu-Daudé 2021-05-15 17:37 ` Philippe Mathieu-Daudé 2021-05-15 19:42 ` BALATON Zoltan 2021-05-15 19:42 ` BALATON Zoltan 2021-05-17 2:50 ` Bin Meng 2021-05-17 2:50 ` Bin Meng 2021-05-15 17:37 ` [PATCH v2 11/12] hw/isa/vt82c686: Add missing Kconfig dependency (runtime error) Philippe Mathieu-Daudé 2021-05-15 17:37 ` Philippe Mathieu-Daudé 2021-05-15 19:36 ` BALATON Zoltan 2021-05-15 19:36 ` BALATON Zoltan 2021-05-17 2:52 ` Bin Meng 2021-05-17 2:52 ` Bin Meng 2021-05-15 17:37 ` [PATCH v2 12/12] hw/ppc/Kconfig: Add dependency PEGASOS2 -> ATI_VGA Philippe Mathieu-Daudé 2021-05-15 17:37 ` Philippe Mathieu-Daudé 2021-05-15 19:41 ` BALATON Zoltan 2021-05-15 19:41 ` BALATON Zoltan 2021-05-15 19:58 ` Philippe Mathieu-Daudé 2021-05-15 19:58 ` Philippe Mathieu-Daudé 2021-05-17 2:54 ` Bin Meng 2021-05-17 2:54 ` Bin Meng 2021-05-17 3:14 ` David Gibson 2021-05-17 3:14 ` David Gibson 2021-05-17 19:18 ` [PATCH v2 00/12] hw: Various Kconfig fixes Eduardo Habkost 2021-05-17 19:18 ` Eduardo Habkost 2021-05-17 20:04 ` Eduardo Habkost 2021-05-17 20:04 ` Eduardo Habkost 2021-05-18 20:11 ` Philippe Mathieu-Daudé 2021-05-18 20:11 ` Philippe Mathieu-Daudé 2021-06-03 16:40 ` Alex Bennée 2021-06-03 16:40 ` Alex Bennée
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=20210515173716.358295-8-philmd@redhat.com \ --to=philmd@redhat.com \ --cc=alistair.francis@wdc.com \ --cc=bin.meng@windriver.com \ --cc=bmeng.cn@gmail.com \ --cc=david@gibson.dropbear.id.au \ --cc=palmer@dabbelt.com \ --cc=pbonzini@redhat.com \ --cc=qemu-arm@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=qemu-ppc@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.