On 7/19/21 9:50 PM, Alex Bennée wrote:
> We inadvertently added a symbol clash causing the build not to include
> the testboard needed for check-tcg.
>
> Fixes: f4063f9c31 ("meson: Introduce target-specific Kconfig")
Sorry for the mess, I remember having tested this carefully.
OK, so my patch was sent/tested first:
commit f4063f9c319e3924b0c6d09dfe43e94d01253ee0
Message-Id: <[email protected]>
but got merged *after* Bastian's series:
commit 582079c9d27fc8cfff9f495072300416e0e4aafe
Message-Id: <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
> Signed-off-by: Alex Bennée <[email protected]>
> ---
> configs/devices/tricore-softmmu/default.mak | 1 +
> hw/tricore/Kconfig | 3 +--
> hw/tricore/meson.build | 4 ++--
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/configs/devices/tricore-softmmu/default.mak
> b/configs/devices/tricore-softmmu/default.mak
> index 5cc91cebce..724cb85de7 100644
> --- a/configs/devices/tricore-softmmu/default.mak
> +++ b/configs/devices/tricore-softmmu/default.mak
> @@ -1 +1,2 @@
> +CONFIG_TRITEST=y
> CONFIG_TRIBOARD=y
> diff --git a/hw/tricore/Kconfig b/hw/tricore/Kconfig
> index 506e6183c1..a1b2438d99 100644
> --- a/hw/tricore/Kconfig
> +++ b/hw/tricore/Kconfig
> @@ -1,9 +1,8 @@
> -config TRICORE
> +config TRITEST
> bool
>
> config TRIBOARD
> bool
> - select TRICORE
> select TC27X_SOC
>
> config TC27X_SOC
> diff --git a/hw/tricore/meson.build b/hw/tricore/meson.build
> index 47e36bb077..692a4708ba 100644
> --- a/hw/tricore/meson.build
> +++ b/hw/tricore/meson.build
> @@ -1,6 +1,6 @@
> tricore_ss = ss.source_set()
> -tricore_ss.add(when: 'CONFIG_TRICORE', if_true: files('tricore_testboard.c'))
> -tricore_ss.add(when: 'CONFIG_TRICORE', if_true:
> files('tricore_testdevice.c'))
> +tricore_ss.add(when: 'CONFIG_TRITEST', if_true: files('tricore_testboard.c'))
> +tricore_ss.add(when: 'CONFIG_TRITEST', if_true:
> files('tricore_testdevice.c'))
> tricore_ss.add(when: 'CONFIG_TRIBOARD', if_true: files('triboard.c'))
> tricore_ss.add(when: 'CONFIG_TC27X_SOC', if_true: files('tc27x_soc.c'))
>
>
