From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PULL 20/46] riscv: switch boards to "default y"
Date: Mon, 6 May 2024 09:50:59 +0200 [thread overview]
Message-ID: <20240506075125.8238-21-pbonzini@redhat.com> (raw)
In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com>
Some targets use "default y" for boards to filter out those that require
TCG. For consistency we are switching all other targets to do the same.
Continue with RISC-V.
No changes to generated config-devices.mak file.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configs/devices/riscv32-softmmu/default.mak | 13 ++++++-------
configs/devices/riscv64-softmmu/default.mak | 15 +++++++--------
.gitlab-ci.d/buildtest.yml | 2 +-
hw/riscv/Kconfig | 14 ++++++++++++++
4 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/configs/devices/riscv32-softmmu/default.mak b/configs/devices/riscv32-softmmu/default.mak
index 07e4fd26df3..c2cd86ce05f 100644
--- a/configs/devices/riscv32-softmmu/default.mak
+++ b/configs/devices/riscv32-softmmu/default.mak
@@ -4,10 +4,9 @@
# CONFIG_PCI_DEVICES=n
# CONFIG_TEST_DEVICES=n
-# Boards:
-#
-CONFIG_SPIKE=y
-CONFIG_SIFIVE_E=y
-CONFIG_SIFIVE_U=y
-CONFIG_RISCV_VIRT=y
-CONFIG_OPENTITAN=y
+# Boards are selected by default, uncomment to keep out of the build.
+# CONFIG_SPIKE=n
+# CONFIG_SIFIVE_E=n
+# CONFIG_SIFIVE_U=n
+# CONFIG_RISCV_VIRT=n
+# CONFIG_OPENTITAN=n
diff --git a/configs/devices/riscv64-softmmu/default.mak b/configs/devices/riscv64-softmmu/default.mak
index 221963d4c5c..39ed3a0061a 100644
--- a/configs/devices/riscv64-softmmu/default.mak
+++ b/configs/devices/riscv64-softmmu/default.mak
@@ -4,11 +4,10 @@
# CONFIG_PCI_DEVICES=n
# CONFIG_TEST_DEVICES=n
-# Boards:
-#
-CONFIG_SPIKE=y
-CONFIG_SIFIVE_E=y
-CONFIG_SIFIVE_U=y
-CONFIG_RISCV_VIRT=y
-CONFIG_MICROCHIP_PFSOC=y
-CONFIG_SHAKTI_C=y
+# Boards are selected by default, uncomment to keep out of the build.
+# CONFIG_SPIKE=n
+# CONFIG_SIFIVE_E=n
+# CONFIG_SIFIVE_U=n
+# CONFIG_RISCV_VIRT=n
+# CONFIG_MICROCHIP_PFSOC=n
+# CONFIG_SHAKTI_C=n
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index a5f4b4d3793..a65b5fc9560 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -649,7 +649,7 @@ build-tci:
# Check our reduced build configurations
# requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel,
-# mips64el, or1k, ppc, ppc64, x86_64
+# mips64el, or1k, ppc, ppc64, riscv32, riscv64, x86_64
# does not build without boards: i386, loongarch64, x86_64
build-without-defaults:
extends: .native_build_job_template
diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig
index fc72ef03799..5f5f9e31bb0 100644
--- a/hw/riscv/Kconfig
+++ b/hw/riscv/Kconfig
@@ -8,6 +8,8 @@ config IBEX
config MICROCHIP_PFSOC
bool
+ default y
+ depends on RISCV64
select CADENCE_SDHCI
select CPU_CLUSTER
select MCHP_PFSOC_DMC
@@ -21,12 +23,16 @@ config MICROCHIP_PFSOC
config OPENTITAN
bool
+ default y
+ depends on RISCV32
select IBEX
select SIFIVE_PLIC
select UNIMP
config RISCV_VIRT
bool
+ default y
+ depends on RISCV32 || RISCV64
imply PCI_DEVICES
imply VIRTIO_VGA
imply TEST_DEVICES
@@ -51,6 +57,8 @@ config RISCV_VIRT
config SHAKTI_C
bool
+ default y
+ depends on RISCV64
select RISCV_ACLINT
select SHAKTI_UART
select SIFIVE_PLIC
@@ -58,6 +66,8 @@ config SHAKTI_C
config SIFIVE_E
bool
+ default y
+ depends on RISCV32 || RISCV64
select RISCV_ACLINT
select SIFIVE_GPIO
select SIFIVE_PLIC
@@ -68,6 +78,8 @@ config SIFIVE_E
config SIFIVE_U
bool
+ default y
+ depends on RISCV32 || RISCV64
select CADENCE
select CPU_CLUSTER
select RISCV_ACLINT
@@ -85,6 +97,8 @@ config SIFIVE_U
config SPIKE
bool
+ default y
+ depends on RISCV32 || RISCV64
select RISCV_NUMA
select HTIF
select RISCV_ACLINT
--
2.44.0
next prev parent reply other threads:[~2024-05-06 8:00 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-06 7:50 [PULL 00/46] Mostly build system and other cleanups patches for 2024-05-06 Paolo Bonzini
2024-05-06 7:50 ` [PULL 01/46] target/i386: Give IRQs a chance when resetting HF_INHIBIT_IRQ_MASK Paolo Bonzini
2024-05-06 7:50 ` [PULL 02/46] Kconfig: kvm: allow building without any board Paolo Bonzini
2024-05-06 7:50 ` [PULL 03/46] tests/qtest: skip m48t59-test if the machine is absent Paolo Bonzini
2024-05-06 7:50 ` [PULL 04/46] gitlab-ci: adjust msys2-64bit to be able to run qtest Paolo Bonzini
2024-05-06 7:50 ` [PULL 05/46] kvm: ppc: disable sPAPR code if CONFIG_PSERIES is disabled Paolo Bonzini
2024-05-06 7:50 ` [PULL 06/46] configs: list "implied" device groups in the default configs Paolo Bonzini
2024-05-06 7:50 ` [PULL 07/46] alpha: switch boards to "default y" Paolo Bonzini
2024-05-06 7:50 ` [PULL 08/46] arm: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 09/46] avr: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 10/46] cris: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 11/46] hppa: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 12/46] i386: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 13/46] loongarch: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 14/46] m68k: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 15/46] microblaze: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 16/46] meson: make target endianneess available to Kconfig Paolo Bonzini
2024-05-06 7:50 ` [PULL 17/46] mips: switch boards to "default y" Paolo Bonzini
2024-05-06 7:50 ` [PULL 18/46] openrisc: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 19/46] ppc: " Paolo Bonzini
2024-05-06 7:50 ` Paolo Bonzini [this message]
2024-05-06 7:51 ` [PULL 21/46] rx: " Paolo Bonzini
2024-05-06 7:51 ` [PULL 22/46] s390x: " Paolo Bonzini
2024-05-06 7:51 ` [PULL 23/46] sh4: " Paolo Bonzini
2024-05-06 7:51 ` [PULL 24/46] sparc: " Paolo Bonzini
2024-05-06 7:51 ` [PULL 25/46] tricore: " Paolo Bonzini
2024-05-06 7:51 ` [PULL 26/46] xtensa: " Paolo Bonzini
2024-05-06 7:51 ` [PULL 27/46] docs: document new convention for Kconfig board symbols Paolo Bonzini
2024-05-06 7:51 ` [PULL 28/46] target/i386: Introduce SapphireRapids-v3 to add missing features Paolo Bonzini
2024-05-06 7:51 ` [PULL 29/46] bitmap: Use g_try_new0/g_new0/g_renew Paolo Bonzini
2024-05-06 7:51 ` [PULL 30/46] build: do not build virtio-vga-gl if virgl/opengl not available Paolo Bonzini
2024-05-06 7:51 ` [PULL 31/46] fw_cfg: remove useless declarations from typedefs.h Paolo Bonzini
2024-05-06 7:51 ` [PULL 32/46] qdev-core: remove DeviceListener " Paolo Bonzini
2024-05-06 7:51 ` [PULL 33/46] numa: remove types " Paolo Bonzini
2024-05-06 7:51 ` [PULL 34/46] net: remove AnnounceTimer " Paolo Bonzini
2024-05-06 7:51 ` [PULL 35/46] qemu-option: remove QemuOpt " Paolo Bonzini
2024-05-06 7:51 ` [PULL 36/46] intc: remove PICCommonState " Paolo Bonzini
2024-05-06 7:51 ` [PULL 37/46] lockable: remove QemuLockable " Paolo Bonzini
2024-05-06 7:51 ` [PULL 38/46] migration: remove PostcopyDiscardState " Paolo Bonzini
2024-05-06 7:51 ` [PULL 39/46] monitor: remove MonitorDef " Paolo Bonzini
2024-05-06 7:51 ` [PULL 40/46] qapi/machine: remove types " Paolo Bonzini
2024-05-06 7:51 ` [PULL 41/46] display: remove GraphicHwOps " Paolo Bonzini
2024-05-06 7:51 ` [PULL 42/46] tcg: remove CPU* types " Paolo Bonzini
2024-05-06 7:51 ` [PULL 43/46] pci: remove some " Paolo Bonzini
2024-05-06 7:51 ` [PULL 44/46] kvm: move target-dependent interrupt routing out of kvm-all.c Paolo Bonzini
2024-05-06 7:51 ` [PULL 45/46] migration: do not include coroutine_int.h Paolo Bonzini
2024-05-06 7:51 ` [PULL 46/46] qga/commands-posix: fix typo in qmp_guest_set_user_password Paolo Bonzini
2024-05-06 17:17 ` [PULL 00/46] Mostly build system and other cleanups patches for 2024-05-06 Richard Henderson
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=20240506075125.8238-21-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@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 read-only IMAP folder(s) and NNTP newsgroup(s).