From nobody Sat Oct 25 13:17:42 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521087847094105.78799820266056; Wed, 14 Mar 2018 21:24:07 -0700 (PDT) Received: from localhost ([::1]:49657 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewKQt-0002nC-1T for importer@patchew.org; Thu, 15 Mar 2018 00:24:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewKMJ-00074Y-NM for qemu-devel@nongnu.org; Thu, 15 Mar 2018 00:19:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ewKMI-00043w-Aw for qemu-devel@nongnu.org; Thu, 15 Mar 2018 00:19:19 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:34255) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ewKMH-00042A-VN; Thu, 15 Mar 2018 00:19:18 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 401wMc6jRMz9sVb; Thu, 15 Mar 2018 15:19:08 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1521087548; bh=hIqwWhkqh0Atd66P6JgaBQ2ksoM6Ld+bJEAAK78HBjw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=irKUskRWxSr6hR/0e7WKajIyI/5n/18V3UmeunAw+UO2rnW3yXqQ3n/26OeKH+HtR NE2VdEsQzpH0E50KDKtmbkq0CMkg0+CWSENQ2q+VjZAlFqU3q9nPPphmtdr7/Ojw9D oaU/TlEnzm2XF8qWk38gPp2vVits47QO1GTUgOh0= From: David Gibson To: peter.maydell@linaro.org Date: Thu, 15 Mar 2018 15:18:59 +1100 Message-Id: <20180315041903.10046-6-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180315041903.10046-1-david@gibson.dropbear.id.au> References: <20180315041903.10046-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 5/9] PPC e500: Fix gap between u-boot and kernel 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: , Cc: lvivier@redhat.com, surajjs@au1.ibm.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, David Engraf , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: David Engraf This patch moves the gap between u-boot and kernel at the correct location. Signed-off-by: David Engraf Signed-off-by: David Gibson --- hw/ppc/e500.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 43c15d18c4..bdef2bddc6 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -1009,6 +1009,10 @@ void ppce500_init(MachineState *machine, PPCE500Para= ms *params) } =20 cur_base =3D loadaddr + payload_size; + if (cur_base < (32 * 1024 * 1024)) { + /* u-boot occupies memory up to 32MB, so load blobs above */ + cur_base =3D (32 * 1024 * 1024); + } =20 /* Load bare kernel only if no bios/u-boot has been provided */ if (machine->kernel_filename && !kernel_as_payload) { @@ -1025,11 +1029,6 @@ void ppce500_init(MachineState *machine, PPCE500Para= ms *params) cur_base +=3D kernel_size; } =20 - if (cur_base < (32 * 1024 * 1024)) { - /* u-boot occupies memory up to 32MB, so load blobs above */ - cur_base =3D (32 * 1024 * 1024); - } - /* Load initrd. */ if (machine->initrd_filename) { initrd_base =3D (cur_base + INITRD_LOAD_PAD) & ~INITRD_PAD_MASK; --=20 2.14.3