From patchwork Fri Mar 23 18:49:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 132357 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp950656ljb; Fri, 23 Mar 2018 11:53:11 -0700 (PDT) X-Google-Smtp-Source: AG47ELuv7/UzLg3u0aBVlaDR5AwIcWDNXwyD0s38ffpY1GJKL4tXkyJxNlegPcWjAU53Nk4jwxcF X-Received: by 10.237.57.65 with SMTP id l59mr38989406qte.198.1521831191706; Fri, 23 Mar 2018 11:53:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521831191; cv=none; d=google.com; s=arc-20160816; b=0bAtOE9OTSZTyah8SlvHNfK+iRUK0MI1kXvyWvHY06xWeNqENrDBUhraGP1EMJe9bt +P+wYwTHNt2/otmbquZK7ePo2RPo7WvnMdGkG3LAZxbrQKkp8n/xP0UnzpKNYQPvF+co FcoreBe/5X4/E00otr9RLeNm+qNhlDrneuirrkMKq4KR9txWiRDvJTZwewA3C0sy1lMa IRP/2yt738AP1Jimbf6c4M5QiA10A5poO1440WalSBCvQwJNF2aRk+tUkJxP9gjUgwco Gt1cKL2Q1+yxZj3cCHYdW68GtBq92NL+KbcIcUOOYkSgcwT6J51YvWSyQ66l++Z23wcl 9Fog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=LYP5i45AURrlZqga6I94SW+p/jbXEBSEVlFZJZQh77Q=; b=ztxrpKLBr35DymM1B/YpTCJqeOtPOlqvXdlBwv82y9W37Tgg5+0eMomsY8VXuWfYCf flsjg0FI2GIOuQSswZG9KFqvrGvDXnyJA5FIGylWdgmRVXJ4VMEN73S1KY7vX4fyuVT4 D4lSrv7JZzexaqNaqGj5On58148qBZLotLu3AfMBrsPTYyqXoidepkpVpgy+pWgdC+f5 DOuawSLGSm2kzTp+nqilMW+SWCBnOwc3wj+1F2SSHNU8r2FrIme9rPnllNsWndoTO6lD kK1cIpkaH0JrlGzRGIwlE97o0CF06UVLE71eDd7rVnTscTOpiFnzEeVs5zAicM/jJFeM ZHcg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 141si2238358qkk.455.2018.03.23.11.53.11 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 23 Mar 2018 11:53:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39373 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezRoN-0002S0-5t for patch@linaro.org; Fri, 23 Mar 2018 14:53:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49126) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezRlM-00017b-Dq for qemu-devel@nongnu.org; Fri, 23 Mar 2018 14:50:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ezRlL-0004EF-Ej for qemu-devel@nongnu.org; Fri, 23 Mar 2018 14:50:04 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:40506) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ezRlL-0004CA-6u for qemu-devel@nongnu.org; Fri, 23 Mar 2018 14:50:03 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1ezRlK-0007et-6q for qemu-devel@nongnu.org; Fri, 23 Mar 2018 18:50:02 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 23 Mar 2018 18:49:52 +0000 Message-Id: <20180323184958.14252-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180323184958.14252-1-peter.maydell@linaro.org> References: <20180323184958.14252-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 04/10] hw/arm/bcm2836: Use the Cortex-A7 instead of Cortex-A15 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The BCM2836 uses a Cortex-A7, not a Cortex-A15. Update the device to use the correct CPU. https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2836/QA7_rev3.4.pdf When the BCM2836 was introduced (bad5623690b) the Cortex-A7 was not available, so the very similar Cortex-A15 was used. Since dcf578ed8ce we can model the correct core. Signed-off-by: Peter Maydell Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé Message-id: 20180319110215.16755-1-peter.maydell@linaro.org --- hw/arm/bcm2836.c | 2 +- hw/arm/raspi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.16.2 diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index 3e7e8ca791..3c4b44a53e 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -32,7 +32,7 @@ struct BCM283XInfo { static const BCM283XInfo bcm283x_socs[] = { { .name = TYPE_BCM2836, - .cpu_type = ARM_CPU_TYPE_NAME("cortex-a15"), + .cpu_type = ARM_CPU_TYPE_NAME("cortex-a7"), .clusterid = 0xf, }, #ifdef TARGET_AARCH64 diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 06f1e08ca9..955a7c4e80 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -226,7 +226,7 @@ static void raspi2_machine_init(MachineClass *mc) mc->no_parallel = 1; mc->no_floppy = 1; mc->no_cdrom = 1; - mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a15"); + mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a7"); mc->max_cpus = BCM283X_NCPUS; mc->min_cpus = BCM283X_NCPUS; mc->default_cpus = BCM283X_NCPUS;