[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 25/29] hw/tricore: fix inclusion of tricore_testboard
From: |
Alex Bennée |
Subject: |
[PATCH v1 25/29] hw/tricore: fix inclusion of tricore_testboard |
Date: |
Wed, 21 Jul 2021 00:26:59 +0100 |
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")
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210720114057.32053-2-alex.bennee@linaro.org>
---
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..cb8fc286eb 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 506e6183c1..33c1e852c3 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 47e36bb077..7e3585daf8 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.32.0.264.g75ae10bc75
- [PATCH v1 09/29] gitdm.config: sort the corporate GroupMap entries, (continued)
- [PATCH v1 09/29] gitdm.config: sort the corporate GroupMap entries, Alex Bennée, 2021/07/20
- [PATCH v1 12/29] contrib/gitdm: add domain-map/group-map for Wind River, Alex Bennée, 2021/07/20
- [PATCH v1 10/29] contrib/gitdm: add domain-map/group-map mappings for Samsung, Alex Bennée, 2021/07/20
- [PATCH v1 23/29] plugins/cache: Fixed "function decl. is not a prototype" warnings, Alex Bennée, 2021/07/20
- [PATCH v1 11/29] contrib/gitdm: add domain-map for Eldorado, Alex Bennée, 2021/07/20
- [PATCH v1 17/29] contrib/gitdm: add an explicit academic entry for BU, Alex Bennée, 2021/07/20
- [PATCH v1 15/29] contrib/gitdm: add domain-map for NVIDIA, Alex Bennée, 2021/07/20
- [PATCH v1 19/29] contrib/gitdm: add more individual contributor entries., Alex Bennée, 2021/07/20
- [PATCH v1 25/29] hw/tricore: fix inclusion of tricore_testboard,
Alex Bennée <=
- [PATCH v1 27/29] gitlab: enable a very minimal build with the tricore container, Alex Bennée, 2021/07/20
- [PATCH v1 26/29] tests/tcg/configure.sh: add handling for assembler only builds, Alex Bennée, 2021/07/20
- [PATCH v1 22/29] plugins/cache: limited the scope of a mutex lock, Alex Bennée, 2021/07/20
- [PATCH v1 14/29] contrib/gitdm: add domain-map for Crudebyte, Alex Bennée, 2021/07/20
- [PATCH v1 24/29] plugins: Fix physical address calculation for IO regions, Alex Bennée, 2021/07/20
- [PATCH v1 18/29] contrib/gitdm: add a new interns group-map for GSoC/Outreachy work, Alex Bennée, 2021/07/20
- [PATCH v1 16/29] contrib/gitdm: add group-map for Netflix, Alex Bennée, 2021/07/20
- [PATCH v1 21/29] plugins/cache: Fixed a bug with destroying FIFO metadata, Alex Bennée, 2021/07/20