From nobody Sat Nov 15 11:14:43 2025 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; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1752660264; cv=pass; d=zohomail.com; s=zohoarc; b=Tw3hq3h+8clIapUW1M3II3788fPQPGU3LGtX2RABCDxNQXS0zUpd8nYXA/oOhan/pnexiuIKhmX7LzyzS3gkJSxX411mqYw8sgGpKP/RY13dufy87YA8k5NiGhIafvIX7XJ2zOOF9cZMdIKZCnhavGCbFMc3G2kAGbhtCNxW+KM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752660264; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Tw6Hakis0dnmDa7qLQRPheRKDbeoqKqGhVOLITyeVbE=; b=IwlH5qpjn8XCpIERHNeH0S24jJ0iCH9RDo5gQFgQoW9t4jTny8xv6MHdu5yFvvrCGMED7MUdcLTclF4ta9ntn9Vo55MCSYjBtO9i13MVAXZmCJ9rOgfYsxD+jGWjvx1C+ffVcs+X73L2O579AmfjTmJLQU9YzOIp5gZdsfP8i+8= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1752660264505502.42267749851396; Wed, 16 Jul 2025 03:04:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ubytY-000837-1O; Wed, 16 Jul 2025 05:57:48 -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 1ubysK-0002I8-W4; Wed, 16 Jul 2025 05:56:34 -0400 Received: from mail-bn8nam11on20604.outbound.protection.outlook.com ([2a01:111:f403:2414::604] helo=NAM11-BN8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ubysH-0006nP-Ut; Wed, 16 Jul 2025 05:56:32 -0400 Received: from BYAPR05CA0027.namprd05.prod.outlook.com (2603:10b6:a03:c0::40) by IA1PR12MB6553.namprd12.prod.outlook.com (2603:10b6:208:3a3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.24; Wed, 16 Jul 2025 09:56:26 +0000 Received: from SJ5PEPF00000208.namprd05.prod.outlook.com (2603:10b6:a03:c0:cafe::5f) by BYAPR05CA0027.outlook.office365.com (2603:10b6:a03:c0::40) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8964.12 via Frontend Transport; Wed, 16 Jul 2025 09:56:25 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by SJ5PEPF00000208.mail.protection.outlook.com (10.167.244.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8922.22 via Frontend Transport; Wed, 16 Jul 2025 09:56:25 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 16 Jul 2025 04:56:24 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB06.amd.com (10.181.40.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 16 Jul 2025 04:56:23 -0500 Received: from XFR-LUMICHEL-L2.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Wed, 16 Jul 2025 04:56:21 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kmBVT1t9Bx1M4+NFuWQVrO0ppKNEC8HD+DaxfcW81LWH9r8JhfPC1Z5U/pCV5Cr1fGdWASfUC78Mo6sf/Q9FEGOy7docie6/TcegYZjh412Hg4eSC8/YVEt2zn9nS/Eonf2MbvMKYH/bDVcCLSygyIKXWehlW/H/n4nxR0NjDPgU1sIgabJyLM4hTCcq/kplCWZkr7Kn5NHTo3JcxNCmeKBgExp4TxgswPlAfpkCVqZy1pBpZMge3ls4tzufc/hbk/yYGm6e/COxeDS9E0yxQOgcK97h+PF0gMP1+Yi8rUagVmDa4FTrQHSkfJcdFWjDsWxmRtXDX9E6PzKmHB8HEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Tw6Hakis0dnmDa7qLQRPheRKDbeoqKqGhVOLITyeVbE=; b=ZLfqbzke9VvuMbIcuZOXKwUpZ/s5M2SLO40JQZk9tDRbTv5QGtpI8tTD3WlfXOQNtksMREiInvX/NrtCMDRgdAvfd6xGrUY8qFTll848MwWJwk4QSd+3oEm0Wdc/2uswbyBfME5jK8R4MRahwHQh6EUxsWlfHkWHy1GK8Jsf6S3QarnmfH0id7gQO+pOv+VMyuACTJmbnk8vpbIZeAjDnMnXACBWqGsLdEYLKGuiT2IZFaKjh3UeJA5QMwCO+h+AdVkXBRJr+CL8MZU3fuITOcJmyHnlvRk3VKYhmKF5TIPnt+G/EpT2SlQO/YcOHIRLArrIjel8zkqZ1j6gDdQvJA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Tw6Hakis0dnmDa7qLQRPheRKDbeoqKqGhVOLITyeVbE=; b=3BHuoKlnOwPcoWUj83c0gd4G+Laua7YulIWtPigBdNYN8dvWbEEq/0Qf7KpF9bEn+WikRkB3mBPvUEYFBxO54Pnzr1MIDbOTYa8Uk1x6oWI3QabaFqZeghEuR1qKa1KYCb8WmIn7NCDyDV9W+tKRtv6ybjEm0WEizQr/n6V5JSw= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; 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 (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C From: Luc Michel To: , CC: Luc Michel , Peter Maydell , Francisco Iglesias , "Edgar E . Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , "Frederic Konrad" , Sai Pavan Boddu Subject: [PATCH 42/48] hw/arm/xlnx-versal-virt: rename the machine to amd-versal-virt Date: Wed, 16 Jul 2025 11:54:24 +0200 Message-ID: <20250716095432.81923-43-luc.michel@amd.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250716095432.81923-1-luc.michel@amd.com> References: <20250716095432.81923-1-luc.michel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF00000208:EE_|IA1PR12MB6553:EE_ X-MS-Office365-Filtering-Correlation-Id: 9c80f972-2160-412a-78df-08ddc44f06f5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?bLXgW6WLTYJbJ/2xt71oyjv0aKmu1eMc+O1OlpOvqUMYsOJVoM1rA8HRMh5p?= =?us-ascii?Q?AJOH6BPV354o63nTKu5buoe1GA0ObefTLIrJ0kwOmiWfge4IfpiC9TOI25Db?= =?us-ascii?Q?wkTrFpVAdWeRSz2VoIHa5o5bW3TCKxt9UOMuQ+owngyey41a23gpFTIrzdot?= =?us-ascii?Q?y0SWYj1hth99FFlszSLcLqgRDKNen7x/aEOnI/fRZeedBae7YhtQ3VsmZe1g?= =?us-ascii?Q?wF07LsDWzyyl9Xw6wmcPe551zlvjg8ubZ4kiO568PjFRmsfRZV1WtA0XX57Q?= =?us-ascii?Q?KGB/LnG7t1NXuySHTMNsNCaWNXG5KzAfTiAfNZ3Cxl59zX+iX0+DklgISzWe?= =?us-ascii?Q?qGnGSx+tjt7kUIUWVI6sFF/GFkjfspxBPRqWAN40W5pbNO+UDtsvxyBIyUq8?= =?us-ascii?Q?JDZaae80+PL/bhMYmkY5VLLmPG6+XCkd4VHehPxfmVfxz5QlX2XrJv29IzT2?= =?us-ascii?Q?azBunQt/rBt7kZPekBvhuvXGokg/Woh+s4pBbkd+BKavpzqR5bdIGwlUS7PS?= =?us-ascii?Q?tYzxgipw6hR0JgL1yF2LzKCbEpQGF+CcX83g21AVYUUZTjf+CyfkEbva+ud5?= =?us-ascii?Q?fi5CxydeuzQeI//m7cSPUAGPpoDDj5Owg6r0x/fqzG7oIlcFndDeHarUUEIm?= =?us-ascii?Q?1enf1yWTAEfRN865Pmjk6uEwKPvu834F9O9U+JiEhnkAp2VAERZjI+ilWuUy?= =?us-ascii?Q?9GioHsi04sKf7Ldh/1X+Q5zHIi4M5q93Xuz6EoNBEunJIsuiSAV5YzmgpO9r?= =?us-ascii?Q?J95hRjt3q9yP6WDycmS2NEvkBaeYjwu2avCjXsHm0/J8BozbSd8TGzOv1Z4l?= =?us-ascii?Q?7sVIimkn9FZsNkU3H1QSZp7z9wpvvyMTo9Ftcei5FuOWtLSnuuNGnCGqTKJp?= =?us-ascii?Q?g4Tgv39Ldu4ySCpQNZgPz6fEfsVbwrKuURtcCe0rrd1gEYPbcEB0hH4z2zGq?= =?us-ascii?Q?WInFoAoXmNZa398InlM9WpRJStDs1KGxl8XCs5Zfh7GwSfXgG+0IqHTge/YA?= =?us-ascii?Q?z7olk7Pi07omq754XS50BxOs4iy84fARauDI8Y2Y+eCAIAvJL04QlMaU7nEi?= =?us-ascii?Q?XBQ3f/WD80zMAPnM8HdVRUL92IXHaomKitndPeLG7ggcKgzIvuTbnA7l1pg1?= =?us-ascii?Q?JdZFx1r+Y/OeDlk3AtK6FnFXUTELSOK2eTPC5F3qjCLmeL53jBIGuk1z7iKb?= =?us-ascii?Q?IDELFrbhvo67/jMWbwLOVT17tXgmnrwXn0Qzw8hkpI85lp76CnNa/hfIUqcR?= =?us-ascii?Q?OfoqZRu0ov0IzjRQkMpU399626htldQ73guxd1vbBh9VPberm5n4XHYMx6zh?= =?us-ascii?Q?+1B8eApTRW1M/2Sf2CjRp7xU20ZYQflGH0dtA3CWARgcUWiH4h03wF8HP/nw?= =?us-ascii?Q?ZnIOeI54G2YRBAUYATVl8jTccPoBuU6HzxBZcpnnkyZ9ZZ5fAp25UIfsjsqI?= =?us-ascii?Q?z9wKkp7W2btPmcjTkw/JHX1n5uihZ34XvdDiaWAS7Fz5+m+i53Iz5uB4vjI9?= =?us-ascii?Q?u4qUznphh8RPNART8pcXuRwUDEKQXibMn3NCVjT3KxCB3ahXLCVAG2jArQ?= =?us-ascii?Q?=3D=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB03.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(1800799024)(36860700013)(82310400026)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jul 2025 09:56:25.3355 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9c80f972-2160-412a-78df-08ddc44f06f5 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF00000208.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6553 Received-SPF: permerror client-ip=2a01:111:f403:2414::604; envelope-from=Luc.Michel@amd.com; helo=NAM11-BN8-obe.outbound.protection.outlook.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, WEIRD_QUOTING=0.001 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 @amd.com) X-ZM-MESSAGEID: 1752660378717116600 Content-Type: text/plain; charset="utf-8" To align with current branding and ensure coherency with the upcoming versal2 machine, rename the xlnx-versal-virt machine to amd-versal-virt. Keep an alias of the old name to the new one for command-line backward compatibility. Signed-off-by: Luc Michel Reviewed-by: Francisco Iglesias --- docs/system/arm/xlnx-versal-virt.rst | 26 +++++++++++++++----------- hw/arm/xlnx-versal-virt.c | 11 +++++++---- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/docs/system/arm/xlnx-versal-virt.rst b/docs/system/arm/xlnx-ve= rsal-virt.rst index c5f35f28e4f..2c63fbf519f 100644 --- a/docs/system/arm/xlnx-versal-virt.rst +++ b/docs/system/arm/xlnx-versal-virt.rst @@ -1,21 +1,25 @@ -Xilinx Versal Virt (``xlnx-versal-virt``) -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +AMD Versal Virt (``amd-versal-virt``) +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -Xilinx Versal is a family of heterogeneous multi-core SoCs +AMD Versal is a family of heterogeneous multi-core SoCs (System on Chip) that combine traditional hardened CPUs and I/O peripherals in a Processing System (PS) with runtime programmable FPGA logic (PL) and an Artificial Intelligence Engine (AIE). =20 +QEMU implements the Versal Series variant of Versal SoCs, with the +``amd-versal-virt`` machine. The alias ``xlnx-versal-virt`` is kept for +backward compatibility. + More details here: -https://www.xilinx.com/products/silicon-devices/acap/versal.html +https://www.amd.com/en/products/adaptive-socs-and-fpgas/versal.html =20 The family of Versal SoCs share a single architecture but come in different parts with different speed grades, amounts of PL and other differences. =20 -The Xilinx Versal Virt board in QEMU is a model of a virtual board +The AMD Versal Virt board in QEMU is a model of a virtual board (does not exist in reality) with a virtual Versal SoC without I/O limitations. Currently, we support the following cores and devices: =20 Implemented CPU cores: =20 @@ -72,11 +76,11 @@ A few examples: =20 Direct Linux boot of a generic ARM64 upstream Linux kernel: =20 .. code-block:: bash =20 - $ qemu-system-aarch64 -M xlnx-versal-virt -m 2G \ + $ qemu-system-aarch64 -M amd-versal-virt -m 2G \ -serial mon:stdio -display none \ -kernel arch/arm64/boot/Image \ -nic user -nic user \ -device virtio-rng-device,bus=3Dvirtio-mmio-bus.0 \ -drive if=3Dnone,index=3D0,file=3Dhd0.qcow2,id=3Dhd0,snapshot \ @@ -85,11 +89,11 @@ Direct Linux boot of a generic ARM64 upstream Linux ker= nel: =20 Direct Linux boot of PetaLinux 2019.2: =20 .. code-block:: bash =20 - $ qemu-system-aarch64 -M xlnx-versal-virt -m 2G \ + $ qemu-system-aarch64 -M amd-versal-virt -m 2G \ -serial mon:stdio -display none \ -kernel petalinux-v2019.2/Image \ -append "rdinit=3D/sbin/init console=3DttyAMA0,115200n8 earlycon=3Dp= l011,mmio,0xFF000000,115200n8" \ -net nic,model=3Dcadence_gem,netdev=3Dnet0 -netdev user,id=3Dnet0 \ -device virtio-rng-device,bus=3Dvirtio-mmio-bus.0,rng=3Drng0 \ @@ -98,11 +102,11 @@ Direct Linux boot of PetaLinux 2019.2: Boot PetaLinux 2019.2 via ARM Trusted Firmware (2018.3 because the 2019.2 version of ATF tries to configure the CCI which we don't model) and U-boot: =20 .. code-block:: bash =20 - $ qemu-system-aarch64 -M xlnx-versal-virt -m 2G \ + $ qemu-system-aarch64 -M amd-versal-virt -m 2G \ -serial stdio -display none \ -device loader,file=3Dpetalinux-v2018.3/bl31.elf,cpu-num=3D0 \ -device loader,file=3Dpetalinux-v2019.2/u-boot.elf \ -device loader,addr=3D0x20000000,file=3Dpetalinux-v2019.2/Image \ -nic user -nic user \ @@ -123,11 +127,11 @@ Run the following at the U-Boot prompt: =20 Boot Linux as DOM0 on Xen via U-Boot: =20 .. code-block:: bash =20 - $ qemu-system-aarch64 -M xlnx-versal-virt -m 4G \ + $ qemu-system-aarch64 -M amd-versal-virt -m 4G \ -serial stdio -display none \ -device loader,file=3Dpetalinux-v2019.2/u-boot.elf,cpu-num=3D0 \ -device loader,addr=3D0x30000000,file=3Dlinux/2018-04-24/xen \ -device loader,addr=3D0x40000000,file=3Dpetalinux-v2019.2/Image \ -nic user -nic user \ @@ -151,11 +155,11 @@ Run the following at the U-Boot prompt: =20 Boot Linux as Dom0 on Xen via ARM Trusted Firmware and U-Boot: =20 .. code-block:: bash =20 - $ qemu-system-aarch64 -M xlnx-versal-virt -m 4G \ + $ qemu-system-aarch64 -M amd-versal-virt -m 4G \ -serial stdio -display none \ -device loader,file=3Dpetalinux-v2018.3/bl31.elf,cpu-num=3D0 \ -device loader,file=3Dpetalinux-v2019.2/u-boot.elf \ -device loader,addr=3D0x30000000,file=3Dlinux/2018-04-24/xen \ -device loader,addr=3D0x40000000,file=3Dpetalinux-v2019.2/Image \ @@ -225,11 +229,11 @@ To use a different index value, N, from default of 1,= add: =20 Thus, a file backend should be used with caution, and 'format=3Dluks' is highly recommended (albeit with usage complexity). =20 Better yet, do not use actual product data when running guest image - on this Xilinx Versal Virt board. + on this AMD Versal Virt board. =20 Using CANFDs for Versal Virt """""""""""""""""""""""""""" Versal CANFD controller is developed based on SocketCAN and QEMU CAN bus implementation. Bus connection and socketCAN connection for each CAN module diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index 5e47a20922a..daacbfb984e 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -1,7 +1,7 @@ /* - * Xilinx Versal Virtual board. + * AMD/Xilinx Versal Virtual board. * * Copyright (c) 2018 Xilinx Inc. * Copyright (c) 2025, Advanced Micro Devices, Inc. * Written by Edgar E. Iglesias * @@ -24,11 +24,11 @@ #include "hw/arm/boot.h" #include "target/arm/multiprocessing.h" #include "qom/object.h" #include "target/arm/cpu.h" =20 -#define TYPE_XLNX_VERSAL_VIRT_MACHINE MACHINE_TYPE_NAME("xlnx-versal-virt") +#define TYPE_XLNX_VERSAL_VIRT_MACHINE MACHINE_TYPE_NAME("amd-versal-virt") OBJECT_DECLARE_SIMPLE_TYPE(VersalVirt, XLNX_VERSAL_VIRT_MACHINE) =20 #define XLNX_VERSAL_NUM_OSPI_FLASH 4 =20 struct VersalVirt { @@ -53,10 +53,11 @@ struct VersalVirt { }; =20 static void fdt_create(VersalVirt *s) { MachineClass *mc =3D MACHINE_GET_CLASS(s); + const char versal_compat[] =3D "amd-versal-virt\0xlnx-versal-virt"; =20 s->fdt =3D create_device_tree(&s->fdt_size); if (!s->fdt) { error_report("create_device_tree() failed"); exit(1); @@ -70,11 +71,12 @@ static void fdt_create(VersalVirt *s) qemu_fdt_add_subnode(s->fdt, "/chosen"); qemu_fdt_add_subnode(s->fdt, "/aliases"); =20 /* Header */ qemu_fdt_setprop_string(s->fdt, "/", "model", mc->desc); - qemu_fdt_setprop_string(s->fdt, "/", "compatible", "xlnx-versal-virt"); + qemu_fdt_setprop(s->fdt, "/", "compatible", versal_compat, + sizeof(versal_compat)); } =20 static void fdt_add_clk_node(VersalVirt *s, const char *name, unsigned int freq_hz, uint32_t phandle) { @@ -346,11 +348,12 @@ static void versal_virt_machine_finalize(Object *obj) static void versal_virt_machine_class_init(ObjectClass *oc, const void *da= ta) { MachineClass *mc =3D MACHINE_CLASS(oc); int num_cpu =3D versal_get_num_cpu(VERSAL_VER_VERSAL); =20 - mc->desc =3D "Xilinx Versal Virtual development board"; + mc->desc =3D "AMD Versal Virtual development board"; + mc->alias =3D "xlnx-versal-virt"; mc->init =3D versal_virt_init; mc->min_cpus =3D num_cpu; mc->max_cpus =3D num_cpu; mc->default_cpus =3D num_cpu; mc->no_cdrom =3D true; --=20 2.50.0