From nobody Fri Dec 19 17:23:48 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1601566661; cv=none; d=zohomail.com; s=zohoarc; b=QrUsDQeON4WgnZr+Pf32k6VGkrm6zD27tU7JsZIIEAvFpSrXk6NL8bV8i2jZCbB7CEHJNfz9YBDFnBuJXggUiOMgYw0S15DK3EzgaE7UJv3x1fhzP18InaFH5RvH8V1S/tQa0DYRXOS0kyfOH/R2zAXDOhbhsI2OH1PFmYzmbL4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601566661; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dzYxyPNSak4m4BxdikZP28jEW5s35X251fWvyhySyCU=; b=igKoVWJGAxMVbekzdc9VXBegIll3p3MSJ/MLblzzXsooEX8kdlJQ8t8IfYL8x+43NNHHfEXDIfjg8acx4go6guElzWwBvsAEIAdl3uaEnCuAFFGkAvKN7Pr0mIPypSIcISdVs6B+LL6g9dR0+HvdLuLU8LvqKgF9L7kcMYIkbro= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1601566661267603.9080877149655; Thu, 1 Oct 2020 08:37:41 -0700 (PDT) Received: from localhost ([::1]:54236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kO00U-0007SH-J1 for importer@patchew.org; Thu, 01 Oct 2020 10:56:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNzsb-00057G-Ms for qemu-devel@nongnu.org; Thu, 01 Oct 2020 10:48:21 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:45785) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNzsZ-0002yx-Pt for qemu-devel@nongnu.org; Thu, 01 Oct 2020 10:48:21 -0400 Received: by mail-wr1-x42b.google.com with SMTP id x14so6105681wrl.12 for ; Thu, 01 Oct 2020 07:48:19 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 70sm342052wme.15.2020.10.01.07.48.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2020 07:48:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=dzYxyPNSak4m4BxdikZP28jEW5s35X251fWvyhySyCU=; b=uxdb85razJFm9v0stQ1btcmy80mZRsjx/8222hiFejATPkoAmRYyDHjhxQyOzQI46a gxlcKMBNgTIQY7QOYYFH/VG7WjzygTsTr0hGYNo0EkvZB/GXbQFYo1t5CDE6tenf1lYI xqQD7ubWMlg5VbVwy3S/movb6nBQBLPSKAfiHF+GEd+fizGHptIWAOiBTaAu7U4JHcA1 reK9VuR8vaaU4Wp32VNim+C+8mmpqn9QUgMnnEsViDsQr2MOgXwsbp+nPWckNX7po738 mb15X2St07YVB2lke7AV6+nbojC6yPUxijzinK+1NIUp76tdqhtwDsKXW1s/WR9hegUv VXlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dzYxyPNSak4m4BxdikZP28jEW5s35X251fWvyhySyCU=; b=CCytavYqglOQOU4jsf2/uUV/ZKg6O5Eh8Rs4jnnxmIWDNT+Zn0pZ9PCGqoxyHTT1oN PxStelSv1yLirdSfO3oMgJb4lD2yjeKfp4dzcwWP2n9jPDFNLKOD4x5uvDk/CoVMxPJ4 Pbj4yw+re777a0vUwjN7nDR08V6Oddd/ws+jN+VxQZlD+6t8Of6cUSkjQwc6xz+Gzllj sg9V3gcm/ZXoN53rNTjivaqrKOloDSuSv2bt1zfLqAGCOaU4JwUgm0ccWxChu0/DJHKt bOUUI7GPYiu5hwXTNzCVkZflQYStj6ny+8+UqpSnqfyht1jd/vJyE2s/KFfQFsrprLW8 h3Ug== X-Gm-Message-State: AOAM530cUTSUY5GKcnJg+01nwctlqvg9VXCSQZjGU3FRb0BPz1SzHQhG dnTWn7nJOFOftDOm9v54Ru2hwxT4+rpEXdzU X-Google-Smtp-Source: ABdhPJzMuqNUaVSKWXCG5hPs+wPqQnjWujHKL6JGIgOOHXjGRm20hfyUQyeWT1OzfRnAk0tLeGN5aw== X-Received: by 2002:adf:f34a:: with SMTP id e10mr9364940wrp.91.1601563698148; Thu, 01 Oct 2020 07:48:18 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 11/18] hw/arm/raspi: Display the board revision in the machine description Date: Thu, 1 Oct 2020 15:47:52 +0100 Message-Id: <20201001144759.5964-12-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201001144759.5964-1-peter.maydell@linaro.org> References: <20201001144759.5964-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42b.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Philippe Mathieu-Daud=C3=A9 Display the board revision in the machine description. Before: $ qemu-system-aarch64 -M help | fgrep raspi raspi2 Raspberry Pi 2B raspi3 Raspberry Pi 3B After: raspi2 Raspberry Pi 2B (revision 1.1) raspi3 Raspberry Pi 3B (revision 1.2) Reviewed-by: Luc Michel Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20200924111808.77168-2-f4bug@amsat.org Signed-off-by: Peter Maydell --- hw/arm/raspi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 811eaf52ff5..46d9ed7f054 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -312,7 +312,9 @@ static void raspi_machine_class_init(ObjectClass *oc, v= oid *data) uint32_t board_rev =3D (uint32_t)(uintptr_t)data; =20 rmc->board_rev =3D board_rev; - mc->desc =3D g_strdup_printf("Raspberry Pi %s", board_type(board_rev)); + mc->desc =3D g_strdup_printf("Raspberry Pi %s (revision 1.%u)", + board_type(board_rev), + FIELD_EX32(board_rev, REV_CODE, REVISION)); mc->init =3D raspi_machine_init; mc->block_default_type =3D IF_SD; mc->no_parallel =3D 1; --=20 2.20.1