Re: [PATCH] kconfig: use "select" to enable semihosting

[Alistair Francis]

On Mon, Jan 29, 2024 at 9:59 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> Just like all other dependencies, these can be expressed in Kconfig
> files rather than in the default configurations.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Acked-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  configs/devices/m68k-softmmu/default.mak    | 2 --
>  configs/devices/mips-softmmu/common.mak     | 3 ---
>  configs/devices/nios2-softmmu/default.mak   | 2 --
>  configs/devices/riscv32-softmmu/default.mak | 2 --
>  configs/devices/riscv64-softmmu/default.mak | 2 --
>  configs/devices/xtensa-softmmu/default.mak  | 2 --
>  target/m68k/Kconfig                         | 1 +
>  target/mips/Kconfig                         | 1 +
>  target/nios2/Kconfig                        | 1 +
>  target/riscv/Kconfig                        | 2 ++
>  target/xtensa/Kconfig                       | 1 +
>  11 files changed, 6 insertions(+), 13 deletions(-)
>
> diff --git a/configs/devices/m68k-softmmu/default.mak 
> b/configs/devices/m68k-softmmu/default.mak
> index 7f8619e4278..8dcaa28ed38 100644
> --- a/configs/devices/m68k-softmmu/default.mak
> +++ b/configs/devices/m68k-softmmu/default.mak
> @@ -1,7 +1,5 @@
>  # Default configuration for m68k-softmmu
>
> -CONFIG_SEMIHOSTING=y
> -
>  # Boards:
>  #
>  CONFIG_AN5206=y
> diff --git a/configs/devices/mips-softmmu/common.mak 
> b/configs/devices/mips-softmmu/common.mak
> index 7da99327a77..1a853841b27 100644
> --- a/configs/devices/mips-softmmu/common.mak
> +++ b/configs/devices/mips-softmmu/common.mak
> @@ -1,8 +1,5 @@
>  # Common mips*-softmmu CONFIG defines
>
> -# CONFIG_SEMIHOSTING is always required on this architecture
> -CONFIG_SEMIHOSTING=y
> -
>  CONFIG_ISA_BUS=y
>  CONFIG_PCI=y
>  CONFIG_PCI_DEVICES=y
> diff --git a/configs/devices/nios2-softmmu/default.mak 
> b/configs/devices/nios2-softmmu/default.mak
> index 1bc4082ea99..e130d024e62 100644
> --- a/configs/devices/nios2-softmmu/default.mak
> +++ b/configs/devices/nios2-softmmu/default.mak
> @@ -1,7 +1,5 @@
>  # Default configuration for nios2-softmmu
>
> -CONFIG_SEMIHOSTING=y
> -
>  # Boards:
>  #
>  CONFIG_NIOS2_10M50=y
> diff --git a/configs/devices/riscv32-softmmu/default.mak 
> b/configs/devices/riscv32-softmmu/default.mak
> index d847bd5692e..94a236c9c25 100644
> --- a/configs/devices/riscv32-softmmu/default.mak
> +++ b/configs/devices/riscv32-softmmu/default.mak
> @@ -3,8 +3,6 @@
>  # Uncomment the following lines to disable these optional devices:
>  #
>  #CONFIG_PCI_DEVICES=n
> -CONFIG_SEMIHOSTING=y
> -CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
>
>  # Boards:
>  #
> diff --git a/configs/devices/riscv64-softmmu/default.mak 
> b/configs/devices/riscv64-softmmu/default.mak
> index bc69301fa4a..3f680594484 100644
> --- a/configs/devices/riscv64-softmmu/default.mak
> +++ b/configs/devices/riscv64-softmmu/default.mak
> @@ -3,8 +3,6 @@
>  # Uncomment the following lines to disable these optional devices:
>  #
>  #CONFIG_PCI_DEVICES=n
> -CONFIG_SEMIHOSTING=y
> -CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
>
>  # Boards:
>  #
> diff --git a/configs/devices/xtensa-softmmu/default.mak 
> b/configs/devices/xtensa-softmmu/default.mak
> index 4fe1bf00c94..49e4c9da88c 100644
> --- a/configs/devices/xtensa-softmmu/default.mak
> +++ b/configs/devices/xtensa-softmmu/default.mak
> @@ -1,7 +1,5 @@
>  # Default configuration for Xtensa
>
> -CONFIG_SEMIHOSTING=y
> -
>  # Boards:
>  #
>  CONFIG_XTENSA_SIM=y
> diff --git a/target/m68k/Kconfig b/target/m68k/Kconfig
> index 23debad519a..9eae71486ff 100644
> --- a/target/m68k/Kconfig
> +++ b/target/m68k/Kconfig
> @@ -1,2 +1,3 @@
>  config M68K
>      bool
> +    select SEMIHOSTING
> diff --git a/target/mips/Kconfig b/target/mips/Kconfig
> index 6adf1453548..eb19c94c7d4 100644
> --- a/target/mips/Kconfig
> +++ b/target/mips/Kconfig
> @@ -1,5 +1,6 @@
>  config MIPS
>      bool
> +    select SEMIHOSTING
>
>  config MIPS64
>      bool
> diff --git a/target/nios2/Kconfig b/target/nios2/Kconfig
> index 1529ab8950d..c65550c861a 100644
> --- a/target/nios2/Kconfig
> +++ b/target/nios2/Kconfig
> @@ -1,2 +1,3 @@
>  config NIOS2
>      bool
> +    select SEMIHOSTING
> diff --git a/target/riscv/Kconfig b/target/riscv/Kconfig
> index b9e5932f13f..adb7de3f37d 100644
> --- a/target/riscv/Kconfig
> +++ b/target/riscv/Kconfig
> @@ -1,5 +1,7 @@
>  config RISCV32
>      bool
> +    select ARM_COMPATIBLE_SEMIHOSTING # for do_common_semihosting()
>
>  config RISCV64
>      bool
> +    select ARM_COMPATIBLE_SEMIHOSTING # for do_common_semihosting()
> diff --git a/target/xtensa/Kconfig b/target/xtensa/Kconfig
> index a3c8dc7f6d7..5e46049262d 100644
> --- a/target/xtensa/Kconfig
> +++ b/target/xtensa/Kconfig
> @@ -1,2 +1,3 @@
>  config XTENSA
>      bool
> +    select SEMIHOSTING
> --
> 2.43.0
>
>