ARM_COMPATIBLE_SEMIHOSTING is not optional on these targets. Move the variable assignment out of the block documented with "Uncomment the following lines to disable these optional devices".
Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> --- default-configs/devices/arm-softmmu.mak | 4 +++- default-configs/devices/riscv32-softmmu.mak | 4 +++- default-configs/devices/riscv64-softmmu.mak | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/default-configs/devices/arm-softmmu.mak b/default-configs/devices/arm-softmmu.mak index 341d439de6f..2713e5e9eb7 100644 --- a/default-configs/devices/arm-softmmu.mak +++ b/default-configs/devices/arm-softmmu.mak @@ -1,5 +1,8 @@ # Default configuration for arm-softmmu +# TODO: semihosting is always required - move to default-configs/targets/ +CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y + # TODO: ARM_V7M is currently always required - make this more flexible! CONFIG_ARM_V7M=y @@ -41,5 +44,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..7219f9749ad 100644 --- a/default-configs/devices/riscv32-softmmu.mak +++ b/default-configs/devices/riscv32-softmmu.mak @@ -1,9 +1,11 @@ # Default configuration for riscv32-softmmu +# TODO: semihosting is always required - move to default-configs/targets/ +CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y + # 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 8a92f0a2c74..1d1b8bb9f68 100644 --- a/default-configs/devices/riscv64-softmmu.mak +++ b/default-configs/devices/riscv64-softmmu.mak @@ -1,9 +1,11 @@ # Default configuration for riscv64-softmmu +# TODO: semihosting is always required - move to default-configs/targets/ +CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y + # Uncomment the following lines to disable these optional devices: # #CONFIG_PCI_DEVICES=n -CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y # Boards: # -- 2.26.3