[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH RESEND v5 26/28] arm/Kconfig: Always select SEMIHOSTING when TCG
From: |
Fabiano Rosas |
Subject: |
[PATCH RESEND v5 26/28] arm/Kconfig: Always select SEMIHOSTING when TCG is present |
Date: |
Mon, 13 Feb 2023 17:29:25 -0300 |
We are about to enable the build without TCG, so CONFIG_SEMIHOSTING
and CONFIG_ARM_COMPATIBLE_SEMIHOSTING cannot be unconditionally set in
default.mak anymore. So reflect the change in a Kconfig.
Instead of using semihosting/Kconfig, use a target-specific file, so
that the change doesn't affect other architectures which might
implement semihosting in a way compatible with KVM.
The selection from ARM_v7M needs to be removed to avoid a cycle during
parsing.
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
configs/devices/arm-softmmu/default.mak | 2 --
hw/arm/Kconfig | 1 -
target/arm/Kconfig | 7 +++++++
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/configs/devices/arm-softmmu/default.mak
b/configs/devices/arm-softmmu/default.mak
index 1b49a7830c..cb3e5aea65 100644
--- a/configs/devices/arm-softmmu/default.mak
+++ b/configs/devices/arm-softmmu/default.mak
@@ -40,6 +40,4 @@ CONFIG_MICROBIT=y
CONFIG_FSL_IMX25=y
CONFIG_FSL_IMX7=y
CONFIG_FSL_IMX6UL=y
-CONFIG_SEMIHOSTING=y
-CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
CONFIG_ALLWINNER_H3=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 2d157de9b8..ef518c1f1d 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -316,7 +316,6 @@ config ARM_V7M
# currently v7M must be included in a TCG build due to translate.c
default y if TCG && (ARM || AARCH64)
select PTIMER
- select ARM_COMPATIBLE_SEMIHOSTING
config ALLWINNER_A10
bool
diff --git a/target/arm/Kconfig b/target/arm/Kconfig
index 3f3394a22b..39f05b6420 100644
--- a/target/arm/Kconfig
+++ b/target/arm/Kconfig
@@ -4,3 +4,10 @@ config ARM
config AARCH64
bool
select ARM
+
+# This config exists just so we can make SEMIHOSTING default when TCG
+# is selected without also changing it for other architectures.
+config ARM_SEMIHOSTING
+ bool
+ default y if TCG && ARM
+ select ARM_COMPATIBLE_SEMIHOSTING
--
2.35.3
- Re: [PATCH RESEND v5 17/28] target/arm: Move cortex sysregs into cpregs.c, (continued)
- [PATCH RESEND v5 18/28] tests/avocado: Skip tests that require a missing accelerator, Fabiano Rosas, 2023/02/13
- [PATCH RESEND v5 19/28] tests/avocado: Tag TCG tests with accel:tcg, Fabiano Rosas, 2023/02/13
- [PATCH RESEND v5 20/28] target/arm: Move 64-bit TCG CPUs into tcg/, Fabiano Rosas, 2023/02/13
- [PATCH RESEND v5 21/28] target/arm: move cpu_tcg to tcg/cpu32.c, Fabiano Rosas, 2023/02/13
- [PATCH RESEND v5 22/28] target/arm: Use "max" as default cpu for the virt machine with KVM, Fabiano Rosas, 2023/02/13
- [PATCH RESEND v5 23/28] tests/qtest: arm-cpu-features: Match tests to required accelerators, Fabiano Rosas, 2023/02/13
- [PATCH RESEND v5 24/28] tests/qtest: Restrict tpm-tis-devices-{swtpm}-test to CONFIG_TCG, Fabiano Rosas, 2023/02/13
- [PATCH RESEND v5 25/28] target/avocado: Pass parameters to migration test on aarch64, Fabiano Rosas, 2023/02/13
- [PATCH RESEND v5 26/28] arm/Kconfig: Always select SEMIHOSTING when TCG is present,
Fabiano Rosas <=
- [PATCH RESEND v5 27/28] arm/Kconfig: Do not build TCG-only boards on a KVM-only build, Fabiano Rosas, 2023/02/13
- [PATCH RESEND v5 28/28] gitlab-ci: Check building KVM-only aarch64 target, Fabiano Rosas, 2023/02/13
- Re: [PATCH RESEND v5 00/28] target/arm: Allow CONFIG_TCG=n builds, Peter Maydell, 2023/02/16