From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C0A7C433EF for ; Thu, 11 Nov 2021 17:10:57 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DE55E61212 for ; Thu, 11 Nov 2021 17:10:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DE55E61212 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CDEF783A5A; Thu, 11 Nov 2021 18:10:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 85B3683A44; Thu, 11 Nov 2021 18:10:51 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by phobos.denx.de (Postfix) with ESMTP id 850BE83A45 for ; Thu, 11 Nov 2021 18:10:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andre.przywara@arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 036F7101E; Thu, 11 Nov 2021 09:10:46 -0800 (PST) Received: from donnerap.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 64E103F718; Thu, 11 Nov 2021 09:10:45 -0800 (PST) Date: Thu, 11 Nov 2021 17:10:43 +0000 From: Andre Przywara To: Peter Hoyes Cc: u-boot@lists.denx.de, diego.sueiro@arm.com Subject: Re: [PATCH v2 3/5] vexpress64: Clean up BASE_FVP boot configuration Message-ID: <20211111171043.7b80e82d@donnerap.cambridge.arm.com> In-Reply-To: <20211111092603.774415-4-peter.hoyes@arm.com> References: <20211111092603.774415-1-peter.hoyes@arm.com> <20211111092603.774415-4-peter.hoyes@arm.com> Organization: ARM X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; aarch64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean On Thu, 11 Nov 2021 09:26:01 +0000 Peter Hoyes wrote: > From: Peter Hoyes > > Move env var address values to #defines so they can be reused elsewhere. > > Rename env var names to those recommended in the README and modify > addresses to allow more space for the kernel. > > Fix issue where fdt is called with invalid arguments when booting > without a ramdisk. > > Signed-off-by: Peter Hoyes Ah, more air to breathe now, thanks! Reviewed-by: Andre Przywara Cheers, Andre > --- > include/configs/vexpress_aemv8.h | 50 ++++++++++++++++++++------------ > 1 file changed, 31 insertions(+), 19 deletions(-) > > diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h > index 49517a60b0..7cdfc30649 100644 > --- a/include/configs/vexpress_aemv8.h > +++ b/include/configs/vexpress_aemv8.h > @@ -7,6 +7,8 @@ > #ifndef __VEXPRESS_AEMV8_H > #define __VEXPRESS_AEMV8_H > > +#include > + > #define CONFIG_REMAKE_ELF > > /* Link Definitions */ > @@ -172,33 +174,43 @@ > BOOTENV > > #elif CONFIG_TARGET_VEXPRESS64_BASE_FVP > + > +#define VEXPRESS_KERNEL_ADDR 0x80080000 > +#define VEXPRESS_FDT_ADDR 0x8fc00000 > +#define VEXPRESS_BOOT_ADDR 0x8fd00000 > +#define VEXPRESS_RAMDISK_ADDR 0x8fe00000 > + > #define CONFIG_EXTRA_ENV_SETTINGS \ > "kernel_name=Image\0" \ > - "kernel_addr=0x80080000\0" \ > - "initrd_name=ramdisk.img\0" \ > - "initrd_addr=0x88000000\0" \ > - "fdtfile=devtree.dtb\0" \ > - "fdt_addr=0x83000000\0" \ > - "boot_name=boot.img\0" \ > - "boot_addr=0x8007f800\0" > + "kernel_addr_r=" __stringify(VEXPRESS_KERNEL_ADDR) "\0" \ > + "ramdisk_name=ramdisk.img\0" \ > + "ramdisk_addr_r=" __stringify(VEXPRESS_RAMDISK_ADDR) "\0" \ > + "fdtfile=devtree.dtb\0" \ > + "fdt_addr_r=" __stringify(VEXPRESS_FDT_ADDR) "\0" \ > + "boot_name=boot.img\0" \ > + "boot_addr_r=" __stringify(VEXPRESS_BOOT_ADDR) "\0" > > #ifndef CONFIG_BOOTCOMMAND > -#define CONFIG_BOOTCOMMAND "if smhload ${boot_name} ${boot_addr}; then " \ > +#define CONFIG_BOOTCOMMAND "if smhload ${boot_name} ${boot_addr_r}; then " \ > " set bootargs; " \ > - " abootimg addr ${boot_addr}; " \ > - " abootimg get dtb --index=0 fdt_addr; " \ > - " bootm ${boot_addr} ${boot_addr} " \ > - " ${fdt_addr}; " \ > + " abootimg addr ${boot_addr_r}; " \ > + " abootimg get dtb --index=0 fdt_addr_r; " \ > + " bootm ${boot_addr_r} ${boot_addr_r} " \ > + " ${fdt_addr_r}; " \ > "else; " \ > " set fdt_high 0xffffffffffffffff; " \ > " set initrd_high 0xffffffffffffffff; " \ > - " smhload ${kernel_name} ${kernel_addr}; " \ > - " smhload ${fdtfile} ${fdt_addr}; " \ > - " smhload ${initrd_name} ${initrd_addr} "\ > - " initrd_end; " \ > - " fdt addr ${fdt_addr}; fdt resize; " \ > - " fdt chosen ${initrd_addr} ${initrd_end}; " \ > - " booti $kernel_addr - $fdt_addr; " \ > + " smhload ${kernel_name} ${kernel_addr_r}; " \ > + " smhload ${fdtfile} ${fdt_addr_r}; " \ > + " smhload ${ramdisk_name} ${ramdisk_addr_r} "\ > + " ramdisk_end; " \ > + " fdt addr ${fdt_addr_r}; fdt resize; " \ > + " if test -n ${ramdisk_end}; then "\ > + " fdt chosen ${ramdisk_addr_r} ${ramdisk_end}; " \ > + " else; " \ > + " fdt chosen; " \ > + " fi; " \ > + " booti $kernel_addr_r - $fdt_addr_r; " \ > "fi" > #endif >