From mboxrd@z Thu Jan 1 00:00:00 1970
From: Przemyslaw Marczak
Date: Fri, 09 Oct 2015 12:24:57 +0200
Subject: [U-Boot] [PATCH V2 2/2] odroid: Add boot script (boot.scr)
support
In-Reply-To: <1444036039-9104-3-git-send-email-guillaume.gardet@free.fr>
References: <1443433322-13153-1-git-send-email-guillaume.gardet@free.fr>
<1444036039-9104-1-git-send-email-guillaume.gardet@free.fr>
<1444036039-9104-3-git-send-email-guillaume.gardet@free.fr>
Message-ID: <561795F9.4030201@samsung.com>
List-Id:
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de
Hello Guillaume,
On 10/05/2015 11:07 AM, Guillaume GARDET wrote:
> Add boot script (boot.scr) support. If no boot script are
> found, it boots as usual.
>
> Signed-off-by: Guillaume GARDET
> Cc: Przemyslaw Marczak
> Cc: Minkyu Kang
>
> ---
> include/configs/odroid.h | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/include/configs/odroid.h b/include/configs/odroid.h
> index e45b00e..f79847b 100644
> --- a/include/configs/odroid.h
> +++ b/include/configs/odroid.h
> @@ -108,6 +108,8 @@
> * 2. ROOT: -
> */
> #define CONFIG_EXTRA_ENV_SETTINGS \
> + "loadbootscript=load mmc ${mmcbootdev}:${mmcbootpart} ${scriptaddr} " \
> + "boot.scr\0" \
> "loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \
> "${kernelname}\0" \
> "loadinitrd=load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} " \
> @@ -129,6 +131,9 @@
> "kernel_args=" \
> "setenv bootargs root=/dev/mmcblk${mmcrootdev}p${mmcrootpart}" \
> " rootwait ${console} ${opts}\0" \
> + "boot_script=" \
> + "run loadbootscript;" \
> + "source ${scriptaddr}\0" \
> "boot_fit=" \
> "setenv kerneladdr 0x42000000;" \
> "setenv kernelname Image.itb;" \
> @@ -152,6 +157,9 @@
> "run kernel_args;" \
> "bootz ${kerneladdr} ${initrd_addr} ${fdt_addr};\0" \
> "autoboot=" \
> + "if test -e mmc 0 boot.scr; then; " \
> + "run boot_script; " \
> + "fi; " \
Why you not use "elif"? Last time I gave you the correct version:
"if test -e mmc 0 boot.scr; then; " \
"run bootscript; " \
"elif test -e mmc 0 Image.itb; then; " \
> "if test -e mmc 0 Image.itb; then; " \
> "run boot_fit;" \
> "elif test -e mmc 0 zImage; then; " \
> @@ -171,6 +179,7 @@
> "consoleoff=set console console=ram; save; reset\0" \
> "initrdname=uInitrd\0" \
> "initrdaddr=42000000\0" \
> + "scriptaddr=0x42000000\0" \
> "fdtaddr=40800000\0"
>
> /* I2C */
>
Best regards
--
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com