From nobody Tue Feb 10 04:14:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1626795786; cv=none; d=zohomail.com; s=zohoarc; b=crayHzcoDgiIU/ZCJJ+Qxri5A3s+ixyXlqyLAa+ZpHh26QC1IFJzHL/amJeIZB3eRvyZn3XKn+luOfPvG96Ex7Z+X3hqEO3MNidxOkB5fGK3XEbCw1EapJ1k1AmzULALHUeZVhfXcqDZcxDbQCxsqygw5OERMw4LXKUuKarNHQk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626795786; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=1seFm9k4hBvj3dV8pqZnTfUxP5CfPuhkGJILwrP/ssI=; b=Pqrot1Rfd4Gr4Ch4UEnSJIyrr54yqDFTHULyhRbR6KXqkIth9vzMQ/u9PXJaWPL9A8VtFumAr0V6oSGInfurcdIdMMmxiqMQaa+AHmnIufsqRM3p57PKg6Vt1k/U0qITAH/DoZWT73BcJOXiv/BiZnQELYtJVvlPHUo8xR3kRIQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1626795786782298.5392711182151; Tue, 20 Jul 2021 08:43:06 -0700 (PDT) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-206-EhnObZO4NU-mXnvmPLa57g-1; Tue, 20 Jul 2021 11:42:58 -0400 Received: by mail-wr1-f71.google.com with SMTP id r9-20020a5d49890000b02901524df25ad7so781368wrq.8 for ; Tue, 20 Jul 2021 08:42:57 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (122.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.122]) by smtp.gmail.com with ESMTPSA id g138sm24019610wmg.32.2021.07.20.08.42.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jul 2021 08:42:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626795779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1seFm9k4hBvj3dV8pqZnTfUxP5CfPuhkGJILwrP/ssI=; b=YZYuOYNUYfLFr4qCDNSsQfTuS6yVpKx2j+2g/G4pDZXXbGyVCsQviM9Z5qKKRafESbWBpW KuxJhODAY3NkqbtlDoLIWD+RO+JMkc7Cg/Ouy//j9M5Y8gUycAhHpN3C7e7f0NbyqZLv6W Kf3HVUzY/vUIM+xaZiZWB4txBiih2wg= X-MC-Unique: EhnObZO4NU-mXnvmPLa57g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1seFm9k4hBvj3dV8pqZnTfUxP5CfPuhkGJILwrP/ssI=; b=fAfElPlMsJfwEPlt6h2Mf6J1RNBR0oSIUOHp/WdzQ4O8QqCuaPDOomlveY9LyY0LYk Oggvxs8+T+1HdfxtdjceWD4GEha+9SxzlqEBGcp1kyKKdWOSrn5Ws03kbq0aRJWmkLWg OeTRbSc0wGPO3Rus3vK0LRj1+6+XMelKDOyZo1UygyLf2Rag82r+KXp2Z+WUjM3PDrqx fidejTmXdSxxri3ijAUPN2utrz6Q7N8wi7Hn6fr63yn/NEE+RvnWjDiPV15LHLME3jGx mcw5TQGq+tN/G1yyJj3aDQSa3D/A+lpsnGEXaD2OdLU85DCXcfaNiTvPXg+9h5rChCGl 94Ag== X-Gm-Message-State: AOAM530JyVOSh797ErAAUGZXbR/Sea5wrm1NVIWNG5Up5XFyT6fOC9q0 Xz9Dc3E4EtXk3nbSRwPykKmrpDhbD3wLqub5DJLPbwLSBcAmEerVrOpS67mZmCzuTcImCcA60nI nDmNn8Hd3w5IByw== X-Received: by 2002:a7b:c1c2:: with SMTP id a2mr31004361wmj.15.1626795776899; Tue, 20 Jul 2021 08:42:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzG8A/XIMJ/ADxcZWxG6BmwhT7HbRSF0XnnTa9EQN3+kJrwgloCRWG+TVsgwAmnsTguRjXUjA== X-Received: by 2002:a7b:c1c2:: with SMTP id a2mr31004345wmj.15.1626795776755; Tue, 20 Jul 2021 08:42:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 17/17] hw/tricore: fix inclusion of tricore_testboard Date: Tue, 20 Jul 2021 17:41:41 +0200 Message-Id: <20210720154141.3919817-18-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210720154141.3919817-1-philmd@redhat.com> References: <20210720154141.3919817-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1626795788014100001 From: Alex Benn=C3=A9e 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=C3=A9 Reviewed-by: Peter Maydell Reviewed-by: Richard Henderson Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210720114057.32053-2-alex.bennee@linaro.org> [PMD: Updated description mentioning commits merged] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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=3Dy CONFIG_TRIBOARD=3Dy 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 =20 config TRIBOARD bool - select TRICORE select TC27X_SOC =20 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 =3D 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_t= estboard.c')) +tricore_ss.add(when: 'CONFIG_TRICORE_TESTBOARD', if_true: files('tricore_t= estdevice.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')) =20 --=20 2.31.1