From nobody Tue Nov 18 18:25:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) client-ip=209.85.128.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612090769; cv=none; d=zohomail.com; s=zohoarc; b=KFsMP7FOkUvKG3/q9szom8Prup0skVZVZTcbTamNyM2ZusC7GGPUXXJ5XqLJA4XZxHCUqhij8iEC0Yxq2vMy60wie4jbfEaFh2MCB3AwZ1s0y3qO7qqp+Pf2Eitih+SIXaR3S/1Th6Ygj74PNtdWfz2mqiMOUm5ulhcDf7n+YXw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612090769; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KjWr4TKlwB/IJcVo6npcfvEPrPb22EOYTZC5O8IwCfc=; b=f4VZJdji0dvJRYjND43sEiAn9UZULh21D0RSw3B0utJMibVHwp6mB8szhqJ5BQy7+9acNO3+rtjTRX2ecIHZfn32wX1ZF0pGkgfKd5kay1mtsme7bfRW1O8pbFmPWEiOlU7JiEs+78uYl+KxHDW8GD7PysiJTo5OLt/Y/d6E+Ks= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.zohomail.com with SMTPS id 1612090769939781.1425923008961; Sun, 31 Jan 2021 02:59:29 -0800 (PST) Received: by mail-wm1-f50.google.com with SMTP id j18so10180492wmi.3 for ; Sun, 31 Jan 2021 02:59:28 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id h18sm22581661wru.65.2021.01.31.02.59.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 02:59:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KjWr4TKlwB/IJcVo6npcfvEPrPb22EOYTZC5O8IwCfc=; b=FBl+lcqUTya8HKBOBUjNAvbvJrnnQb2bBX6sxXCl1at2OWMR//TOqWUCih+ZBTl3Xi xTxv4V/T+AiwRAu3GeInds6GetaqebvE1Dd0u5YodgGI48B2/UmPZj2mhIkhOyJH2X8e N1DaicF/faZKL84596Vh3b/W1rX9uJn4SnsPssPsl0IkzI3jUqgbzeiD2jl43bhz9Fgk A9IXjeD330azawEpzc6mkoUKCn0+6A5KnnZ6zQOzvfxi/Rf5aSskVIbeHcVfajwj7IPq yYohMb+h3/M74a3nH5kE2AcoDETax5XPxnkxsYIqvdp9FYWNrsItyXgfApbM2t3WI6jl IbsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=KjWr4TKlwB/IJcVo6npcfvEPrPb22EOYTZC5O8IwCfc=; b=NOzB0mTopWufakstI250w5tnHh1G0YXTFQ9mD1DS7AA2l7PAdy09/vRUs9YayX0wv4 TvOElbXdVk0PEnYM2Z75BXLoxl+1FVDo4z5DWf/kQ1SNq4CJNf8uE++P3E5bO4SvV54n B/0SEKppnumG3BbSPo8vYwoFIFphfLwqE49ZdyFdAM7ag/7p5e+S/JlLjzVjk5jh+0oa XGOJ0d5p+zywkF7MJaRGhKTnw0I6URsoH1cyzAX5mpNAuVtWgEYl31gVfK6fXoiidqOE e+gDdI/1l7kIC/d+sQOwyOvFS8VHTnccRbSE28HyYRUNq649tLXJ3bIubzixyGMDDRFO l3aA== X-Gm-Message-State: AOAM532OU1WqY7hQDHPXhtCJ+pnq8EGCAmJugtLhYdG9lsfKJ8J7NibC bLD8PCXduM3qe0JcucyFsRI= X-Google-Smtp-Source: ABdhPJxqYOpHB+boItZFAvhV6fqD5vG8CqOeRrEFqjLo/vhS4KwyQTd/ApVwIoRo88AouJIe9L0mlA== X-Received: by 2002:a1c:6402:: with SMTP id y2mr10534889wmb.43.1612090767213; Sun, 31 Jan 2021 02:59:27 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Antony Pavlov , Joel Stanley , Peter Maydell , qemu-arm@nongnu.org, qemu-trivial@nongnu.org, Alistair Francis , Niek Linnenbank , Laurent Vivier , Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/7] hw/arm/stm32f405_soc: Add missing dependency on OR_IRQ Date: Sun, 31 Jan 2021 11:59:12 +0100 Message-Id: <20210131105918.228787-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131105918.228787-1-f4bug@amsat.org> References: <20210131105918.228787-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The STM32F405 SoC uses an OR gate on its ADC IRQs. Fixes: 529fc5fd3e1 ("hw/arm: Add the STM32F4xx SoC") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- Cc: alistair@alistair23.me --- hw/arm/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 13cc42dcc84..a320a124855 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -336,6 +336,7 @@ config STM32F205_SOC config STM32F405_SOC bool select ARM_V7M + select OR_IRQ select STM32F4XX_SYSCFG select STM32F4XX_EXTI =20 --=20 2.26.2 From nobody Tue Nov 18 18:25:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1612090774; cv=none; d=zohomail.com; s=zohoarc; b=Q2eS75Xo5vallpTvoq8ExLrX4ebszUB/UKSPGX4k8z3naIMTlQZeGFZ2qbr6AsWe3I4YSWcM0gO6cnl2PwzWXz93SZvTu/WscjdQn3I+C2STGcL3zXHqFr0T3rqtUE16ra1p2yUjSnYF4ejmzc4jsfeyLX63G1vioA7up03QCKI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612090774; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jtbqU34AXRgK7JucvFyMPpEvpdP/cEkbkCwJzoZsw+I=; b=mRys4OqrXDNrHn71v7Hf3HXNKyzmTRmgvxt4dQxwFe1XBU59M3GkBXYs49jRpVAfizuEt9+PYDpEyqMk2rvc7MzzYNW2pBaI9z0ApDk8CB9v37kMILNtnYkDCq6mrSH7mFZeqCzUK62of4gHZsG3MBqBWTcVj+cB4dCAKJww+QI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 1612090774113119.3673533799506; Sun, 31 Jan 2021 02:59:34 -0800 (PST) Received: by mail-wm1-f43.google.com with SMTP id f16so10179325wmq.5 for ; Sun, 31 Jan 2021 02:59:33 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id c18sm27417714wmk.0.2021.01.31.02.59.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 02:59:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jtbqU34AXRgK7JucvFyMPpEvpdP/cEkbkCwJzoZsw+I=; b=vFB1SLLOVA8z1esZfr+efHXGjtpbRDRKqxEr0+XiTMYueGRRO8M/pprq+Ef4/KsxHa joocEje6xS3Gk3xC6E30gOMRzrg25mC0cajUE3Oi70BtKoSyMyAgZXUDlF7GBVlNCTq9 61Jna5sD+OuCCDAhBOrVn2jnnPRl3UW7giw3RR2JTeKFdDmda3b6dX+IBp/iCXfmzyrh qIaHGIih4ZZWSZ6qR98Bt+TagXa1f8hhSldfEor7JpNqQXRrgu+ys/aeMbrXyl9T5AYD md2NxvIiSejyxUSLM4Ub1722iSSAsNgCwb7WnJ9kgpk8ed/CM436mCELPCr7/Y9JcS+5 HzAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=jtbqU34AXRgK7JucvFyMPpEvpdP/cEkbkCwJzoZsw+I=; b=md3lYsPzGY6zF5tRY9qkY32XczR9K2DkqeQOQdFTpvq11UMTGUvHTdBKySbJfaeT+q f1LZ9zLBFpIG6fAiPmopXO65SL6MS9l9a/OOYWJUWYLpUdh35UlO96ncczdhb1VgzKyN +HHJ8hzfNd+Dxve5dBDuhks9XktPDwMqPsr+6dcQG0KsNR+y8jAGKSmf5OQhBCirSXXq K1Bx0DEkx9asmvL4KgylPg/zSlNG8BZeZWuC0k+EDT8haa74dB3zXbWUoBfJUTTlXrXf Q+22V7fBF5eaFi6kt5QGCXBFhCGAtiheVNyaBAkLJaVyI2utc9uYxZ3ugXqgtNyLHS1u DY9Q== X-Gm-Message-State: AOAM532+PVCDWHzOz/QlDTE9khN4bZvrsqbVDW2FjkWQIsffgwvHJriN Z8EiE6EZevur9ZEcbv/AE2w= X-Google-Smtp-Source: ABdhPJz3rL6GTv4/ZBU2bl7Dm4ct0pyORHXhWH4J37W9yNXtege8fVkTHrzGefx6WHdJKlLLjnHC0g== X-Received: by 2002:a1c:9d08:: with SMTP id g8mr10683440wme.112.1612090772413; Sun, 31 Jan 2021 02:59:32 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Antony Pavlov , Joel Stanley , Peter Maydell , qemu-arm@nongnu.org, qemu-trivial@nongnu.org, Alistair Francis , Niek Linnenbank , Laurent Vivier , Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mitsyanko Subject: [PATCH v2 2/7] hw/arm/exynos4210: Add missing dependency on OR_IRQ Date: Sun, 31 Jan 2021 11:59:13 +0100 Message-Id: <20210131105918.228787-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131105918.228787-1-f4bug@amsat.org> References: <20210131105918.228787-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The Exynos4210 SoC uses an OR gate on the PL330 IRQ lines. Fixes: dab15fbe2ab ("hw/arm/exynos4210: Fix DMA initialization") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Cc: Igor Mitsyanko --- hw/arm/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index a320a124855..223016bb4e8 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -52,6 +52,7 @@ config EXYNOS4 select PTIMER select SDHCI select USB_EHCI_SYSBUS + select OR_IRQ =20 config HIGHBANK bool --=20 2.26.2 From nobody Tue Nov 18 18:25:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) client-ip=209.85.128.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612090779; cv=none; d=zohomail.com; s=zohoarc; b=LPFYQf4btsZW3vYsESV2yTQtxlGyl/ggj/VFpNKV+nnYFDigly7mCl9cbD/WqLguu4MLx8ExBeuyNzsefg8BvVIhAFT0rUs6KuU99/xCtdfO9Uq7kNgGQ98GYtfOgxTIAph8VcMazaxe7EUJX78oCabb+MLxLSYKBjC5bn59Ejs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612090779; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rhmZGh+lLqk8y/kN/amckU6sgJUtIz3ObCH4gQGYjHc=; b=i8KBM6R9VVzQrfrGAKwgbEvBlxYrUzxdqbaK81VP3gxFe3HBgvNpj9igap2qu60BPC4yEXSGMLYxdHKBkASwssmkbSA78PJosl4d55/c41Qi8xkSEwJKXlgkod+8DXGojCaSkW33YV7nuuRZoUlGKfhj8jVhhTr6sWG5Yvx175I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.zohomail.com with SMTPS id 1612090779289756.9528837941497; Sun, 31 Jan 2021 02:59:39 -0800 (PST) Received: by mail-wm1-f46.google.com with SMTP id 190so10187135wmz.0 for ; Sun, 31 Jan 2021 02:59:38 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id h207sm15597265wme.18.2021.01.31.02.59.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 02:59:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rhmZGh+lLqk8y/kN/amckU6sgJUtIz3ObCH4gQGYjHc=; b=VdrvC+Wfqci72UDt7L8R8zMk3X+PU6jgBeh7dDJgh8GPVt9Dhat48Cu/EukJAsfawO SARDR7W2ZMfcP+5j3FrTXZ74B3y4pG13g32phI6Xs2Rnr8k53VYVIebIZWSPn6J+i60L wUJApDAa/m0I7kXEWm2xlmRlYyHqcXym4ODMGR6yz3b4T/6judTUaOxhZZ0rU5KO7ocN UdaSx4/rmM3qzS4ScMIpiYhYOpUx1rNvV16KdKdOyn1//KSWeLwxSUXYcKfw8zxQ7rGK JpJaOlfXNZHDSeeGLUWMleruP6ujuKIw+bBEPoLN0p6dDu2u4BdOPrTnFYaoHzno2Irv Va9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rhmZGh+lLqk8y/kN/amckU6sgJUtIz3ObCH4gQGYjHc=; b=rDD1ELv+9IRpnFsXVv1wfCWiXCdY2iE9aCcOVY+G5KVpaG5iazjOjkIjZOs6cNFwGC ilRHnE2fy4VYYnQQf34PVGJYtUYLw8ejoJ4TAEeJGNO25kTLDSVDmOcjUVC1Ts6bp66c WwGvFlpXxerucRLTDA0xmZlwCFZITN+tUrHiDTgesswxos4VCy7RQKjA842D9ziwCtTX aeZCKb0L77uMomASBVCfEEMTX/iL/2IH633klPMPeNSEd13e7VORQKTPqYnBmHSDzA2/ cOD5/mV5iH9tvtRaYIEN293MF/bcqk96ok60XIdf/fCF3zJSyzN04Xj8xoi1uGx2ujdO GvWQ== X-Gm-Message-State: AOAM533AfYmcZBg36Ot12S0n+mcvX88WZIfY+OhdP5dWJFbxISH51uCl ipWGGoKfVZ6hCviLlwcsd5w= X-Google-Smtp-Source: ABdhPJyCgwincAAHTuwt7n13FPHmZr2kJpz6qcOW0mEG38XTaG2SXdOUjVex0Q/jy2LbXmtB7SKA5Q== X-Received: by 2002:a1c:4e05:: with SMTP id g5mr10841953wmh.105.1612090777586; Sun, 31 Jan 2021 02:59:37 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Antony Pavlov , Joel Stanley , Peter Maydell , qemu-arm@nongnu.org, qemu-trivial@nongnu.org, Alistair Francis , Niek Linnenbank , Laurent Vivier , Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Edgar E. Iglesias" Subject: [PATCH v2 3/7] hw/arm/xlnx-versal: Versal SoC requires ZDMA Date: Sun, 31 Jan 2021 11:59:14 +0100 Message-Id: <20210131105918.228787-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131105918.228787-1-f4bug@amsat.org> References: <20210131105918.228787-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The Versal SoC instantiates the TYPE_XLNX_ZDMA object in versal_create_admas(). Introduce the XLNX_ZDMA configuration and select it to fix: $ qemu-system-aarch64 -M xlnx-versal-virt ... qemu-system-aarch64: missing object type 'xlnx.zdma' Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- Cc: Alistair Francis Cc: "Edgar E. Iglesias" --- hw/arm/Kconfig | 2 ++ hw/dma/Kconfig | 3 +++ hw/dma/meson.build | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 223016bb4e8..09298881f2f 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -354,6 +354,7 @@ config XLNX_ZYNQMP_ARM select XILINX_AXI select XILINX_SPIPS select XLNX_ZYNQMP + select XLNX_ZDMA =20 config XLNX_VERSAL bool @@ -362,6 +363,7 @@ config XLNX_VERSAL select CADENCE select VIRTIO_MMIO select UNIMP + select XLNX_ZDMA =20 config NPCM7XX bool diff --git a/hw/dma/Kconfig b/hw/dma/Kconfig index d67492d36c1..5d6be1a7a7a 100644 --- a/hw/dma/Kconfig +++ b/hw/dma/Kconfig @@ -18,6 +18,9 @@ config ZYNQ_DEVCFG bool select REGISTER =20 +config XLNX_ZDMA + bool + config STP2000 bool =20 diff --git a/hw/dma/meson.build b/hw/dma/meson.build index b991d7698c7..47b4a7cb47b 100644 --- a/hw/dma/meson.build +++ b/hw/dma/meson.build @@ -9,7 +9,7 @@ softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_dma.c')) softmmu_ss.add(when: 'CONFIG_STP2000', if_true: files('sparc32_dma.c')) softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dpdma.= c')) -softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zdma.c= ')) +softmmu_ss.add(when: 'CONFIG_XLNX_ZDMA', if_true: files('xlnx-zdma.c')) softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_dma.c', 'soc_dma.= c')) softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_dma.c')) softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_dma.c')) --=20 2.26.2 From nobody Tue Nov 18 18:25:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612090784; cv=none; d=zohomail.com; s=zohoarc; b=n695CRrCBVMod/or4dOAZmYnPPXplFfmirPpDCaxCHEVZoYpZLGrNUaNvbp7ZH//7LC7hiYHL5kKlktWBn5obuulhhoowsf5RMbfESumdS1MP3ExGHnmVKO5VQ/xldgD60f8ExZaAooh8PGURmPfRt8xh/+5y1n9mBuPMqt3Vzc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612090784; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kNgfhjPiw9171QK4YrLx8o/lKUJjzdxMB/0DtTDI5HQ=; b=QFHTeIvssRc/iiexIhDxFdarEYV/PmJIRmckA/DFW6r1Me9zBVvQeAjkCeengLUj1FUHLG0jCpXdshPgZqOReUViD0oPp9q4LaVj8qBFF0SpvzxI15RAhRMVhQSVqvcvAqMqOaLNf6dIjaVF/5lXLtr/W1gVBViA5idWboUlXr4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1612090784652973.6025691085399; Sun, 31 Jan 2021 02:59:44 -0800 (PST) Received: by mail-wr1-f51.google.com with SMTP id a1so13446331wrq.6 for ; Sun, 31 Jan 2021 02:59:44 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id b4sm22732200wrn.12.2021.01.31.02.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 02:59:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kNgfhjPiw9171QK4YrLx8o/lKUJjzdxMB/0DtTDI5HQ=; b=qDjRF+0ndp85DpCMzIrhPpNfUsERWwiOZI7/uwPu1ErC9b8kl/ykCGgGrxlg4a9Bsl r/WmJmM75cJjlvhWXh0UIhpVBgF0oD6uDr58SF2Okr0t66zghYgcVzpgkCF8QHBuA4jO Mn7yPQYM0WVm3BdD7T1O62lMHo0xJCJ1Hc2aC+GNc2CBMm/3s22fGi5zasxYyyobf9cR JQuMGg+QN6hM+mj8OWkmMOQqYXNkZchvWRFn9CmVPdqkPUixwym8ClHDKAzq0Z/Ji3yP jfhKHAT4XbxRuUR0jKfsjrKVR0f3BZOourWAM7IeuFtdhQm5ylugxrb8H/FizUKPFxyV dylg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=kNgfhjPiw9171QK4YrLx8o/lKUJjzdxMB/0DtTDI5HQ=; b=o1Or45gFnuZmCbTxSxGWIMXqHWJidTQ8GkmTOt6TrZZn1T0DDChwKiS/JIqKUQk5Kn eC7hY5ASY2pUOCUjI4UHbtm48eYRtczAmk6LDYUjaB0TMdeuX0W8BmVVDz18bThKfuSO 2vsF7jBL/oowhGdWldwrnK6sk2eGMpS219DtBAQ3pvslAix7dH0OV2P4cuHUQD3FEXUe +qigLatChOshmslTtpMkTzQqp/OmcBlH59p6F0OdDppDXFI//XtiS/hp4cF9QaybYWAX Ww6jtq0AjRx5l/ltKZf6JzYPl+Lai/mNMLSB9m5HFD6rOnNP84rVjx5FbJ7ALlTvA6LR yMiw== X-Gm-Message-State: AOAM533xxSaf1tmUrhP/lUYLXdfqz0iIDmi5Re1qOCMDqdZpgmY3FDIk Cy/fZeIGnNg0pnZUpjXV0Wo= X-Google-Smtp-Source: ABdhPJxZCR+z+3577SkyRfEhG9RwDBvB5aUFyHvyoZzotMTiYVS/VSwCAnlC1+7O2XFjRiGKzDAGng== X-Received: by 2002:adf:d1cb:: with SMTP id b11mr13397588wrd.118.1612090782910; Sun, 31 Jan 2021 02:59:42 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Antony Pavlov , Joel Stanley , Peter Maydell , qemu-arm@nongnu.org, qemu-trivial@nongnu.org, Alistair Francis , Niek Linnenbank , Laurent Vivier , Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 4/7] hw/arm/virt: Do not include 64-bit CPUs in 32-bit build Date: Sun, 31 Jan 2021 11:59:15 +0100 Message-Id: <20210131105918.228787-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131105918.228787-1-f4bug@amsat.org> References: <20210131105918.228787-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Similarly to commit 210f47840dd, remove 64-bit CPUs (which have never been available on 32-bit build, see commit d14d42f19bf), to fix: $ make check-qtest-arm ... Running test qtest-arm/device-introspect-test missing object type 'cortex-a53-arm-cpu' Broken pipe ../tests/qtest/libqtest.c:181: kill_qemu() detected QEMU death from signa= l 6 (Aborted) (core dumped) ERROR qtest-arm/device-introspect-test - too few tests run (expected 6, g= ot 5) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/arm/virt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 399da734548..f0e9d7dd7d8 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -199,9 +199,11 @@ static const int a15irqmap[] =3D { static const char *valid_cpus[] =3D { ARM_CPU_TYPE_NAME("cortex-a7"), ARM_CPU_TYPE_NAME("cortex-a15"), +#ifdef TARGET_AARCH64 ARM_CPU_TYPE_NAME("cortex-a53"), ARM_CPU_TYPE_NAME("cortex-a57"), ARM_CPU_TYPE_NAME("cortex-a72"), +#endif /* TARGET_AARCH64 */ ARM_CPU_TYPE_NAME("host"), ARM_CPU_TYPE_NAME("max"), }; --=20 2.26.2 From nobody Tue Nov 18 18:25:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) client-ip=209.85.221.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612090790; cv=none; d=zohomail.com; s=zohoarc; b=RCYsh8Ikw+tvHb3PsxRA+jzAl30gnVYfwggrCQF2r9WJMpOfT9fx182KNX/guhrfnoveqKoWOZBi5qLcZpyohjDTIo8gihAjAfuzv5YD7ZFehvnS8Bq8vo4RjSdihMtGJWbG1AsXQ6IomjeT4+jJSwjAg8tZwrZif2hoYJhzWCk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612090790; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZQoiucDIT4rSjEAY4ZuvMUxbDYBSZFNnjg1m60zIj8E=; b=bFq65EJ8VwBXnq8wNJt9ROufvvZQvbmFmDa0tzkzltOrqN77MU3LX6tdnNn/QoBuLMtoEz4WQ7msjcv4aw98mFBL4KBrGrc3CN0jhzQ1ty08IEpdHiCeyroi6Ir9neiX9+abmkFvEKdSrbHy8ChEeI10M2mlpNfecDDcJa++7AI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.zohomail.com with SMTPS id 1612090790155763.8244254978654; Sun, 31 Jan 2021 02:59:50 -0800 (PST) Received: by mail-wr1-f48.google.com with SMTP id 6so13415029wri.3 for ; Sun, 31 Jan 2021 02:59:49 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id d5sm22464661wrs.21.2021.01.31.02.59.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 02:59:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZQoiucDIT4rSjEAY4ZuvMUxbDYBSZFNnjg1m60zIj8E=; b=ZeHl/siOlsjFxeuZteA5wZuvh/8NM5Q/I2spUpfS0cqhWQBuY9YgwoDKLtaByXCpsv b0l2aiuzFIE3GaVjOEgo5w3uUWtoV2d7riKMBtfaVJ1kcmy1TDVcMviNmkVSc50FUIl8 RrgEgL711CCUFwBVMPacRJlikKGRdcdCvhRV9rDU50nyaf9FSdjlo0LKOVx8NE/An6Yu 61dk28LtGZmnuUCSGprEiOQlo0nr4rlbWsq36QoRMDGQxhppeXn1SOKISZh6VVgpMrLE KLvyHAfmSA2gQpgT+pv2cCgdiaymRAn0USUG9JZhRcUFLTvmKSyFbU+nMMvDVbwRc+KV 5j9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ZQoiucDIT4rSjEAY4ZuvMUxbDYBSZFNnjg1m60zIj8E=; b=YP6ux8fTV9E7w12nlXYbiqWa+IjIiizpqp5H7tkvMMLkKui0ff80dbE1kvyKfSgKDL rds9zPl0abzDwPHJfrjn6bPH3321FqfeIqQE5+3ea99qyqFXGT7clZ9KesEiRjJkoxPA CirTNjmksgm2dIuz2GwIVhur1ghXsvNAsqwkfxtQJ8lmNCcuTQNMO42AZ+uoSUEkoGwS kw1nFTaEzchDgxDDAQLFfKIwj+CpBmTQOE82LY71kUW+LakolSpHWf6FT8ad2ABfyfkd 5RvVB6f/AJDcK8nXno8xwzwf9LP6dwNUURKCJ3FHA1TgN5JOd30XOwmK0EVYraD4cLzl toUQ== X-Gm-Message-State: AOAM531nGSqmapvRbqHk4nEMGMRu+5dgHQ22qyWPcb+/tc6A7KLYuCe0 6LC208rK9L+/rx1B7Kx9Y98= X-Google-Smtp-Source: ABdhPJxVJS0UB3XcqSG9ZrQEJVPZb3WoW36SwkkysF0aEYp4+I6Gla/yX1CHAc/ThxX2mutk7FEQww== X-Received: by 2002:adf:e9cf:: with SMTP id l15mr13003391wrn.317.1612090788500; Sun, 31 Jan 2021 02:59:48 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Antony Pavlov , Joel Stanley , Peter Maydell , qemu-arm@nongnu.org, qemu-trivial@nongnu.org, Alistair Francis , Niek Linnenbank , Laurent Vivier , Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Radoslaw Biernacki , Leif Lindholm Subject: [PATCH v2 5/7] hw/arm/sbsa-ref: Restrict SBSA-ref board to 64-bit build Date: Sun, 31 Jan 2021 11:59:16 +0100 Message-Id: <20210131105918.228787-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131105918.228787-1-f4bug@amsat.org> References: <20210131105918.228787-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The SBSA-ref board only use CPUs available in the 64-bit build, it is pointless to have it available in the 32-bit build. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Cc: Radoslaw Biernacki Cc: Leif Lindholm --- hw/arm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index be39117b9b6..059ff7382f2 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -22,7 +22,7 @@ arm_ss.add(when: 'CONFIG_TOSA', if_true: files('tosa.c')) arm_ss.add(when: 'CONFIG_Z2', if_true: files('z2.c')) arm_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview.c')) -arm_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa-ref.c')) +arm_ss.add(when: ['CONFIG_SBSA_REF', 'TARGET_AARCH64'], if_true: files('sb= sa-ref.c')) arm_ss.add(when: 'CONFIG_STELLARIS', if_true: files('stellaris.c')) arm_ss.add(when: 'CONFIG_COLLIE', if_true: files('collie.c')) arm_ss.add(when: 'CONFIG_VERSATILE', if_true: files('versatilepb.c')) --=20 2.26.2 From nobody Tue Nov 18 18:25:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1612090797; cv=none; d=zohomail.com; s=zohoarc; b=UPbve8fsExlJS6n440D+lR+GyicSiVIdvvMSBxYgwWCtu5g+qXhsr7YGxVg94GS8fGn8y3vhxf3KP7FQP6Co5tMuxRVv6JC+msQ7FsC7UuFXYYWOf2JIYh7mgy2RpQm4wnVjpWvExAVQQj8BmYTrpUPGs2Xz0tpfeB3I882UYC0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612090797; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=K1GY+CrGWLNKk4VjoQeZ9qm50XB2sG8rwszIkKr7Jqk=; b=gsCnBVs0GvtqRLTiH8gdsp1oR3jbFfReVZpI0F3ElipqyUK9MvXklotIpiXLJdpy9a8W9t+m0TRMPlNTUKfFJa4YXQP5Gso0xhdE34e49TvCjzou6wMf7ms7EfmtJm0ww47Gf9Gub5XvksXGUnG+gBAruFPa/70XpYOYgenRvvI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1612090797560365.7384346990232; Sun, 31 Jan 2021 02:59:57 -0800 (PST) Received: by mail-wr1-f52.google.com with SMTP id d16so13387632wro.11 for ; Sun, 31 Jan 2021 02:59:54 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id l14sm22091419wrq.87.2021.01.31.02.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 02:59:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=K1GY+CrGWLNKk4VjoQeZ9qm50XB2sG8rwszIkKr7Jqk=; b=HPsDKu0PbsmcYP4UG3Hicq8cpwlvvUW4qW/gmBKuMHCa8hdR5bL3/3/ZItGtYFpsTT mDvvb8wUDAAFol6ZNlljn0WRYc71vICmgQSWEPPblanSXRHyByMWGN8PVZ0D2Iwrb3MH Dydwd2Biq4CiM0aK2oCwdIuJcRO4rGntZUSN8rFjxns9+5BZd+ZV8jl7NNdePkPzrJ7u 3BqApBC0GbyqgzPH6BL8XNcDiQlx7l3aPfOek8jsy4r15IRgnmhRBZ2Yg3GwkeHu+s1V MRNJcwztz135kzI0K1woinW1reEf7UaQSDbYD/vaVGOqcwa89Bezua6K1YCs/4vgZJCH MfQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=K1GY+CrGWLNKk4VjoQeZ9qm50XB2sG8rwszIkKr7Jqk=; b=Y2VyGPHJV9G1R1JB7UIpO3IIxsei1CvdYtp1nwEu3f+AVMSIqh1CWgPRcf6pS4k0Xc PK5EEU+pC0eeqUqDFr9cOhEd9wR8jA7dpyemPBOGnRc+mzXWz5Lex5NCsMCs50MQBmrF U+itv+FmMx6Tz+XyR57vAB6NueFjGL3YssY6X0Vta016XG1a2MDCUjg1EtQEZkwcsqFR DPh/vmyDDTbpBVqWjbJ1EtSCq6dmv4mCwOAWIWRmDsOkGDIN+Zl2m2orUTQkJDAX1f4Y lFG3s2PtRFHHqqRyZ86pMTzxzoTSrWFqU+oKpVW4OIJxAUUvBm5gnvNt5TPHlaQFEWgG 444g== X-Gm-Message-State: AOAM5324XEjN9IdPwCHWblOehCR93eUwFLeVHiVHD6LWGXLOIKyIDiey Z9XkIgUaAleEtlcXuWzcRTs= X-Google-Smtp-Source: ABdhPJxKNEYJ5VvvJzCCmtbw1/g2mbbDx3EPmWrYWzj6CY26h/S9CXQeuFKtaNO73YMh+/NQl+f7Zg== X-Received: by 2002:a5d:58dc:: with SMTP id o28mr13079263wrf.414.1612090793758; Sun, 31 Jan 2021 02:59:53 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Antony Pavlov , Joel Stanley , Peter Maydell , qemu-arm@nongnu.org, qemu-trivial@nongnu.org, Alistair Francis , Niek Linnenbank , Laurent Vivier , Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Edgar E. Iglesias" Subject: [PATCH v2 6/7] hw/arm/xlnx-zcu102: Restrict ZynqMP ZCU102 board to 64-bit build Date: Sun, 31 Jan 2021 11:59:17 +0100 Message-Id: <20210131105918.228787-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131105918.228787-1-f4bug@amsat.org> References: <20210131105918.228787-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The ZynqMP ZCU102 board only use the Cortex-A53 CPU, which is only available in the 64-bit build. It is pointless to have this board present in the 32-bit build where this CPU is not available. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Cc: Alistair Francis Cc: "Edgar E. Iglesias" --- hw/arm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 059ff7382f2..345099f5a1b 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -41,7 +41,7 @@ arm_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_peripherals.c', '= bcm2836.c', 'raspi.c')) arm_ss.add(when: 'CONFIG_STM32F205_SOC', if_true: files('stm32f205_soc.c')) arm_ss.add(when: 'CONFIG_STM32F405_SOC', if_true: files('stm32f405_soc.c')) -arm_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zynqmp.c',= 'xlnx-zcu102.c')) +arm_ss.add(when: ['CONFIG_XLNX_ZYNQMP_ARM', 'TARGET_AARCH64'], if_true: fi= les('xlnx-zynqmp.c', 'xlnx-zcu102.c')) arm_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal.c', 'xl= nx-versal-virt.c')) arm_ss.add(when: 'CONFIG_FSL_IMX25', if_true: files('fsl-imx25.c', 'imx25_= pdk.c')) arm_ss.add(when: 'CONFIG_FSL_IMX31', if_true: files('fsl-imx31.c', 'kzm.c'= )) --=20 2.26.2 From nobody Tue Nov 18 18:25:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) client-ip=209.85.221.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612090800; cv=none; d=zohomail.com; s=zohoarc; b=nvPsTDWSTWwyGuOGYETiZ2J6nri3Ym8dnHVwZ13V824gXnBiJpCBFtdDcH3L/qul18kEeMlifGZtEk0XF4oRDQfPS4smHcRaq1US7zYwk6e2H/+ZyA6omDxEnRTtmzrxEajs577mpAu5/guNOXr077Z7S3MQxiy9kmOq+ODTF+w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612090800; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZTEQksi03h84QrtUmTk444gEe+iL7OPLaC2gCq3Rbc4=; b=ahY8msVRF17ltF4NnnQf8YW66CyNMKlgMR9ZZoKUOm6c0BQakezCfQdT3vFmILaGIe5vc39k9MmsDwkHeJKAi/BH9iSh/nNN1vPWaWrvTZDP2D+GVuMU/TsMaXpE1B8NJpd8My9yJEcZEyNtqNh6PaR7cQu8svWf76uwNeGRnIU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.zohomail.com with SMTPS id 161209080073633.98124963162411; Sun, 31 Jan 2021 03:00:00 -0800 (PST) Received: by mail-wr1-f53.google.com with SMTP id q7so13390589wre.13 for ; Sun, 31 Jan 2021 03:00:00 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id e11sm22314803wrx.14.2021.01.31.02.59.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 02:59:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZTEQksi03h84QrtUmTk444gEe+iL7OPLaC2gCq3Rbc4=; b=CzQnvB+wAGG+ZM98ASAkFFlNd5GPT7S2Vr0TiFcZ9h1nMzE2O3ZNyjO7hWErIt03de fjSp7c3iPq/2WxBlx9/sTwl9uWSpjUMS8Z9R5+KnFlkYDqHVxfEqUkhcCYVpFHFpCZM1 EyLsvmW25ZLIKF7VVERw6T5y147X8Rf21Oqsnijpb1ttu6lpZdu65CIdYeNp/l43ebJq RJ7CKc7F4X7q8342OojNpsZNi8u0rAVDJuaCUrkqntY654FYzosO++jtpr8e268GlFTh AyGqp9+70R1Y7OxX4WxOGP24+uK/tA6sDIaiCQa0aAFKIH0+jLBEBLgh6AcSBw5oR9Zo IKbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ZTEQksi03h84QrtUmTk444gEe+iL7OPLaC2gCq3Rbc4=; b=fEh2nZ+zBgxQG+Ci+s2OTS0k1577msvq73UyJISnSDV7us57uqEQXtrS8KOHCwyTa6 nDow6sVk0YVoZ91BALbALy+xnyq9RWsNRrY44tJ/7SzOId4X8kw0DuczRNkZvtqWfzNE lUIzZGn08Zv6RNou7Fzje8WZy6wDDpcmiI/RALV+ow89ZzbMwAeTVSyee/czCV8ToJvm Ew7F9u/7SHji68EVFiUhSHeJnwmaAkvVJjBSoR7hecrApXz2tBM9v3wrTuxddHZb/9KE cmv/GJoVs9QMMDtI9uFNCyCknboHkXvK0sOAsx3tzvbayDoOQJDHCRtJBtOA+3XOfvCx TPZw== X-Gm-Message-State: AOAM531SsP0q8mSMsNZ/LvXRVt2odGAUVbEK1X9IUKCmZ38BRwQoaITv BxWSNO/PAdZEhYwsZHp7P7k= X-Google-Smtp-Source: ABdhPJyY553CHznXAkhgaIPNfhNT33w0WY2gzsrGRR8vsbuHKvEQywFza4gZYWFnvuBdxlbytBMrNA== X-Received: by 2002:adf:f747:: with SMTP id z7mr13068572wrp.384.1612090799066; Sun, 31 Jan 2021 02:59:59 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Antony Pavlov , Joel Stanley , Peter Maydell , qemu-arm@nongnu.org, qemu-trivial@nongnu.org, Alistair Francis , Niek Linnenbank , Laurent Vivier , Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 7/7] hw/arm: Display CPU type in machine description Date: Sun, 31 Jan 2021 11:59:18 +0100 Message-Id: <20210131105918.228787-8-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131105918.228787-1-f4bug@amsat.org> References: <20210131105918.228787-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Most of ARM machines display their CPU when QEMU list the available machines (-M help). Some machines do not. Fix to unify the help output. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/arm/digic_boards.c | 2 +- hw/arm/microbit.c | 2 +- hw/arm/netduino2.c | 2 +- hw/arm/netduinoplus2.c | 2 +- hw/arm/orangepi.c | 2 +- hw/arm/stellaris.c | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index be12873673b..6cdc1d83fca 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -142,7 +142,7 @@ static void canon_a1100_init(MachineState *machine) =20 static void canon_a1100_machine_init(MachineClass *mc) { - mc->desc =3D "Canon PowerShot A1100 IS"; + mc->desc =3D "Canon PowerShot A1100 IS (ARM946)"; mc->init =3D &canon_a1100_init; mc->ignore_memory_transaction_failures =3D true; mc->default_ram_size =3D 64 * MiB; diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c index 0947491cb97..e9494334ce7 100644 --- a/hw/arm/microbit.c +++ b/hw/arm/microbit.c @@ -64,7 +64,7 @@ static void microbit_machine_class_init(ObjectClass *oc, = void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); =20 - mc->desc =3D "BBC micro:bit"; + mc->desc =3D "BBC micro:bit (Cortex-M0)"; mc->init =3D microbit_init; mc->max_cpus =3D 1; } diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c index 8f103341443..1733b71507c 100644 --- a/hw/arm/netduino2.c +++ b/hw/arm/netduino2.c @@ -54,7 +54,7 @@ static void netduino2_init(MachineState *machine) =20 static void netduino2_machine_init(MachineClass *mc) { - mc->desc =3D "Netduino 2 Machine"; + mc->desc =3D "Netduino 2 Machine (Cortex-M3)"; mc->init =3D netduino2_init; mc->ignore_memory_transaction_failures =3D true; } diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c index 68abd3ec69d..d3ad7a2b675 100644 --- a/hw/arm/netduinoplus2.c +++ b/hw/arm/netduinoplus2.c @@ -55,7 +55,7 @@ static void netduinoplus2_init(MachineState *machine) =20 static void netduinoplus2_machine_init(MachineClass *mc) { - mc->desc =3D "Netduino Plus 2 Machine"; + mc->desc =3D "Netduino Plus 2 Machine (Cortex-M4)"; mc->init =3D netduinoplus2_init; } =20 diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index d6306dfddae..40cdb5c6d2c 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -113,7 +113,7 @@ static void orangepi_init(MachineState *machine) =20 static void orangepi_machine_init(MachineClass *mc) { - mc->desc =3D "Orange Pi PC"; + mc->desc =3D "Orange Pi PC (Cortex-A7)"; mc->init =3D orangepi_init; mc->block_default_type =3D IF_SD; mc->units_per_default_bus =3D 1; diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index ad72c0959f1..27292ec4113 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -1538,7 +1538,7 @@ static void lm3s811evb_class_init(ObjectClass *oc, vo= id *data) { MachineClass *mc =3D MACHINE_CLASS(oc); =20 - mc->desc =3D "Stellaris LM3S811EVB"; + mc->desc =3D "Stellaris LM3S811EVB (Cortex-M3)"; mc->init =3D lm3s811evb_init; mc->ignore_memory_transaction_failures =3D true; mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("cortex-m3"); @@ -1554,7 +1554,7 @@ static void lm3s6965evb_class_init(ObjectClass *oc, v= oid *data) { MachineClass *mc =3D MACHINE_CLASS(oc); =20 - mc->desc =3D "Stellaris LM3S6965EVB"; + mc->desc =3D "Stellaris LM3S6965EVB (Cortex-M3)"; mc->init =3D lm3s6965evb_init; mc->ignore_memory_transaction_failures =3D true; mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("cortex-m3"); --=20 2.26.2