ARM_COMPATIBLE_SEMIHOSTING is an architecture feature, move its declaration to each target/ARCH/.
Note, we do not modify the linux-user targets, as user-mode builds don't use Kconfig. Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> --- default-configs/devices/arm-softmmu.mak | 1 - default-configs/devices/riscv32-softmmu.mak | 1 - default-configs/devices/riscv64-softmmu.mak | 1 - target/arm/Kconfig | 1 + target/riscv/Kconfig | 2 ++ 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/default-configs/devices/arm-softmmu.mak b/default-configs/devices/arm-softmmu.mak index 341d439de6f..0824e9be795 100644 --- a/default-configs/devices/arm-softmmu.mak +++ b/default-configs/devices/arm-softmmu.mak @@ -41,5 +41,4 @@ CONFIG_MICROBIT=y CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y CONFIG_FSL_IMX6UL=y -CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y CONFIG_ALLWINNER_H3=y diff --git a/default-configs/devices/riscv32-softmmu.mak b/default-configs/devices/riscv32-softmmu.mak index 5c9ad2590ef..94a236c9c25 100644 --- a/default-configs/devices/riscv32-softmmu.mak +++ b/default-configs/devices/riscv32-softmmu.mak @@ -3,7 +3,6 @@ # Uncomment the following lines to disable these optional devices: # #CONFIG_PCI_DEVICES=n -CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y # Boards: # diff --git a/default-configs/devices/riscv64-softmmu.mak b/default-configs/devices/riscv64-softmmu.mak index d5b2e25b6df..76b61956489 100644 --- a/default-configs/devices/riscv64-softmmu.mak +++ b/default-configs/devices/riscv64-softmmu.mak @@ -3,7 +3,6 @@ # Uncomment the following lines to disable these optional devices: # #CONFIG_PCI_DEVICES=n -CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y # Boards: # diff --git a/target/arm/Kconfig b/target/arm/Kconfig index 1f05de47ca6..ae89d05c7e5 100644 --- a/target/arm/Kconfig +++ b/target/arm/Kconfig @@ -1,5 +1,6 @@ config ARM bool + select ARM_COMPATIBLE_SEMIHOSTING config AARCH64 bool diff --git a/target/riscv/Kconfig b/target/riscv/Kconfig index b9e5932f13f..c3b9d8a1cf1 100644 --- a/target/riscv/Kconfig +++ b/target/riscv/Kconfig @@ -1,5 +1,7 @@ config RISCV32 bool + select ARM_COMPATIBLE_SEMIHOSTING config RISCV64 bool + select ARM_COMPATIBLE_SEMIHOSTING -- 2.26.2