From mboxrd@z Thu Jan 1 00:00:00 1970 From: Guillaume Gardet Date: Thu, 8 Oct 2015 11:31:15 +0200 Subject: [U-Boot] [PATCH V2 2/2] odroid: Add boot script (boot.scr) support In-Reply-To: <1444036434.9895.16.camel@collabora.co.uk> 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> <1444036434.9895.16.camel@collabora.co.uk> Message-ID: <561637E3.7080503@free.fr> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Le 05/10/2015 11:13, Sjoerd Simons a ?crit : > On Mon, 2015-10-05 at 11:07 +0200, Guillaume GARDET wrote: >> Add boot script (boot.scr) support. If no boot script are >> found, it boots as usual. > Instead of extending the specialized boot script, it would belovely to > see the odroid board switch to distro boot commands for a more > standardized boot sequence. This would be a better solution but also a much bigger work. Morevover, the backward compatibility will be harder to verify. So, for now, I will stick with this patch. But if you want to do it, please do it. :) Guillaume > > For reference, if you need an example how to add that while staying > backwards compatible see my patchset for am335x boards which did > something like that: > > http://lists.denx.de/pipermail/u-boot/2015-August/225656.html > >> 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; " \ >> "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 */