From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 17/17] hw/tricore: fix inclusion of tricore_testboard
Date: Tue, 20 Jul 2021 17:41:41 +0200 [thread overview]
Message-ID: <20210720154141.3919817-18-philmd@redhat.com> (raw)
In-Reply-To: <20210720154141.3919817-1-philmd@redhat.com>
From: Alex Bennée <alex.bennee@linaro.org>
Because commit f4063f9c319e39 ("meson: Introduce target-specific
Kconfig") ended being merged after commit 582079c9d27fc8cfff9f49
("hw/tricore: Add testdevice for tests in tests/tcg/"), 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")
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210720114057.32053-2-alex.bennee@linaro.org>
[PMD: Updated description mentioning commits merged]
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
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 5cc91cebce7..cb8fc286eb2 100644
--- a/configs/devices/tricore-softmmu/default.mak
+++ b/configs/devices/tricore-softmmu/default.mak
@@ -1 +1,2 @@
+CONFIG_TRICORE_TESTBOARD=y
CONFIG_TRIBOARD=y
diff --git a/hw/tricore/Kconfig b/hw/tricore/Kconfig
index 506e6183c17..33c1e852c33 100644
--- a/hw/tricore/Kconfig
+++ b/hw/tricore/Kconfig
@@ -1,9 +1,8 @@
-config TRICORE
+config TRICORE_TESTBOARD
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 47e36bb0778..7e3585daf8f 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_TRICORE_TESTBOARD', if_true: files('tricore_testboard.c'))
+tricore_ss.add(when: 'CONFIG_TRICORE_TESTBOARD', 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'))
--
2.31.1
next prev parent reply other threads:[~2021-07-20 15:52 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-20 15:41 [PULL 00/17] Kconfig patches for 2021-07-20 Philippe Mathieu-Daudé
2021-07-20 15:41 ` [PULL 01/17] hw/mips: Add dependency MIPS_CPS -> MIPS_ITU Philippe Mathieu-Daudé
2021-07-20 15:41 ` [PULL 02/17] hw/mips: Express dependencies of the Boston machine with Kconfig Philippe Mathieu-Daudé
2021-07-20 15:41 ` [PULL 03/17] hw/acpi: Do not restrict ACPI core routines to x86 architecture Philippe Mathieu-Daudé
2021-07-20 15:41 ` [PULL 04/17] hw/acpi/Kconfig: Add missing Kconfig dependencies (build error) Philippe Mathieu-Daudé
2021-07-20 15:41 ` [PULL 05/17] hw/i386/Kconfig: Add missing Kconfig dependency (runtime error) Philippe Mathieu-Daudé
2021-07-20 15:41 ` [PULL 06/17] hw/ide/Kconfig: Add missing dependency PCI -> IDE_QDEV Philippe Mathieu-Daudé
2021-07-20 15:41 ` [PULL 07/17] hw/arm/Kconfig: Add missing dependency NPCM7XX -> SMBUS Philippe Mathieu-Daudé
2021-07-20 15:41 ` [PULL 08/17] hw/arm/Kconfig: Remove unused DS1338 symbol from i.MX25 PDK Board Philippe Mathieu-Daudé
2021-07-20 15:41 ` [PULL 09/17] hw/arm/Kconfig: Add missing SDHCI symbol to FSL_IMX25 Philippe Mathieu-Daudé
2021-07-20 15:41 ` [PULL 10/17] hw/riscv/Kconfig: Add missing dependency MICROCHIP_PFSOC -> SERIAL Philippe Mathieu-Daudé
2021-07-20 15:41 ` [PULL 11/17] hw/riscv/Kconfig: Restrict NUMA to Virt & Spike machines Philippe Mathieu-Daudé
2021-07-20 15:41 ` [PULL 12/17] hw/ppc/Kconfig: Add missing dependency E500 -> DS1338 RTC Philippe Mathieu-Daudé
2021-07-20 15:41 ` [PULL 13/17] hw/pci-host/Kconfig: Add missing dependency MV64361 -> I8259 Philippe Mathieu-Daudé
2021-07-20 18:02 ` BALATON Zoltan
2021-07-20 15:41 ` [PULL 14/17] hw/isa/vt82c686: Add missing Kconfig dependencies (build error) Philippe Mathieu-Daudé
2021-07-20 15:41 ` [PULL 15/17] hw/isa/vt82c686: Add missing Kconfig dependency (runtime error) Philippe Mathieu-Daudé
2021-07-20 15:41 ` [PULL 16/17] hw/ppc/Kconfig: Add dependency PEGASOS2 -> ATI_VGA Philippe Mathieu-Daudé
2021-07-20 15:41 ` Philippe Mathieu-Daudé [this message]
2021-07-21 10:01 ` [PULL 00/17] Kconfig patches for 2021-07-20 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210720154141.3919817-18-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=f4bug@amsat.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).