From patchwork Tue Jul 20 11:40:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 481499 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5052284jao; Tue, 20 Jul 2021 04:59:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzOekzJChR9MZPjGX7NFVxfDW7ygUeV7NYVyPDEfGmDu2Hrf4dzE3rdA9iOOuheom9N0rMt X-Received: by 2002:a25:5502:: with SMTP id j2mr37705937ybb.363.1626782368662; Tue, 20 Jul 2021 04:59:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626782368; cv=none; d=google.com; s=arc-20160816; b=H16gYLuTyDYIgrOHMsAfwy4exT+ayVLSy3fldDe4k0SUPqDH8v/RQHLkWfeTMjWtZP eXjeMwKMhtLyx7Kh2s+ysBg/Gp2wDSHGVwy0HXRADQOwUagZz7yC6wPPPia652JwliuC NfsTj4ZsF+OLLVpNsIG3f0qli7PVQfzxiIa3bpb9Rgg4OrcHtf4Vv6PX1E+PYJDJveo/ vVwCszAwYmE/CVsRWar4kjGibt3mNH/PUi6tsx7L6n6TogM8+gjDu9/pWABmU5SwEv14 KmdrzrxY1rmSHSbS9+y3MuFOAspslWHzFzfik/7jygpyQRJF+COPIU6gae0YC/O2Kmxt 3qYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=wkNQQ20XngujXOPbEcV2yi1EM3N0Z3ZePdpIQQkCKpc=; b=qO7vZfBjo+7PCZy2fGnsucLwBAruvuxrryX/pYw48vTJIm5ZXb7LF45EqB4pGxPAat xXIHkmLBQFL31j1xB8Ht9dWKztnm7CCLK3JhQXSiaQtqrojPAKrbeHMiXvM7/iB6H/RS pjYNI+fZ9eU1mGc/jp4ewxEKCJ0rJAtdU4T5ohEtvWRZeteuCu6JMlUCiHPgT8MxpME6 kh9VMsQGh72XkQRUjOJiikcNUd4LwhWtqFXNvSPosYPMgydQ1TPf2EOg27YAcdWGWwly Aqy25mfBrtoRVfvAbL+g9ME898zv/C7bpRhK/jysA2k+eemcJ284AShF79lFsiBE5FGE sW3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hKDBLUKM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x135si25230949ybg.279.2021.07.20.04.59.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Jul 2021 04:59:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hKDBLUKM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m5oPI-0001tH-0V for patch@linaro.org; Tue, 20 Jul 2021 07:59:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5o7S-0005M8-GJ for qemu-devel@nongnu.org; Tue, 20 Jul 2021 07:41:02 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:35570) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m5o7Q-0008Ce-PI for qemu-devel@nongnu.org; Tue, 20 Jul 2021 07:41:02 -0400 Received: by mail-wr1-x434.google.com with SMTP id m2so25679847wrq.2 for ; Tue, 20 Jul 2021 04:41:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wkNQQ20XngujXOPbEcV2yi1EM3N0Z3ZePdpIQQkCKpc=; b=hKDBLUKMgsYsdYp+PFvbYslYu3CkZ2bJLCVGyAk3DGPvoJuGr4YdBpWc2jBH4QT7lZ wR7H14bzvzvNSj/4EjtYJWb4J+b0FFeKcLppeaYnaE80Gc6/oJsDuQHD+/Aay5cloBse q1UAqLwDpRL/qoomhcsHPzp6g1ElKsr+EgrOi9kuOMK6vPTO2vKEqwPtREdy6yKGZvFL x1qZJXawzt7hBSAwQnEA4f/xhD0/AomOvBAP+h3TcStQhkECjILysK/MnxE8nTSEpefM Hrx/Juwy3cymmZRERTbYfBoveKwp/ZXOcsamFTbX1UHaM7/1qjsXXGkY7zmZdkSKyB/J qJlQ== 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=wkNQQ20XngujXOPbEcV2yi1EM3N0Z3ZePdpIQQkCKpc=; b=TWZ7YpmTL+iCT3DYHBfIFcaPv5y2I20qZPZ/RobIXBqdvf0X0X/XAj9wap9enEm+0F IqL+ORIQXzTQgUe8f0JVDX7vGWOX19xd1c5pQ+2zmZIouIBlEuUFBfCXu4V8pogHzhEQ Cpc+mN59M3lyxe3RSlfmODrzQP2Ij0vNWQjxDjg1s3b2CUmdDKPDSv3UWQsVzvRsDjdP KcUJwz8I4VfiFJQtaXw3nTgusBtCvwKMLcdWc2H/jloRYyl/ZPhX3CnOXiy8hNUh5ZBk t/0hKB1tceDwTCojSLmGqk3ywS4K7yCyQGeIfoniqi2H5y8sKtllUCE1vWNr+zRZWfTl 4rNw== X-Gm-Message-State: AOAM533r5yBYl+1SvngoT00qVB3hu58cZi9PE/xo5gtXtXvcND62Bdev 6RXN7ARQSS2S3IpCL3N6SE0BBA== X-Received: by 2002:adf:f6c9:: with SMTP id y9mr1825994wrp.265.1626781258810; Tue, 20 Jul 2021 04:40:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y3sm23723340wrh.16.2021.07.20.04.40.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jul 2021 04:40:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7EE7E1FF87; Tue, 20 Jul 2021 12:40:57 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 1/3] hw/tricore: fix inclusion of tricore_testboard Date: Tue, 20 Jul 2021 12:40:55 +0100 Message-Id: <20210720114057.32053-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.32.0.264.g75ae10bc75 In-Reply-To: <20210720114057.32053-1-alex.bennee@linaro.org> References: <20210720114057.32053-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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_Benn=C3=A9e?= , f4bug@amsat.org, Bastian Koppelmann Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- v3 - rename to CONFIG_TRICORE_TESTBOARD --- configs/devices/tricore-softmmu/default.mak | 1 + hw/tricore/Kconfig | 3 +-- hw/tricore/meson.build | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) -- 2.32.0.264.g75ae10bc75 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'))