
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 guillaume.gardet@free.fr Cc: Przemyslaw Marczak p.marczak@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com
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 @@
- ROOT: -
*/ #define CONFIG_EXTRA_ENV_SETTINGS \
- "loadbootscript=load mmc ${mmcbootdev}:${mmcbootpart} ${scriptaddr} " \
"loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \ "${kernelname}\0" \ "loadinitrd=load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} " \"boot.scr\0" \
@@ -129,6 +131,9 @@ "kernel_args=" \ "setenv bootargs root=/dev/mmcblk${mmcrootdev}p${mmcrootpart}" \ " rootwait ${console} ${opts}\0" \
- "boot_script=" \
"run loadbootscript;" \
"boot_fit=" \ "setenv kerneladdr 0x42000000;" \ "setenv kernelname Image.itb;" \"source ${scriptaddr}\0" \
@@ -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