diff options
| author | Fabiano Rosas <farosas@suse.de> | 2023-04-26 15:00:10 -0300 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2023-05-02 10:54:32 +0100 |
| commit | 99f2f2ad9ee440b50fd33468f234d3287f8a2cfd (patch) | |
| tree | 3ee181891f4be541d7c723dcca498cd6360a73b3 | |
| parent | 43dc139c71255953237520e19ba5ebd259d24aae (diff) | |
| download | qemu-99f2f2ad9ee440b50fd33468f234d3287f8a2cfd.zip qemu-99f2f2ad9ee440b50fd33468f234d3287f8a2cfd.tar.gz qemu-99f2f2ad9ee440b50fd33468f234d3287f8a2cfd.tar.bz2 | |
arm/Kconfig: Always select SEMIHOSTING when TCG is present
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>
Message-id: 20230426180013.14814-11-farosas@suse.de
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | configs/devices/arm-softmmu/default.mak | 2 | ||||
| -rw-r--r-- | hw/arm/Kconfig | 1 | ||||
| -rw-r--r-- | 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 1b49a78..cb3e5ae 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 b53bd7f..87c1a29 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -317,7 +317,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 3f3394a..39f05b6 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 |