From nobody Tue May 21 17:45:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) client-ip=209.85.128.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612118699; cv=none; d=zohomail.com; s=zohoarc; b=edTcWQiKUNEAu3p2FGmAXioMbaKCtJ8eSihFTe4xrfMd1on25wo8WPauTVlfmlHOxmAGMcUxeIu9X0cGib+RKB9DsMU849/bSW8LZupmkI+CCNyz4KVeFeQSQRO+8Kzaf5BX1ojATCm+3Q2JIfaWYVllqIvWgsIKBo/NaSXpQRg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612118699; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KjWr4TKlwB/IJcVo6npcfvEPrPb22EOYTZC5O8IwCfc=; b=ef+Uq6ecaUUtBXNQkRKl1IAwhhOivIl4I+aykh+9/RVFAVQm5rJLk4CfA+RePKfOMnh/FQv3QFCozpH7Nuhwi7hDgJ6hZnBBzpoeZ7nv7c+D9aZ3+ulGHC3hd8G5XTpzTGyarkKHnRjzcC+bd8crqET0rsqLOpwXFwJqPN3F8xg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.zohomail.com with SMTPS id 1612118699664974.7973233439768; Sun, 31 Jan 2021 10:44:59 -0800 (PST) Received: by mail-wm1-f53.google.com with SMTP id j18so10790659wmi.3 for ; Sun, 31 Jan 2021 10:44:59 -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 v4sm27450035wrw.42.2021.01.31.10.44.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 10:44:57 -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=Ar83hyG1wfqk990LmyX56lvWVmRRWSUEpVqyMnuuaaHJmSx9fQuhZTQWz5jZAwbPmj wp3f+NM1Dlntqul213WvJHoGbrHt/JOBCaIwLwd8mMwZqkk/a1WSyVB5yOyhQFj+ucf/ VoYH1Lq32TXiBWgiYVXVg4QrCqnGScz9PlJr1izmus4bIu3abO/LdTnzgyReyZVhtGXL 5XVCirWVxwIE7Vkpc5U+OmR/A4JO68UGLAkC0MCOFdIn9ESnH8jitD0Yz/Wu+eKyGuOm n6VosZs4M5Xa8LFs848I0PZUknvG1ILFBOKmmvfdVuhoV1XFpeGvPKKsXdroZHS/feR3 7wMQ== 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=RURkeYoqAeO+MSYy8cs/9RR7J+UwMW3Aq7ZtkWftLIDx6GDwnvMf57rTLD9JQqEujK jVcHDEG2+2wiYhI9cnZMe7Yec03ysHjwQ/t36lgJeD1m1Cbx2PyKu5punl3oWXupoaBC UfBE7Qt6mb8SwD5BnQXSpgXc40mQ3hDdnFxccUrQg0xcYXyhsj2BrrmKjQCLhwd9z2RR fTVWz7UctZAq3LeZ2wRzQkolcK9TQ+W1Wwo5G0AOGSuEd/OKSGFcavQD3bxXDiMOylbp ucCej5Ik1mXyRl5ZDPbYaxGvVu8DLyr2OO4PjlQlgOANHx+dLn5zkOvI4JKFgugeviRw 5K4g== X-Gm-Message-State: AOAM530SWEX0lDvccih2otSIPN/W9H02VuwFR3llYwLTHwDDsIeVdBvW o0fECRoNa39L48qYl2cqZ5g= X-Google-Smtp-Source: ABdhPJyYvINpxyBLy+SG1ryCF0bcAlkAQlIphE5zpao88S66RKUpceyH9ZeaGvOesvSS8l5ovJ9sPA== X-Received: by 2002:a05:600c:268b:: with SMTP id 11mr12117657wmt.132.1612118697963; Sun, 31 Jan 2021 10:44:57 -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: Niek Linnenbank , Laurent Vivier , Antony Pavlov , Peter Maydell , Michael Tokarev , qemu-arm@nongnu.org, Joel Stanley , Alistair Francis , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 1/6] hw/arm/stm32f405_soc: Add missing dependency on OR_IRQ Date: Sun, 31 Jan 2021 19:44:44 +0100 Message-Id: <20210131184449.382425-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131184449.382425-1-f4bug@amsat.org> References: <20210131184449.382425-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 May 21 17:45:45 2024 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=1612118704; cv=none; d=zohomail.com; s=zohoarc; b=Xqssf5MR9fmmSC2/WWs5yRSCkNvwfQhKdS43tH5cBj+B9TFxqU9MYpNashC/ZxISvKGsa6l8e0HJwWLEt7TqwOCy37lCrBetXNU8zhGd/H18eAizE8G0PXbQFpTh8WujflRh212uGjcbTaDVTssSrcXVvYOroTtf67klxuphDWU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612118704; 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=liCNHgJtFhCCa9lxWELrsmLZfTAhnklvowu0G2N5YPKXTLbjmKf7mysMwbv/osDqiKDoV4+CUzbjuV51Nkk6TR49ieSlYFRfAXB1EewdxcSP7CBP3Jx6kJJyexP/aXc/qYFCYelm0+NVGcJD4FnTCv/InG9pEeXoYeK0AU5BFhA= 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 1612118704944124.36735984596191; Sun, 31 Jan 2021 10:45:04 -0800 (PST) Received: by mail-wm1-f46.google.com with SMTP id c127so11306921wmf.5 for ; Sun, 31 Jan 2021 10:45:04 -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 p12sm3807281wmq.1.2021.01.31.10.45.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 10:45:02 -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=VF6E2NXWtD3zEAXLxVC2hK7Xfw+t82rTxtn7y+LFa8QYc9gEzoBxDBPmHaYwec7x8o LrYX6BHL7XdNGODXIuOz5zEAc43+hPzBqi1DYvi+ByFyTxuAy01gwxyAp31Nu5ldicRj RKw+hdSgZaG5yPmS29wZB12XDVPxkbmtCOabb01srH22WqD0/jLx9SLPKtGrUBnJebBL XTjnIJlZTQtQlNDGI9DDWEvhvS7Bf3fdiQaKJ6XMb6OXqk2bwTTFAjcfT5iUqwQ/m3Ce qlyiBBx8MKKQX2VIQBNMDHSiy+i0QxGImWgz4fg12CDwDec430LcEU9xVyeJJym2PF9g aNBg== 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=nF2wS3plm324GxIOWF6Uz7W1az3WDwJwnSavKZMpKlDlhRf9IQDckjisDAoKMSYB97 d5ty4v58VbTma7aZyWCGCld42dDjAlDVKnZE1Nv1iHvBbHSVR4+bx2vp3paNtqPzeE1Q RdqEChnDPy4qsX/T7YubNfzNDfdg2qFXq7BPUUVkj8uMe6Ll7iHP9cKNaDvBMopRHkHF ijFaxgwt/x5oBHHURKhkAOOB0I46V+LJMpc0INmH0RqOBlDHkxyN8s2EQBgMzmCf7Vo/ Ol3Y8NqfaI1bC8rLx2R7gLJfPrE1FEeIBV5OH+RI0N/9RraVStFDOEENUARV0lhlecfl xKaA== X-Gm-Message-State: AOAM531Kl8ymrk8Z0MVp3CX+dT0J9n0z3qVSx2XfjCoDnGRmwUCm/C/b LYHAS4FIdsE2CH+LRUevppw= X-Google-Smtp-Source: ABdhPJxU15vx8xnGdlqkUvGg8ERV48eMOGbdkiBcOqh01PjQ4ZH0IIbRq2SQ/8gv7gXCXsbocm8sgA== X-Received: by 2002:a05:600c:3545:: with SMTP id i5mr6404850wmq.134.1612118703233; Sun, 31 Jan 2021 10:45:03 -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: Niek Linnenbank , Laurent Vivier , Antony Pavlov , Peter Maydell , Michael Tokarev , qemu-arm@nongnu.org, Joel Stanley , Alistair Francis , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mitsyanko Subject: [PATCH v3 2/6] hw/arm/exynos4210: Add missing dependency on OR_IRQ Date: Sun, 31 Jan 2021 19:44:45 +0100 Message-Id: <20210131184449.382425-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131184449.382425-1-f4bug@amsat.org> References: <20210131184449.382425-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 May 21 17:45:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612118709; cv=none; d=zohomail.com; s=zohoarc; b=Zm70gVlmwktD5wnz4YPWLSL+qwxGYh1hkysFKwfkMfWXv3Bs042eKK7QS00yZGlT2WQu5B5toQgcYj5X1qPILK8IsnkbDVjMd0uki1Q3mbQ+gZ0icXyIFOgHJiyl4bzsOz5F1cJCtzuP6TNUXBp7b6/zW0B3RFv0CyJ30Sc/I6I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612118709; 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=AtywtZTdDcgluEZF2mhJCMfrgYpXwckEGRRanWoib8ZVuTN1XEOPOe7Ccb2MRCWav0njuu6Xffg0EstuHRnFuLXvfQe3oFL61mlTmdAh/lVbifbzjLS49rAwqqDFW8npjdHl8YE21AM9MvTGg6xc5/N0MVQJ0AXARmtgn0/Ph+Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 16121187099901012.7914814367879; Sun, 31 Jan 2021 10:45:09 -0800 (PST) Received: by mail-wm1-f45.google.com with SMTP id i9so11345802wmq.1 for ; Sun, 31 Jan 2021 10:45:09 -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 r17sm9680432wro.46.2021.01.31.10.45.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 10:45:07 -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=KktWREIcOO5ckerD0vQCUtP4hMxuWXaLfxmQON2F4aRCM4glautuQG9RCoLYyI2M6h V5StizOVibqs6xX8hjhe6EaeR18syvb1pzBY4HniKeGb8haWPCQx0/qunzKBe2uvvrFD JS00J8PUevkFld4jV7mYwH/iRNTKVHzEOWWmeWoR7bmRoXuVHGWOHP5gw5hRaEjtLVIZ CoTvhGT9JNhDgl8qttOjgAcdmAEnNQuzjakEop2W6CZ/OLm7OUttK7PfRgOhmQOi7omc /RRwEEarVBBOqddOibrEpxgGZpQfQqrdinkeRt+RGl42Pn6cSUy/dn1LOp6anFDowVe1 3c3Q== 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=Khi8hfn7YwviWUAjVezVSqJdbvX5W2Yv9fe5WaPimdvoWfWTrAsRJCU2CQ4b3iYqXX En5MNGMtq51gR0vtsPpc8RHKzJ1O4mvhrNwwywgbRmHYrWmVbCEOIDeQuvOFJE3t9plO 7kgC9TG+DPt6Y7f3Y1kDneYBmNa1J/lxIiUSEXW1OxJyE95cYZGoAwue6GGKlgJzrEJ0 JCxSfimOAoFaDowM4S5edc2qLGe1+vs880fYeWYRI9FunVxImx5hzkPMnUw2M+Y1EDmY w5znaWbK7a86cEbrWu9h12vYTnTkOyXMAqXkizCoPa3Sl8lE3Rx+h8J7cxoBsW+37ZSc ioFA== X-Gm-Message-State: AOAM531PeMWoT9ZdjT/TKlGDHJmIdH30i559GC5WUNRXps/p77jdKjI4 UnZLaIxGAS56KlxpknXneXsaSLPqejc= X-Google-Smtp-Source: ABdhPJy2U3symi2Ebr1QVVCT1n7huoL+wZ6CzrXYlmU6uoecugntaCtgbRamJdWwc+4aZQcmR36yvw== X-Received: by 2002:a7b:c09a:: with SMTP id r26mr12176695wmh.64.1612118708340; Sun, 31 Jan 2021 10:45:08 -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: Niek Linnenbank , Laurent Vivier , Antony Pavlov , Peter Maydell , Michael Tokarev , qemu-arm@nongnu.org, Joel Stanley , Alistair Francis , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Edgar E. Iglesias" Subject: [PATCH v3 3/6] hw/arm/xlnx-versal: Versal SoC requires ZDMA Date: Sun, 31 Jan 2021 19:44:46 +0100 Message-Id: <20210131184449.382425-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131184449.382425-1-f4bug@amsat.org> References: <20210131184449.382425-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 May 21 17:45:45 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1612118714; cv=none; d=zohomail.com; s=zohoarc; b=NU3BiNQMrwOtCG3kvrDFPf+4Yz3HjQ4xYrReSCaFtMLZVSXBXKCWTjCvbF/UGC2QzDPOZJ4PSV5j/WnOsiVJZ2wkjQbBQ5cmzNQy18AJIPtXdxdJt7GCZxHnlT0p8y3uRYIgMZJpEIdeJyFLUP7CEmii8qQJk7OPqL8qlKvlGvs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612118714; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dNCf/fnSg4i/RlVqvC4tpeAa/bGn7I/5i5RyvqlkfeM=; b=LlKHf0/gNxk3eBGiFSTXlFKDV2NqUikffniI+rLMmGAVsVrLtdy7x/bzcdaUTLZfHTO45MJNopfnAWWnh+OgBInK2ff2fSK/PTo3CcLGD6LKaXfhC6QQx3m7Z4auCxdzuVQl8P0hViM9YuEOFcJfyudW0AIbETZ5W/BikOogdbs= 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 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 1612118714899146.77902615297262; Sun, 31 Jan 2021 10:45:14 -0800 (PST) Received: by mail-wm1-f43.google.com with SMTP id c127so11307118wmf.5 for ; Sun, 31 Jan 2021 10:45:14 -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 b18sm23653374wrm.57.2021.01.31.10.45.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 10:45:12 -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=dNCf/fnSg4i/RlVqvC4tpeAa/bGn7I/5i5RyvqlkfeM=; b=fm19mkj0jseLfnTszAPO7p6gj1tm7wIOqL2VuFSCAIXWsbmSABwfpdKaz1VQ7gGPCk bjlBOwASltuCQ971kuwmkacU5564b9IXM5DqZJdil7kFc2Vmuvfsi6L1rab8ZWhpYpCo c0GHQtk9OXdVI9sd9gZKb2MblWu6psSPGfZ9c+M9sRMOcLIe6KX+/751+j+KvKO61pEw knfG+Hl1uH4wWoBJDhq4bThOxBRssJ0VuQ7PIybgAoxKPg98r+wadKZg1GfQ6vAKKlRc 2Lc8BPAiH9MN9SZAGp7dJRTBgZP/Ja0680mOdGM/THHmeHu+TRqJPz7ayCpv/SzVrf/B hJwQ== 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=dNCf/fnSg4i/RlVqvC4tpeAa/bGn7I/5i5RyvqlkfeM=; b=bT7plpAJorrnhDMwElbpLD0UPSNbVMUnQmD2eLXfUQ7KS5EZckNfYKhbBGpaVFCgel 938yCtA+H5hRB8t9282RkAL9myVIw7MVR4JdEtcAvqPOfCt9b5sbPYMQ9NW/wlVKnIzm PvT1w1VzdfRHh5Nkvlopr4uBuU3QNZadOfTBLgj6DS+cmn64gMVJ8z5m4iKsFdYGZiyb 7cGYM+ma92B3+wcPgXFmZEIRkKLQWvWH4ol/ESz0twvSfV/uTyEhFOt0WlnJaatx40Yd 5u85L3JnqEpA+ymWdQZUVAUF0LT0DQlU76K7wtx2g1Nl7y5CPUpn+jZa8ex10V0urQSZ de0A== X-Gm-Message-State: AOAM533qDCxH+KEWJy2fsw88hsrfIxErQdnLJts3yCzpFLLsU3MierjR NsrXR7XODatMAYXPg6+RACM= X-Google-Smtp-Source: ABdhPJxvohrFT03xquIXL3mgZHbueGWaf183+KT7lJtfXbBT3NpbMWwjJQhNLgDJR/6Dh98B8OuJ+w== X-Received: by 2002:a1c:65d5:: with SMTP id z204mr6641246wmb.184.1612118713233; Sun, 31 Jan 2021 10:45:13 -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: Niek Linnenbank , Laurent Vivier , Antony Pavlov , Peter Maydell , Michael Tokarev , qemu-arm@nongnu.org, Joel Stanley , Alistair Francis , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Edgar E. Iglesias" Subject: [PATCH v3 4/6] hw/arm/xlnx-versal: Versal SoC requires ZynqMP peripherals Date: Sun, 31 Jan 2021 19:44:47 +0100 Message-Id: <20210131184449.382425-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131184449.382425-1-f4bug@amsat.org> References: <20210131184449.382425-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_ZYNQMP_RTC object in versal_create_rtc()(). Select CONFIG_XLNX_ZYNQMP to fix: $ make check-qtest-aarch64 ... Running test qtest-aarch64/qom-test qemu-system-aarch64: missing object type 'xlnx-zynmp.rtc' Broken pipe Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- Cc: Alistair Francis Cc: "Edgar E. Iglesias" --- hw/arm/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 09298881f2f..be017b997ab 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -364,6 +364,7 @@ config XLNX_VERSAL select VIRTIO_MMIO select UNIMP select XLNX_ZDMA + select XLNX_ZYNQMP =20 config NPCM7XX bool --=20 2.26.2 From nobody Tue May 21 17:45:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612118719; cv=none; d=zohomail.com; s=zohoarc; b=TU64GH7ZMKeAdQniCwIQ+p9YDdDUsj0qUSL54s3kyGmihYOCYmhPfoq5sbbrqbTAfu+n/OVuoIGi3+FT/R6QgV0AS8Ppzzcc47j8TvnavUF5lyec5B8oC+/ld9RoDu4uz9ADMDrkB6C70Em69HWMaNTX3GLhcYEFBkKv4yC8iQA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612118719; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wOeLzgMSRQZ8FekGiXtfrDvmIAILNb9yREGpHP0D6s0=; b=EOlhro49YRW9J2Han46P5TBM6GyCvqX/8FgK3iT7EooMfX21O1ti4rXTYCyngL118LbyUxoxkEa34TKZSKLLO4/DFJXUB5gor19E41kGI+YXDNNZYTNN7kjjoO+AO/wIL4ERa0YA1snJz+7ueY8nXLq2W7mpeSKTkM6dhxEBCy4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 161211871983639.29149980277816; Sun, 31 Jan 2021 10:45:19 -0800 (PST) Received: by mail-wr1-f44.google.com with SMTP id c12so14256584wrc.7 for ; Sun, 31 Jan 2021 10:45:19 -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 17sm18042395wmk.48.2021.01.31.10.45.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 10:45:17 -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=wOeLzgMSRQZ8FekGiXtfrDvmIAILNb9yREGpHP0D6s0=; b=KVrY0B8T6uPLzVgWQEfLIqHrX+zuPOpU57rhUUgJQpapXgcQLvl9AN0DHa4z1R9h3a eqQZjVURkG30FuFHHvhgvQyorW7RnbW79v3kuvRfDvFSGPXV1s7cKkY2kDchowABAhNS 9U8EQ/OGtBZkDSsdl2EtQZQJ5aQRNtm6x/cvbHsS4fstxOeX7ubm/BCBsZxDQGq3QZ2b R5zN73nly7kxyAhIVu3J6uWfWpLrhprqk0Olf4NkdrOLN1/9l+RuqYdRGgGy29Gc213f gJATe5ihE2mtBBON4qLi1ZgosnvBMzTEskNYMwJECA7ez435oGIIYyP+onc7uOBqOl2I lohQ== 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=wOeLzgMSRQZ8FekGiXtfrDvmIAILNb9yREGpHP0D6s0=; b=EQqWXAxrjqAq7unP/1kD3SbW8olyQ2XwvIslmGhj/fYZBMbEfn3qckevqfH4K2Ys0q doQwm/NkU88CNTpuH8gm26ZBITtF2AzOZrBemhJtzFEMGAcESlqIwxyL7o04xbOAPyi+ b8MSwayZHXQWRin5GqqVlXVYrPrkxrWCidUksSRkAR7pYTDqEHSOauh4CNbz3ZCoUV+H EYeiwGsvJqgRqZKfmTSijmSLQ510seheY6arFvda/8vsdOiQONRlvOzSVR4zyZPeELfQ 6fEA+aZ+M2TBEaHrBIduYH0D26MGh6oud+5vAwSCfWCzj90iiUtc8uwsH85QL3zy5U8B CSTw== X-Gm-Message-State: AOAM530ktJJhx1Tm0qq71YQYtmBpcfyrp68m9kZi7SfshGK/nRFJQ+2d jbLm36iWMnJaJdoVyGW+3s0= X-Google-Smtp-Source: ABdhPJzsQvoN33vwSUbNLlZsoDPRFKNXvQKn62BfLnbqU7A86wrBONVcMYBD9P61tFgYi4b0aZOG4w== X-Received: by 2002:adf:d850:: with SMTP id k16mr14517011wrl.191.1612118718139; Sun, 31 Jan 2021 10:45:18 -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: Niek Linnenbank , Laurent Vivier , Antony Pavlov , Peter Maydell , Michael Tokarev , qemu-arm@nongnu.org, Joel Stanley , Alistair Francis , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 5/6] hw/net/can: ZynqMP CAN device requires PTIMER Date: Sun, 31 Jan 2021 19:44:48 +0100 Message-Id: <20210131184449.382425-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131184449.382425-1-f4bug@amsat.org> References: <20210131184449.382425-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) Add a dependency XLNX_ZYNQMP -> PTIMER to fix: /usr/bin/ld: libcommon.fa.p/hw_net_can_xlnx-zynqmp-can.c.o: in function `xlnx_zynqmp_c= an_realize': hw/net/can/xlnx-zynqmp-can.c:1082: undefined reference to `ptimer_init' hw/net/can/xlnx-zynqmp-can.c:1085: undefined reference to `ptimer_transac= tion_begin' hw/net/can/xlnx-zynqmp-can.c:1087: undefined reference to `ptimer_set_fre= q' hw/net/can/xlnx-zynqmp-can.c:1088: undefined reference to `ptimer_set_lim= it' hw/net/can/xlnx-zynqmp-can.c:1089: undefined reference to `ptimer_run' hw/net/can/xlnx-zynqmp-can.c:1090: undefined reference to `ptimer_transac= tion_commit' libcommon.fa.p/hw_net_can_xlnx-zynqmp-can.c.o:(.data.rel+0x2c8): undefine= d reference to `vmstate_ptimer' Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/Kconfig b/hw/Kconfig index 5ad3c6b5a4b..d4cec9e476c 100644 --- a/hw/Kconfig +++ b/hw/Kconfig @@ -81,3 +81,4 @@ config XLNX_ZYNQMP bool select REGISTER select CAN_BUS + select PTIMER --=20 2.26.2 From nobody Tue May 21 17:45:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) client-ip=209.85.128.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612118725; cv=none; d=zohomail.com; s=zohoarc; b=ACxrrdtLT2m58uZL29ghED5aHslUqcoMLO2Q9pLxFFTWpFWli7rO1LUS+FgN9szdC+QYxjM7vLHoPypQcQuJ4YDq7FpsklZLMoSIRNfQb0D/UrbpBQ3U0mjEsnWjf3+p45qH1Bh33G53l6ICUnzOBzTHFH7cMXtbU/XYUXMB/lU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612118725; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZTEQksi03h84QrtUmTk444gEe+iL7OPLaC2gCq3Rbc4=; b=hH5CH37A5N+JGGeIvd2TWYI9NdvdRT143v7NCHFcIszcv4jcgDrxYG5tHWHeJ3DzM0pOYnG06qmqXekMwHrpZdXYaadsf9GLY0aF0Kb1T5Dlw2NaiZTAriNrxVS1b55zivh5au3P3oP4XHjkyM6Zw3ZkkhyVNzNhSAbNozW9HVQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.zohomail.com with SMTPS id 1612118724999571.2391346240557; Sun, 31 Jan 2021 10:45:24 -0800 (PST) Received: by mail-wm1-f53.google.com with SMTP id u14so10785069wml.4 for ; Sun, 31 Jan 2021 10:45:24 -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 m16sm14368847wmq.36.2021.01.31.10.45.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 10:45:22 -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=Xex9yBlF2YBcUJZkVQebz+LHHVE0PmtFKcD4mns2pqWsWtmf+WRdiGPDWVf4zj8u8V blPpNzVMbbh7TYy5sdVI9nfnPpa2QzMKq8r2rCm9qSD6AoscmPIkXiFreAOZnRk/2sie 1KjRrq+dfFFhFtcmwkrdhyxmk2svUeUrVPhD9eTEyBuPAqU0iQVQonwyeYH1E6P6v/wt kxij9zFc+z941w7GR6W2oYBYrhSYWQiOOW0/+1slbi+GyiVkD7nIWC8oAgbfhBuiHdh5 8r6+ebCXr7kFQr2A6NIDL9F0etJUN3P83WA+ghAu6Ie9IRygrBPan8fVHn16P9e61QUU ZuIw== 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=bSmopwd8BdzXDqr2aSX28RdRixeAPE6hntzzjZAeIWC70HI8glIhFOUQM7PX5Xb0p8 aBUBjwLWyeXujkAIb3WChmzun2qehecpxQ0ks1dINItDWBefYXLF7vkkW4nI1phxK8EV g34yMGPhIVGYDtPn+Jkvcy1PpYo/stn4SaBUuL98tD9EZQmamGOhquGZFyKd9rCgHQC4 +vtxU6agzGDueqEe2mbfX+phyagYkBVMjb2vlyl4SNzslUF8mv5SsGACNiOWC/4M+C43 qpEFQ2Kp6gWEZPQnzHDSdZZH4yIahcAgBO+Ot38/gYmk3X2jJoGLY8eB9F0bjo9myvSi Hgcg== X-Gm-Message-State: AOAM533466PuQixT9KocwCERniLKfGOJXDgZh/fdcRsBoZYFSrUOlqNL pYfyGJzQLprdkZNRdqzV/hE= X-Google-Smtp-Source: ABdhPJytmgX7NpBiYVAEOpecQTzLjVd7W9PQaVd3V+gt2o4Yoj3QRIztr6bT4LXUEIESEqZGnRXESQ== X-Received: by 2002:a1c:27c3:: with SMTP id n186mr12017398wmn.96.1612118723210; Sun, 31 Jan 2021 10:45:23 -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: Niek Linnenbank , Laurent Vivier , Antony Pavlov , Peter Maydell , Michael Tokarev , qemu-arm@nongnu.org, Joel Stanley , Alistair Francis , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 6/6] hw/arm: Display CPU type in machine description Date: Sun, 31 Jan 2021 19:44:49 +0100 Message-Id: <20210131184449.382425-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131184449.382425-1-f4bug@amsat.org> References: <20210131184449.382425-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 Reviewed-by: Niek Linnenbank --- 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