Hello Guillaume,

On 09/28/2015 11:42 AM, Guillaume GARDET wrote:

Please, add commit message here.

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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 1afe04a..e45b00e 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -108,11 +108,11 @@

• 2. ROOT: -

*/ #define CONFIG_EXTRA_ENV_SETTINGS \

• "loadkernel=fatload mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \

• "loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \ "${kernelname}\0" \

• "loadinitrd=fatload mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} " \

• "loadinitrd=load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} " \ "${initrdname}\0" \

• "loaddtb=fatload mmc ${mmcbootdev}:${mmcbootpart} ${fdtaddr} " \

• "loaddtb=load mmc ${mmcbootdev}:${mmcbootpart} ${fdtaddr} " \ "${fdtfile}\0" \ "check_ramdisk=" \ "if run loadinitrd; then " \

Best regards,

Hello Guillaume,

On 09/28/2015 11:42 AM, Guillaume GARDET wrote:

Please, add commit message.

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 | 8 ++++++++ 1 file changed, 8 insertions(+)

diff --git a/include/configs/odroid.h b/include/configs/odroid.h index e45b00e..cc9f818 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} ${loadaddr} " \

• "boot.scr\0" \
  

  "loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \ "${kernelname}\0" \ "loadinitrd=load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} " \

@@ -129,6 +131,8 @@ "kernel_args=" \ "setenv bootargs root=/dev/mmcblk${mmcrootdev}p${mmcrootpart}" \ " rootwait ${console} ${opts}\0" \

Please keep the code consistency, use boot_script, like boot_zimg, boot_fit, etc...

I think, that we don't need echoing such information since we usually read the script from one place, and the "source" prints info, that script is executing.

Please start command with the new line, it looks better :)

"boot_script =" \ "run loadbootscript;" \ "source ...

• "bootscript=echo Running bootscript from mmc${mmcbootdev}:${mmcbootpart} ...; " \

• "source ${loadaddr}\0" \
  

  "boot_fit=" \ "setenv kerneladdr 0x42000000;" \ "setenv kernelname Image.itb;" \

@@ -152,6 +156,9 @@ "run kernel_args;" \ "bootz ${kerneladdr} ${initrd_addr} ${fdt_addr};\0" \ "autoboot=" \

Also in this place, please use consistent code:

"if test -e mmc 0 boot.scr; then; " \ "run bootscript; " \ "elif test -e mmc 0 Image.itb; then; " \

Using load command without checking before, if file exists with: "if test -e...", causes printing error to console - we don't like this :)

• "if run loadbootscript; then " \
  

• 	"run bootscript; " \
  

• "fi; " \
  

  "if test -e mmc 0 Image.itb; then; " \ "run boot_fit;" \ "elif test -e mmc 0 zImage; then; " \

@@ -171,6 +178,7 @@ "consoleoff=set console console=ram; save; reset\0" \ "initrdname=uInitrd\0" \ "initrdaddr=42000000\0" \

• "loadaddr=0x42000000\0" \

Generally we load everything, so please use more precisely name, like:

"scriptaddr=0x42000000\0" \

"fdtaddr=40800000\0"

/* I2C */

Best regards,

Replace 'fatload' command by 'load', to be able to use EXT* partitions while keeping FAT partition compatibility.

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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 1afe04a..e45b00e 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -108,11 +108,11 @@ * 2. ROOT: - */ #define CONFIG_EXTRA_ENV_SETTINGS \ - "loadkernel=fatload mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \ + "loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \ "${kernelname}\0" \ - "loadinitrd=fatload mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} " \ + "loadinitrd=load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} " \ "${initrdname}\0" \ - "loaddtb=fatload mmc ${mmcbootdev}:${mmcbootpart} ${fdtaddr} " \ + "loaddtb=load mmc ${mmcbootdev}:${mmcbootpart} ${fdtaddr} " \ "${fdtfile}\0" \ "check_ramdisk=" \ "if run loadinitrd; then " \

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.

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 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 @@

• 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 */

Hi Sjoerd,

On 10/05/2015 11:13 AM, Sjoerd Simons wrote:

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.

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

You're right. I will move it some day as it is in XU3, but for now I have some other things to do, so I prefer accept this patch. It's only few lines.

...

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 @@

• 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 */

Best regards,

Le 09/10/2015 12:24, Przemyslaw Marczak a écrit :

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 @@

• 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; " \

Because, if boot script fails, then it allows to try to boot kernel directly. If you prefer the 'elif' version, I am fine with it.

If 'elif' version is preferred, would you be ok to modify it directly (faster) or would you like a V3?

Guillaume

...

      "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

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 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/include/configs/odroid.h b/include/configs/odroid.h index e45b00e..4c85e85 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,7 +157,9 @@ "run kernel_args;" \ "bootz ${kerneladdr} ${initrd_addr} ${fdt_addr};\0" \ "autoboot=" \ - "if test -e mmc 0 Image.itb; then; " \ + "if test -e mmc 0 boot.scr; then; " \ + "run boot_script; " \ + "elif test -e mmc 0 Image.itb; then; " \ "run boot_fit;" \ "elif test -e mmc 0 zImage; then; " \ "run boot_zimg;" \ @@ -171,6 +178,7 @@ "consoleoff=set console console=ram; save; reset\0" \ "initrdname=uInitrd\0" \ "initrdaddr=42000000\0" \ + "scriptaddr=0x42000000\0" \ "fdtaddr=40800000\0"

/* I2C */