u-boot.lists.denx.de archive mirror
 help / color / mirror / Atom feed
From: Andre Przywara <andre.przywara@arm.com>
To: Liviu Dudau <liviu.dudau@foss.arm.com>,
	Linus Walleij <linus.walleij@linaro.org>
Cc: Peter Hoyes <peter.hoyes@arm.com>, Tom Rini <trini@konsulko.com>,
	Simon Glass <sjg@chromium.org>,
	u-boot@lists.denx.de, Sean Anderson <sean.anderson@seco.com>
Subject: [PATCH 01/11] vexpress64: fvp: Fix automatic boot
Date: Fri,  4 Mar 2022 16:30:08 +0000	[thread overview]
Message-ID: <20220304163018.3167841-2-andre.przywara@arm.com> (raw)
In-Reply-To: <20220304163018.3167841-1-andre.przywara@arm.com>

Commit 90f262a6951f ("vexpress64: Clean up BASE_FVP boot configuration")
cleaned up the usage of default address variables, but missed to update
the address for the kernel in the FVP's bootcmd definition.

Change ${kernel_addr} to read ${kernel_addr_r} to bring back the
automated boot for the fastmodel.
Also use "setenv" instead of the potentially ambiguous "set" on the way.

Fixes: 90f262a6951f ("vexpress64: Clean up BASE_FVP boot configuration")
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
 configs/vexpress_aemv8a_semi_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig
index 82a5b52f1e..448d012e1c 100644
--- a/configs/vexpress_aemv8a_semi_defconfig
+++ b/configs/vexpress_aemv8a_semi_defconfig
@@ -17,7 +17,7 @@ CONFIG_ANDROID_BOOT_IMAGE=y
 CONFIG_BOOTDELAY=1
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 loglevel=9"
-CONFIG_BOOTCOMMAND="if smhload ${boot_name} ${boot_addr_r}; then   set bootargs;   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_r};   smhload ${ramdisk_name} ${ramdisk_addr_r}   ramdisk_end;   fdt addr ${fdt_addr_r}; fdt resize;   fdt chosen ${ramdisk_addr_r} ${ramdisk_end};   booti $kernel_addr - $fdt_addr_r; fi"
+CONFIG_BOOTCOMMAND="if smhload ${boot_name} ${boot_addr_r}; then   setenv bootargs;   abootimg addr ${boot_addr_r};   abootimg get dtb --index=0 fdt_addr_r;   bootm ${boot_addr_r} ${boot_addr_r}   ${fdt_addr_r}; else;   setenv fdt_high 0xffffffffffffffff;   setenv initrd_high 0xffffffffffffffff;   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;   fdt chosen ${ramdisk_addr_r} ${ramdisk_end};   booti $kernel_addr_r - $fdt_addr_r; fi"
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_SYS_PROMPT="VExpress64# "
-- 
2.25.1


  reply	other threads:[~2022-03-04 16:30 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-04 16:30 [PATCH 00/11] vexpress64: OF_CONTROL and ARMv8-R64 support Andre Przywara
2022-03-04 16:30 ` Andre Przywara [this message]
2022-03-14 18:14   ` [PATCH 01/11] vexpress64: fvp: Fix automatic boot Tom Rini
2022-03-04 16:30 ` [PATCH 02/11] vexpress64: Kconfig: move board definitions out of arch/arm Andre Przywara
2022-04-03  0:13   ` Tom Rini
2022-03-04 16:30 ` [PATCH 03/11] arm: dts: Add Arm FVP Fastmodel RevC .dts files from Linux Andre Przywara
2022-04-03  0:13   ` Tom Rini
2022-03-04 16:30 ` [PATCH 04/11] vexpress64: fvp: enable OF_CONTROL Andre Przywara
2022-04-03  0:14   ` Tom Rini
2022-03-04 16:30 ` [PATCH 05/11] vexpress64: config header: unify environment definition Andre Przywara
2022-04-03  0:14   ` Tom Rini
2022-03-04 16:30 ` [PATCH 06/11] vexpress64: move hardware setting from defconfig to Kconfig Andre Przywara
2022-04-03  0:14   ` Tom Rini
2022-03-04 16:30 ` [PATCH 07/11] vexpress64: fvp: add distro_boot support Andre Przywara
2022-03-04 16:30 ` [PATCH 08/11] vexpress64: defconfigs: allow default commands Andre Przywara
2022-04-03  0:14   ` Tom Rini
2022-03-04 16:30 ` [PATCH 09/11] vexpress64: generalise page table generation Andre Przywara
2022-04-03  0:14   ` Tom Rini
2022-03-04 16:30 ` [PATCH 10/11] vexpress64: pick DRAM size from DT Andre Przywara
2022-04-03  0:14   ` Tom Rini
2022-03-04 16:30 ` [PATCH 11/11] vexpress64: Add ARMv8R-64 board variant Andre Przywara
2022-03-11 18:29   ` Liviu Dudau
2022-04-03  0:14   ` Tom Rini
2022-03-08  0:28 ` [PATCH 00/11] vexpress64: OF_CONTROL and ARMv8-R64 support Linus Walleij

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220304163018.3167841-2-andre.przywara@arm.com \
    --to=andre.przywara@arm.com \
    --cc=linus.walleij@linaro.org \
    --cc=liviu.dudau@foss.arm.com \
    --cc=peter.hoyes@arm.com \
    --cc=sean.anderson@seco.com \
    --cc=sjg@chromium.org \
    --cc=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).