From nobody Sat May 18 10:48:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1684865203; cv=none; d=zohomail.com; s=zohoarc; b=aagq0/rWDE1Fnbdz5yel45ugNXw68Yxc+VzKp655wb8XSCn7CxNdQoCXEEUDwQL+dhUimoOPrrM1yydTq49OK8HwW/NACl/CbtzvBiArtgWDBIjnnQwCG7/MqR0ujj3O2Bj3vdcH5GSP7Vq09onnrwhmeBVSqu9IK60bLxDD45I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684865203; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gIqaBzpor76jqDn9uectkKx8OYYnrv6WOou5EwMgQmo=; b=KY+hEUO+EwGQnnOKmCqObvGzd+UXkyV3/uSnkmABSdhmXK3gd5TnFMPxR794D62RKm9VMwzIh4aOemtiqEYciUDCiQ28Hy36f+clP1bo0/a3wm9aLklFamcxTjGhRZBFFumhhz4beMW1lrZUq5DHOjpNaIXhmIje2ID0EN5aCCw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1684865202884139.98017431293624; Tue, 23 May 2023 11:06:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1WO9-0006rD-Up; Tue, 23 May 2023 14:05:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1WO7-0006pE-IK; Tue, 23 May 2023 14:05:35 -0400 Received: from smtp-out2.suse.de ([2001:67c:2178:6::1d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1WO6-0007T8-0y; Tue, 23 May 2023 14:05:35 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 3B68C20554; Tue, 23 May 2023 18:05:32 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 6122A13A10; Tue, 23 May 2023 18:05:30 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id +D98CmoAbWQMQwAAMHmgww (envelope-from ); Tue, 23 May 2023 18:05:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1684865132; h=from:from:reply-to: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=gIqaBzpor76jqDn9uectkKx8OYYnrv6WOou5EwMgQmo=; b=QqGyNfcy/dmvFSNFV9VeJtS1hRq9wxgO9Pa+D2i8vt0hf8RuG+tL5QVjNNmE8+Moa/FlK1 y4MrRTUO/mbCMKYfukh/dA5yC3zB27JsbqVjrgeH3lKhzzAZgamNDVdx0UfuOJeMWSbVIc RhQoQ5nFPlKyHzRcurY7/iv2XAN7Cho= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1684865132; h=from:from:reply-to: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=gIqaBzpor76jqDn9uectkKx8OYYnrv6WOou5EwMgQmo=; b=gDAekTsaLXSDUG3tXfjyu72rDixzpHYH33Ave5a7MRNEMw+3JQjOZCZDMpk59JF02EMDWR Q5CJdz3gXpR+rADg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Thomas Huth Subject: [PATCH 1/3] target/arm: Explain why we need to select ARM_V7M Date: Tue, 23 May 2023 15:05:23 -0300 Message-Id: <20230523180525.29994-2-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230523180525.29994-1-farosas@suse.de> References: <20230523180525.29994-1-farosas@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:67c:2178:6::1d; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1684865204775100001 We currently need to select ARM_V7M unconditionally when TCG is present in the build because some translate.c helpers and the whole of m_helpers.c are not yet under CONFIG_ARM_V7M. Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Fabiano Rosas Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/Kconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/arm/Kconfig b/target/arm/Kconfig index 5947366f6e..bf57d739cd 100644 --- a/target/arm/Kconfig +++ b/target/arm/Kconfig @@ -1,6 +1,9 @@ config ARM bool select ARM_COMPATIBLE_SEMIHOSTING if TCG + + # We need to select this until we move m_helper.c and the + # translate.c v7m helpers under ARM_V7M. select ARM_V7M if TCG =20 config AARCH64 --=20 2.35.3 From nobody Sat May 18 10:48:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1684865214; cv=none; d=zohomail.com; s=zohoarc; b=SfPvEbxGkHdLCF93HoX5rAC5vnZGrAsvqDdHbmLdsCbpkpPQtkqISwWA9vV8OHbz0wbyUmQyYFOEojFUkREdhbWsWx4V6uPScS9/m8q9b2kP+F2Q5MfhlAPgDmyBq8UyxRO2ccNsZ4P6KuRORcrr829hJjaL/CV8YqtdRUW7BhQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684865214; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nDi6GfNnvT/vqWO0PSF691Pglgusruaf9OMbvw+d7nE=; b=f2mX/z1V2HXwwJjyNukeOKG/TKD/gXaSVm8BXscH1xpKp/GamF7mV32xb9kDjeB3twZBZOJV1KCFt872o6rg60eifE5MebVV0rPFaeo+Mtm5xmeP63eP3bJuFa8/kkWauqpPQOyfGTvS/1Aa2e8lZUoFn9UvTygClSdFojCtH1w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1684865214325470.9059353103545; Tue, 23 May 2023 11:06:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1WOD-0006s8-RV; Tue, 23 May 2023 14:05:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1WOA-0006rH-Op; Tue, 23 May 2023 14:05:38 -0400 Received: from smtp-out1.suse.de ([195.135.220.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1WO8-0007V6-AM; Tue, 23 May 2023 14:05:38 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 79706228C4; Tue, 23 May 2023 18:05:34 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id A9F8613A10; Tue, 23 May 2023 18:05:32 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id cKE7HGwAbWQMQwAAMHmgww (envelope-from ); Tue, 23 May 2023 18:05:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1684865134; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nDi6GfNnvT/vqWO0PSF691Pglgusruaf9OMbvw+d7nE=; b=aq7i5w+3Di9hkqbmZ6AYszHZ1kHr6R/yTFw53yQbL7goqtvdK0c1ViR74Kb1KtVxezMwuB H68UYwnP+22SmT9cFrt0K6BIcsL6ggsXPrYnmmGb4dj6RLfcfmZ9XRwcnrfxc6tr3sF+Th k28WH3UKxE3yTdjOFpItlp+nvJcRMzw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1684865134; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nDi6GfNnvT/vqWO0PSF691Pglgusruaf9OMbvw+d7nE=; b=ZtymjNViLUsSR6ngZDCtJOOuBgKLkP4NJDHth/0kLlXvDp1Pxw5CseuNmPy2+peuURAQRb Oq6JPSi/52CHvBCA== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Thomas Huth Subject: [PATCH 2/3] arm/Kconfig: Keep Kconfig default entries in default.mak as documentation Date: Tue, 23 May 2023 15:05:24 -0300 Message-Id: <20230523180525.29994-3-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230523180525.29994-1-farosas@suse.de> References: <20230523180525.29994-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=195.135.220.28; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1684865214814100001 Content-Type: text/plain; charset="utf-8" When we moved the arm default CONFIGs into Kconfig and removed them from default.mak, we made it harder to identify which CONFIGs are selected by default in case users want to disable them. Bring back the default entries into default.mak, but keep them commented out. This way users can keep their workflows of editing default.mak to remove build options without needing to search through Kconfig. Reported-by: Thomas Huth Signed-off-by: Fabiano Rosas Reviewed-by: Thomas Huth --- configs/devices/aarch64-softmmu/default.mak | 6 ++++ configs/devices/arm-softmmu/default.mak | 40 +++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/configs/devices/aarch64-softmmu/default.mak b/configs/devices/= aarch64-softmmu/default.mak index 70e05a197d..f82a04c27d 100644 --- a/configs/devices/aarch64-softmmu/default.mak +++ b/configs/devices/aarch64-softmmu/default.mak @@ -2,3 +2,9 @@ =20 # We support all the 32 bit boards so need all their config include ../arm-softmmu/default.mak + +# These are selected by default when TCG is enabled, uncomment them to +# keep out of the build. +# CONFIG_XLNX_ZYNQMP_ARM=3Dn +# CONFIG_XLNX_VERSAL=3Dn +# CONFIG_SBSA_REF=3Dn diff --git a/configs/devices/arm-softmmu/default.mak b/configs/devices/arm-= softmmu/default.mak index 647fbce88d..980c48a7d9 100644 --- a/configs/devices/arm-softmmu/default.mak +++ b/configs/devices/arm-softmmu/default.mak @@ -4,3 +4,43 @@ # CONFIG_TEST_DEVICES=3Dn =20 CONFIG_ARM_VIRT=3Dy + +# These are selected by default when TCG is enabled, uncomment them to +# keep out of the build. +# CONFIG_CUBIEBOARD=3Dn +# CONFIG_EXYNOS4=3Dn +# CONFIG_HIGHBANK=3Dn +# CONFIG_INTEGRATOR=3Dn +# CONFIG_FSL_IMX31=3Dn +# CONFIG_MUSICPAL=3Dn +# CONFIG_MUSCA=3Dn +# CONFIG_CHEETAH=3Dn +# CONFIG_SX1=3Dn +# CONFIG_NSERIES=3Dn +# CONFIG_STELLARIS=3Dn +# CONFIG_STM32VLDISCOVERY=3Dn +# CONFIG_REALVIEW=3Dn +# CONFIG_VERSATILE=3Dn +# CONFIG_VEXPRESS=3Dn +# CONFIG_ZYNQ=3Dn +# CONFIG_MAINSTONE=3Dn +# CONFIG_GUMSTIX=3Dn +# CONFIG_SPITZ=3Dn +# CONFIG_TOSA=3Dn +# CONFIG_Z2=3Dn +# CONFIG_NPCM7XX=3Dn +# CONFIG_COLLIE=3Dn +# CONFIG_ASPEED_SOC=3Dn +# CONFIG_NETDUINO2=3Dn +# CONFIG_NETDUINOPLUS2=3Dn +# CONFIG_OLIMEX_STM32_H405=3Dn +# CONFIG_MPS2=3Dn +# CONFIG_RASPI=3Dn +# CONFIG_DIGIC=3Dn +# CONFIG_SABRELITE=3Dn +# CONFIG_EMCRAFT_SF2=3Dn +# CONFIG_MICROBIT=3Dn +# CONFIG_FSL_IMX25=3Dn +# CONFIG_FSL_IMX7=3Dn +# CONFIG_FSL_IMX6UL=3Dn +# CONFIG_ALLWINNER_H3=3Dn --=20 2.35.3 From nobody Sat May 18 10:48:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1684865191; cv=none; d=zohomail.com; s=zohoarc; b=mzkw6qxf2VmZ/Niwm4Gsx6d+4Ji6uiERPamWnFlqtDPQIDKqrNCCV+s/Pf2LuTmAOTzD1rN1qy3pCHGIJisZbiMTEXiEK9Q9xPJ4y2j2oOmd4lk72ffDbMKEWCimdUch7kw9ttf1ByKQtc+3avfZvhU3C1vWlcJU+gz0n+gI+k0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684865191; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5Z0gJW3+c85PO+0fYY9op8HomfuHWGJv4G+npvFWE+U=; b=XcgTaAXoCfazzhbv0NbAnYe1KWrmpDtCIhG+OKpDu/VjaAOIgdjiv/ibKM9dwNTGGXQH1KjCNH0QMD8janot/VEc0rnZgPt+ddQVmMD5jJ0cVhdjxIdXSSrxJRsto9ylOvGNCjlIcIdGw1whIGWLa9wl5bEsooLaR6Gs4ciK6qI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1684865191886741.1966392441421; Tue, 23 May 2023 11:06:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1WOE-0006sj-Dq; Tue, 23 May 2023 14:05:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1WOC-0006rU-Et; Tue, 23 May 2023 14:05:40 -0400 Received: from smtp-out2.suse.de ([195.135.220.29]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1WOA-0007Vz-C8; Tue, 23 May 2023 14:05:40 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id B9F5E2039D; Tue, 23 May 2023 18:05:36 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id E89DF13A10; Tue, 23 May 2023 18:05:34 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id UEuJK24AbWQMQwAAMHmgww (envelope-from ); Tue, 23 May 2023 18:05:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1684865136; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5Z0gJW3+c85PO+0fYY9op8HomfuHWGJv4G+npvFWE+U=; b=RZdGwMaLummD2YgdHZkZ+s+fwXn0YoSvIfFwWpRtP/V4eQftZa2U5JIqjG2s5yvExCRx9V C5sO0qaNi4ftRl/NO3khdO27gdiD48PCMHWqJscbHE8GiQzwew6e8YS+p1j575dIHiFBH9 Xh+lQtgX2Nh2wyJN8GTq49mgk18Jjpg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1684865136; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5Z0gJW3+c85PO+0fYY9op8HomfuHWGJv4G+npvFWE+U=; b=iB3fhOVSLdhV5+1cTSx//zNvbmLDR8YRGEsHT222ORt9UsHXVc+J7e2zUi2HIp4cBwYbfw IHCZxrNQP+cVuXAw== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Thomas Huth Subject: [PATCH 3/3] arm/Kconfig: Make TCG dependence explicit Date: Tue, 23 May 2023 15:05:25 -0300 Message-Id: <20230523180525.29994-4-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230523180525.29994-1-farosas@suse.de> References: <20230523180525.29994-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=195.135.220.29; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1684865193816100004 Content-Type: text/plain; charset="utf-8" Replace the 'default y if TCG' pattern with 'default y; depends on TCG'. That makes explict that there is a dependence on TCG and enabling these CONFIGs via .mak files without TCG present will fail earlier. Suggested-by: Paolo Bonzini Signed-off-by: Fabiano Rosas Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- hw/arm/Kconfig | 123 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 82 insertions(+), 41 deletions(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 0f42c556d7..acc4371a4a 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -35,24 +35,28 @@ config ARM_VIRT =20 config CHEETAH bool - default y if TCG && ARM + default y + depends on TCG && ARM select OMAP select TSC210X =20 config CUBIEBOARD bool - default y if TCG && ARM + default y + depends on TCG && ARM select ALLWINNER_A10 =20 config DIGIC bool - default y if TCG && ARM + default y + depends on TCG && ARM select PTIMER select PFLASH_CFI02 =20 config EXYNOS4 bool - default y if TCG && ARM + default y + depends on TCG && ARM imply I2C_DEVICES select A9MPCORE select I2C @@ -65,7 +69,8 @@ config EXYNOS4 =20 config HIGHBANK bool - default y if TCG && ARM + default y + depends on TCG && ARM select A9MPCORE select A15MPCORE select AHCI @@ -80,7 +85,8 @@ config HIGHBANK =20 config INTEGRATOR bool - default y if TCG && ARM + default y + depends on TCG && ARM select ARM_TIMER select INTEGRATOR_DEBUG select PL011 # UART @@ -93,14 +99,16 @@ config INTEGRATOR =20 config MAINSTONE bool - default y if TCG && ARM + default y + depends on TCG && ARM select PXA2XX select PFLASH_CFI01 select SMC91C111 =20 config MUSCA bool - default y if TCG && ARM + default y + depends on TCG && ARM select ARMSSE select PL011 select PL031 @@ -112,7 +120,8 @@ config MARVELL_88W8618 =20 config MUSICPAL bool - default y if TCG && ARM + default y + depends on TCG && ARM select OR_IRQ select BITBANG_I2C select MARVELL_88W8618 @@ -123,22 +132,26 @@ config MUSICPAL =20 config NETDUINO2 bool - default y if TCG && ARM + default y + depends on TCG && ARM select STM32F205_SOC =20 config NETDUINOPLUS2 bool - default y if TCG && ARM + default y + depends on TCG && ARM select STM32F405_SOC =20 config OLIMEX_STM32_H405 bool - default y if TCG && ARM + default y + depends on TCG && ARM select STM32F405_SOC =20 config NSERIES bool - default y if TCG && ARM + default y + depends on TCG && ARM select OMAP select TMP105 # temperature sensor select BLIZZARD # LCD/TV controller @@ -171,14 +184,16 @@ config PXA2XX =20 config GUMSTIX bool - default y if TCG && ARM + default y + depends on TCG && ARM select PFLASH_CFI01 select SMC91C111 select PXA2XX =20 config TOSA bool - default y if TCG && ARM + default y + depends on TCG && ARM select ZAURUS # scoop select MICRODRIVE select PXA2XX @@ -186,7 +201,8 @@ config TOSA =20 config SPITZ bool - default y if TCG && ARM + default y + depends on TCG && ARM select ADS7846 # touch-screen controller select MAX111X # A/D converter select WM8750 # audio codec @@ -199,7 +215,8 @@ config SPITZ =20 config Z2 bool - default y if TCG && ARM + default y + depends on TCG && ARM select PFLASH_CFI01 select WM8750 select PL011 # UART @@ -207,7 +224,8 @@ config Z2 =20 config REALVIEW bool - default y if TCG && ARM + default y + depends on TCG && ARM imply PCI_DEVICES imply PCI_TESTDEV imply I2C_DEVICES @@ -236,7 +254,8 @@ config REALVIEW =20 config SBSA_REF bool - default y if TCG && AARCH64 + default y + depends on TCG && AARCH64 imply PCI_DEVICES select AHCI select ARM_SMMUV3 @@ -252,13 +271,15 @@ config SBSA_REF =20 config SABRELITE bool - default y if TCG && ARM + default y + depends on TCG && ARM select FSL_IMX6 select SSI_M25P80 =20 config STELLARIS bool - default y if TCG && ARM + default y + depends on TCG && ARM imply I2C_DEVICES select ARM_V7M select CMSDK_APB_WATCHDOG @@ -276,7 +297,8 @@ config STELLARIS =20 config STM32VLDISCOVERY bool - default y if TCG && ARM + default y + depends on TCG && ARM select STM32F100_SOC =20 config STRONGARM @@ -285,19 +307,22 @@ config STRONGARM =20 config COLLIE bool - default y if TCG && ARM + default y + depends on TCG && ARM select PFLASH_CFI01 select ZAURUS # scoop select STRONGARM =20 config SX1 bool - default y if TCG && ARM + default y + depends on TCG && ARM select OMAP =20 config VERSATILE bool - default y if TCG && ARM + default y + depends on TCG && ARM select ARM_TIMER # sp804 select PFLASH_CFI01 select LSI_SCSI_PCI @@ -309,7 +334,8 @@ config VERSATILE =20 config VEXPRESS bool - default y if TCG && ARM + default y + depends on TCG && ARM select A9MPCORE select A15MPCORE select ARM_MPTIMER @@ -325,7 +351,8 @@ config VEXPRESS =20 config ZYNQ bool - default y if TCG && ARM + default y + depends on TCG && ARM select A9MPCORE select CADENCE # UART select PFLASH_CFI02 @@ -342,7 +369,8 @@ config ZYNQ config ARM_V7M bool # currently v7M must be included in a TCG build due to translate.c - default y if TCG && ARM + default y + depends on TCG && ARM select PTIMER =20 config ALLWINNER_A10 @@ -361,7 +389,8 @@ config ALLWINNER_A10 =20 config ALLWINNER_H3 bool - default y if TCG && ARM + default y + depends on TCG && ARM select ALLWINNER_A10_PIT select ALLWINNER_SUN8I_EMAC select ALLWINNER_I2C @@ -376,7 +405,8 @@ config ALLWINNER_H3 =20 config RASPI bool - default y if TCG && ARM + default y + depends on TCG && ARM select FRAMEBUFFER select PL011 # UART select SDHCI @@ -407,7 +437,8 @@ config STM32F405_SOC =20 config XLNX_ZYNQMP_ARM bool - default y if TCG && AARCH64 + default y + depends on TCG && AARCH64 select AHCI select ARM_GIC select CADENCE @@ -425,7 +456,8 @@ config XLNX_ZYNQMP_ARM =20 config XLNX_VERSAL bool - default y if TCG && AARCH64 + default y + depends on TCG && AARCH64 select ARM_GIC select PL011 select CADENCE @@ -440,7 +472,8 @@ config XLNX_VERSAL =20 config NPCM7XX bool - default y if TCG && ARM + default y + depends on TCG && ARM select A9MPCORE select ADM1272 select ARM_GIC @@ -457,7 +490,8 @@ config NPCM7XX =20 config FSL_IMX25 bool - default y if TCG && ARM + default y + depends on TCG && ARM imply I2C_DEVICES select IMX select IMX_FEC @@ -467,7 +501,8 @@ config FSL_IMX25 =20 config FSL_IMX31 bool - default y if TCG && ARM + default y + depends on TCG && ARM imply I2C_DEVICES select SERIAL select IMX @@ -488,7 +523,8 @@ config FSL_IMX6 =20 config ASPEED_SOC bool - default y if TCG && ARM + default y + depends on TCG && ARM select DS1338 select FTGMAC100 select I2C @@ -509,7 +545,8 @@ config ASPEED_SOC =20 config MPS2 bool - default y if TCG && ARM + default y + depends on TCG && ARM imply I2C_DEVICES select ARMSSE select LAN9118 @@ -525,7 +562,8 @@ config MPS2 =20 config FSL_IMX7 bool - default y if TCG && ARM + default y + depends on TCG && ARM imply PCI_DEVICES imply TEST_DEVICES imply I2C_DEVICES @@ -544,7 +582,8 @@ config ARM_SMMUV3 =20 config FSL_IMX6UL bool - default y if TCG && ARM + default y + depends on TCG && ARM imply I2C_DEVICES select A15MPCORE select IMX @@ -556,7 +595,8 @@ config FSL_IMX6UL =20 config MICROBIT bool - default y if TCG && ARM + default y + depends on TCG && ARM select NRF51_SOC =20 config NRF51_SOC @@ -568,7 +608,8 @@ config NRF51_SOC =20 config EMCRAFT_SF2 bool - default y if TCG && ARM + default y + depends on TCG && ARM select MSF2 select SSI_M25P80 =20 --=20 2.35.3