From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4A26C07E95 for ; Tue, 20 Jul 2021 15:52:39 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9493C610FB for ; Tue, 20 Jul 2021 15:52:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9493C610FB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m5s2w-0003fh-B8 for qemu-devel@archiver.kernel.org; Tue, 20 Jul 2021 11:52:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5rte-00010z-3V for qemu-devel@nongnu.org; Tue, 20 Jul 2021 11:43:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54232) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5rtc-0005VV-Ha for qemu-devel@nongnu.org; Tue, 20 Jul 2021 11:43:01 -0400 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= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-435-_UNgKfvjNsKR-CjHgl8VrA-1; Tue, 20 Jul 2021 11:42:58 -0400 X-MC-Unique: _UNgKfvjNsKR-CjHgl8VrA-1 Received: by mail-wr1-f69.google.com with SMTP id m4-20020adffa040000b02901404c442853so10480256wrr.12 for ; Tue, 20 Jul 2021 08:42:58 -0700 (PDT) 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=TFBiTMzdhHwslmin/oHk7wFrm5mlVvXmDfa09O9ebhf+RpDeWKN6kA0pmbxNiPEZNn DmL9ovFRBInwsz1B5x4S1z62u8oa3g4Cln3tEXvZ59Q8Jum4zmFwE2QCdlmNPOxf2fMM NSfYRoo72Ac1bBaKTvXN9BkrpvxLWmlOB8crd1+j6HEZmMaf3CDOWwyRKcCKI/7ptZnK kiNp26edkMfjdSMh6fo6GBSTSDnQUG5Oo4+ZyfCxwpi3yJMGP4+axymHjnRYgeqJtLxM tzn4rg54noyndfnaNwoGaKhrV6bNpgBn0HBDjeD3nZadgO8ow7jwrPPBWems8ylrho1N g+KQ== X-Gm-Message-State: AOAM533lF49Ko2FpZmOFoRyna7+4gYIXeq/A0jqv2za1GI41vu8Brlmz azIYy0Ev0XLmKbd0UwxElZ9j0mmK/05P7AeeRvn9oAZjGM1GR3/obuoQJJZbXolGuEbGBgnvVgh xTXflPKmzUVQkvGKplge9G64SALn3DbfY8pEw4PqBcSrjKHF5aSwAQKoXrmBOByLD X-Received: by 2002:a7b:c1c2:: with SMTP id a2mr31004369wmj.15.1626795776985; 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) 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.474, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée 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é Reviewed-by: Peter Maydell Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20210720114057.32053-2-alex.bennee@linaro.org> [PMD: Updated description mentioning commits merged] Signed-off-by: Philippe Mathieu-Daudé --- 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