Message ID | 20200213144145.818-34-peter.maydell@linaro.org |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=bkCuQ/Yc; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48JKZG5G0Cz9sNg for <incoming@patchwork.ozlabs.org>; Fri, 14 Feb 2020 02:05:26 +1100 (AEDT) Received: from localhost ([::1]:54214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1j2G3Q-0008LO-EV for incoming@patchwork.ozlabs.org; Thu, 13 Feb 2020 10:05:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60477) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>) id 1j2FhN-0004kd-CD for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:42:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1j2FhC-0002I9-UV for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:42:33 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:34121) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1j2FhC-0002Gc-O5 for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:42:26 -0500 Received: by mail-wm1-x341.google.com with SMTP id s144so7258313wme.1 for <qemu-devel@nongnu.org>; Thu, 13 Feb 2020 06:42:26 -0800 (PST) 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=5os6T9iOh7dBv5fGrw979h37TvZ3kqm7dXAx5e9KJF4=; b=bkCuQ/YcOtpLi53t48Ps16ySnvhDQ2b10r53alETUR5CILzHtuSVjyuDYdZQ2UO/+B QZ884Qh1negW4LXWG1OGCjf13cXQhigfP0hsR4WJdNXmspKb0VcYMTqQEY87e14nqV6I jtRGKrd/abFkKqCvKxSoKuBTrwJuBnc2BYIC8l1cMhCbEr109HtTas/YAFDI5pZy7Xfs ymhfUySemIL1aqLn3xqY3IRaFHedPa4zN4o9/lyeOrxT1Il+lhn5mPze/MB20u7/LEL9 lxjnOQ1EGJG+hEF+DlcRGHnpmMnvysx2eqprKZpEEJR/ej04e987bAb/t/0mEmih+0SE hkaw== 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=5os6T9iOh7dBv5fGrw979h37TvZ3kqm7dXAx5e9KJF4=; b=h/urqrC42NCva8mgHSGGfx3n0CjN1KgjqWVilqG/nMD3YQ6buY3W+DQfYfbNdX74VV wfx+9B8hDx/DDpRdoO87+ICkkOiHSXLRdL8hSj+M4gELnPUpDWEWl9j8NIXhdzDlHceB aOzSNrvdsN4/ZO3Jgw3q4T8rM+96BSb4EY0u0wO9CUpmmhK+7Hv2I05p56Ah0bWzRKtA A/8CCjlsmsTtq7MZXQC7WiDTKEzxbmhEphgL8tNZPzLMPhIIT/MmnATB2+PC/e/IaSrT wz+udvyND+9wI3okxAHWKeB4URVVyCwsqdJ0rWhkLQcr+N+Gqj5VM3iCGhKn9zuKixRS 9yYA== X-Gm-Message-State: APjAAAW5SQvOEMmAL/DoUq/0p7rbFZIBAQnFOC9+WY01Ns2EqievzXGF wLxjKhgGnutK2Eg14mvRCdF0WK5/BI4= X-Google-Smtp-Source: APXvYqzoABP5IiZ1UswY7prYBtEXtFsD08NXC3cv26QJwmqHE3f1531Mk2iH4RaIkcL5+v0pPM526w== X-Received: by 2002:a1c:9854:: with SMTP id a81mr6008245wme.1.1581604945388; Thu, 13 Feb 2020 06:42:25 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id e22sm3362454wme.45.2020.02.13.06.42.24 for <qemu-devel@nongnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 06:42:24 -0800 (PST) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Subject: [PULL 33/46] hw/arm/raspi: Use BCM2708 machine type with pre Device Tree kernels Date: Thu, 13 Feb 2020 14:41:32 +0000 Message-Id: <20200213144145.818-34-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200213144145.818-1-peter.maydell@linaro.org> References: <20200213144145.818-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/46] i.MX: Fix inverted register bits in wdt code.
|
expand
|
diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 3996f6c63a4..f2ccabc6628 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -29,8 +29,8 @@ #define FIRMWARE_ADDR_3 0x80000 /* Pi 3 loads kernel.img here by default */ #define SPINTABLE_ADDR 0xd8 /* Pi 3 bootloader spintable */ -/* Table of Linux board IDs for different Pi versions */ -static const int raspi_boardid[] = {[1] = 0xc42, [2] = 0xc43, [3] = 0xc44}; +/* Registered machine type (matches RPi Foundation bootloader and U-Boot) */ +#define MACH_TYPE_BCM2708 3138 typedef struct RasPiState { BCM283XState soc; @@ -116,7 +116,7 @@ static void setup_boot(MachineState *machine, int version, size_t ram_size) static struct arm_boot_info binfo; int r; - binfo.board_id = raspi_boardid[version]; + binfo.board_id = MACH_TYPE_BCM2708; binfo.ram_size = ram_size; binfo.nb_cpus = machine->smp.cpus;