From nobody Tue Feb 10 15:45:09 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) client-ip=209.85.221.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1600946300; cv=none; d=zohomail.com; s=zohoarc; b=levtmTwBEBJniFPnmt1cyQZn+kBOHeu+vzm6whrjwRTQ719xZYMDuK5+OskxJAhdpQv50zef4u4NCzIp3kw1vnsEAV517PTsqvQTMJkg+NEUpd/VlO84vmt5Kd+Omkb1SO9WzXQ86DRKaXrmffQ32ZadaDdx77Q86/xWB5vEE54= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600946300; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jy59s2K9kYiBxlA0hJextDJqNNjzNOlqp0zEmQTHIzI=; b=SSXCUQKu0vnZ/QbVa1UnC5xodnrssX3Dv23C5QVDcriNn1L5Zqt9Ppsoy7J5dQCVHFnORsC4jXSiwt9ChqxJWMufWMUrNmL1lt3hcQFN3hHS2vLFjA0f96M7qow/Mul8ubttdNzNdpPJRrTmkfzcYpWZe9IN2AO+N92Mwe/VhC8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mx.zohomail.com with SMTPS id 1600946300830772.2578103902423; Thu, 24 Sep 2020 04:18:20 -0700 (PDT) Received: by mail-wr1-f65.google.com with SMTP id o5so3310191wrn.13 for ; Thu, 24 Sep 2020 04:18:20 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.234]) by smtp.gmail.com with ESMTPSA id h76sm3400363wme.10.2020.09.24.04.18.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2020 04:18:18 -0700 (PDT) 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=jy59s2K9kYiBxlA0hJextDJqNNjzNOlqp0zEmQTHIzI=; b=Qsk1Esf95NymoPBfYMmfEKzU7xIIx35y4/E2mkp26+k6533cKzCFMjp4dY1kAX5597 lf/tcKryKPtVezN1cK8QMWRWvgBUAHWpxXycifdCCXbq3UAllL7AjtFIs4dpZPevx7Sh +Oe1/trLIN6A9I3XZxW0zxnPgoKq0D3uM3yrUbF/XE4O1Z24ychNiKDpEC3qVglFS+f7 ypAxavSq+CvcF/u3wAPXk1gepKehS1qaz35IPCrG8ICLXwHnVG8OiaTGqIYeY1pGnuDb 4k2SJNHAfUXg9YPhr5mCGPMlF//VzujLmOZ1eixa1fhP61XJpeMhF0V/GG5xFwrk1Y/1 6zVQ== 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=jy59s2K9kYiBxlA0hJextDJqNNjzNOlqp0zEmQTHIzI=; b=azZv74wdou7QEv6kCVxaXY9En8plahkNb4LrLTEe86p/ULRGyk1emJntYPzxwnBd+v JuUhkdEdQo3LHTn5HQU2WtGhZG72Kx5x9dQ8ypInPy5hojegtO4bEPdmYiiDaQJaKH7L 4q4m+XZU4B9yCMz/Y1KHstTQpRxGdeLcB4Gj4N2VlIhDjKTsDv+/YbKAfwQLuNNt4nNU K/cTMOvJUmfIbQ+4lvPBtsOOHfcbOXL1M5RKzI3OnXFbe13xVWtiP5jC6VX9DBYDSadn dCbpn+P00CjUVilHL8UyhIDNlpQ12yBKllH+B/LdIKgeRT453Hcq9hp9EtwD34IHAEKU WF0Q== X-Gm-Message-State: AOAM530Y+1rTVl5CzrRtLTI6lkbysY/PHHIe8ZpLHiA+T3zgAFgJSQ8N xrsImN/dKTvXPisOFPIPQwU= X-Google-Smtp-Source: ABdhPJwNk8TjMTRLAuASLyAKy3j7Ia3GzHXDkSajFMpTlFM7txSicGhOwAhumtkpuhGvtDbZF1zn+A== X-Received: by 2002:a05:6000:1c8:: with SMTP id t8mr4472553wrx.3.1600946299022; Thu, 24 Sep 2020 04:18:19 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Andrew Baumann , Peter Maydell , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Luc Michel Subject: [PATCH v4 7/8] hw/arm/raspi: Use RaspiProcessorId to set the firmware load address Date: Thu, 24 Sep 2020 13:18:07 +0200 Message-Id: <20200924111808.77168-8-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200924111808.77168-1-f4bug@amsat.org> References: <20200924111808.77168-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The firmware load address depends on the SoC ("processor id") used, not on the version of the board. Suggested-by: Luc Michel Reviewed-by: Luc Michel Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/raspi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 0d8e5a34c78..ae98a2fbfca 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -238,7 +238,8 @@ static void setup_boot(MachineState *machine, int versi= on, size_t ram_size) * the normal Linux boot process */ if (machine->firmware) { - hwaddr firmware_addr =3D version =3D=3D 3 ? FIRMWARE_ADDR_3 : FIRM= WARE_ADDR_2; + hwaddr firmware_addr =3D processor_id <=3D PROCESSOR_ID_BCM2836 + ? FIRMWARE_ADDR_2 : FIRMWARE_ADDR_3; /* load the firmware image (typically kernel.img) */ r =3D load_image_targphys(machine->firmware, firmware_addr, ram_size - firmware_addr); --=20 2.26.2