Enhance Odroid board

PATCH Superseded Guillaume GARDET 4 participants 19 messages Sep 28, 2015 – Oct 13, 2015

Share & tools

Guillaume GARDET

author

2015-09-28 09:42 UTC #0 lore raw

cover Enhance Odroid board

Those 2 patches enhances Odroid board support.
* First patch replace 'fatload' command by 'load', to be able to use EXT* partitions while keeping FAT partition compatibility.
* Second patch adds boot script (boot.scr) support. If no boot script are found, it boots as usual.

Signed-off-by Guillaume GARDET <[email protected]>

Cc Przemyslaw Marczak <[email protected]>

Cc Minkyu Kang <[email protected]>

---

Guillaume GARDET (2):
odroid: replace 'fatload' with 'load' to be able to use EXT*
partitions
odroid: Add boot script (boot.scr) support

 include/configs/odroid.h | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

Signature · 1 line

1.8.4.5

Guillaume GARDET

author

2015-09-28 09:42 UTC #1 lore raw

PATCH 1/2 odroid: replace 'fatload' with 'load' to be able to use EXT* partitions

Signed-off-by Guillaume GARDET <[email protected]>

Cc Przemyslaw Marczak <[email protected]>

Cc Minkyu Kang <[email protected]>

---
 include/configs/odroid.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

include/configs/odroid.h +3 -3

index 1afe04a..e45b00e 100644
@@ -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 " \

Signature · 1 line

1.8.4.5

Przemyslaw Marczak

2015-10-01 09:18 UTC #2 lore raw

PATCH v3 1/2 odroid: replace 'fatload' with 'load' to be able to use EXT* partitions

Hello Guillaume,

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

Please, add commit message here.

Quoted 18 lines

Signed-off-by Guillaume GARDET <[email protected]>
Cc Przemyslaw Marczak <[email protected]>
Cc Minkyu Kang <[email protected]>
---
  include/configs/odroid.h | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
include/configs/odroid.h +0 -1
index 1afe04a..e45b00e 100644
@@ -108,11 +108,11 @@
   * 2.  ROOT:  -
  */
  #define CONFIG_EXTRA_ENV_SETTINGS \
-	"loadkernel=fatload mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \

include/configs/odroid.h line 118

Quoted 10 lines

include/configs/odroid.h +3 -2

+	"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,

Signature · 4 lines

Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

Guillaume GARDET

author

2015-09-28 09:42 UTC #3 lore raw

PATCH 2/2 odroid: Add boot script (boot.scr) support

In reply to Guillaume GARDET

Signed-off-by Guillaume GARDET <[email protected]>

Cc Przemyslaw Marczak <[email protected]>

Cc Minkyu Kang <[email protected]>

---
 include/configs/odroid.h | 8 ++++++++
 1 file changed, 8 insertions(+)

include/configs/odroid.h +8 -0

index e45b00e..cc9f818 100644
@@ -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" \
+	"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=" \
+		"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" \
 	"fdtaddr=40800000\0"
 
 /* I2C */

Signature · 1 line

1.8.4.5

Przemyslaw Marczak

2015-10-01 09:19 UTC #4 lore raw

PATCH v3 2/2 odroid: Add boot script (boot.scr) support

Hello Guillaume,

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

Please, add commit message.

Quoted 22 lines

Signed-off-by Guillaume GARDET <[email protected]>

Cc Przemyslaw Marczak <[email protected]>

Cc Minkyu Kang <[email protected]>

---
  include/configs/odroid.h | 8 ++++++++
  1 file changed, 8 insertions(+)

include/configs/odroid.h +2 -0

index e45b00e..cc9f818 100644
@@ -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} " \

include/configs/odroid.h line 133

Quoted 3 lines

include/configs/odroid.h +0 -0

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

include/configs/odroid.h line 158

Quoted 9 lines

include/configs/odroid.h +2 -0

+	"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 :)

include/configs/odroid.h line 181

Quoted 11 lines

include/configs/odroid.h +4 -0

+		"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" \

include/configs/odroid.h line 184

Quoted 4 lines

include/configs/odroid.h +0 -0
  	"fdtaddr=40800000\0"
 
  /* I2C */

Best regards,

Signature · 4 lines

Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

Guillaume GARDET

author

2015-10-05 09:07 UTC #5 lore raw

v2 cover Enhance Odroid board

In reply to Guillaume GARDET

Changes in V2:
* Expand commit messages
* Better code consistency

Signed-off-by Guillaume GARDET <[email protected]>

Cc Przemyslaw Marczak <[email protected]>

Cc Minkyu Kang <[email protected]>

---

Guillaume GARDET (2):
odroid: replace 'fatload' with 'load' to be able to use EXT*
partitions
odroid: Add boot script (boot.scr) support

 include/configs/odroid.h | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

Signature · 1 line

1.8.4.5

Guillaume GARDET

author

2015-10-05 09:07 UTC #6 lore raw

PATCH v2 1/2 odroid: replace 'fatload' with 'load' to be able to use EXT* partitions

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

Signed-off-by Guillaume GARDET <[email protected]>

Cc Przemyslaw Marczak <[email protected]>

Cc Minkyu Kang <[email protected]>

---
 include/configs/odroid.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

include/configs/odroid.h +3 -3

index 1afe04a..e45b00e 100644
@@ -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 " \

Signature · 1 line

1.8.4.5

Guillaume GARDET

author

2015-10-05 09:07 UTC #7 lore raw

PATCH v2 2/2 odroid: Add boot script (boot.scr) support

In reply to Guillaume GARDET

Add boot script (boot.scr) support. If no boot script are found, it boots as usual.

Signed-off-by Guillaume GARDET <[email protected]>

Cc Przemyslaw Marczak <[email protected]>

Cc Minkyu Kang <[email protected]>

---
 include/configs/odroid.h | 9 +++++++++
 1 file changed, 9 insertions(+)

include/configs/odroid.h +9 -0

index e45b00e..f79847b 100644
@@ -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 */

Signature · 1 line

1.8.4.5

Sjoerd Simons

2015-10-05 09:13 UTC #8 lore raw

PATCH v2 2/2 odroid: Add boot script (boot.scr) support

Quoted 2 lines · Guillaume GARDET

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

Quoted 54 lines

Signed-off-by Guillaume GARDET <[email protected]>

Cc Przemyslaw Marczak <[email protected]>

Cc Minkyu Kang <[email protected]>

---
 include/configs/odroid.h | 9 +++++++++
 1 file changed, 9 insertions(+)

include/configs/odroid.h +2 -0

index e45b00e..f79847b 100644
@@ -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} " \

include/configs/odroid.h +0 -0

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

${initrdaddr} " \

include/configs/odroid.h +3 -0

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

include/configs/odroid.h +3 -0

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

include/configs/odroid.h +1 -0

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

Signature · 2 lines

Sjoerd Simons
Collabora Ltd.

Guillaume Gardet

author

2015-10-08 09:31 UTC #9 lore raw

PATCH v2 2/2 odroid: Add boot script (boot.scr) support

Le 05/10/2015 11:13, Sjoerd Simons a ?crit :

Quoted 6 lines · Guillaume GARDET

Quoted 2 lines
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

Quoted 61 lines

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

Quoted 54 lines

Signed-off-by Guillaume GARDET <[email protected]>

Cc Przemyslaw Marczak <[email protected]>

Cc Minkyu Kang <[email protected]>

---
  include/configs/odroid.h | 9 +++++++++
  1 file changed, 9 insertions(+)

include/configs/odroid.h +2 -0

index e45b00e..f79847b 100644
@@ -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} " \

include/configs/odroid.h +3 -0

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

include/configs/odroid.h +3 -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; " \
  		"if test -e mmc 0 Image.itb; then; " \
  			"run boot_fit;" \

  		"elif test -e mmc 0 zImage; then; " \

include/configs/odroid.h +1 -0

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

Przemyslaw Marczak

2015-10-09 10:18 UTC #10 lore raw

PATCH v2 2/2 odroid: Add boot script (boot.scr) support

In reply to Sjoerd Simons

Hi Sjoerd,

Quoted 8 lines · Sjoerd Simons

Quoted 2 lines · Guillaume GARDET
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.

Quoted 6 lines

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.

Quoted 53 lines

Signed-off-by Guillaume GARDET <[email protected]>

Cc Przemyslaw Marczak <[email protected]>

Cc Minkyu Kang <[email protected]>

---
  include/configs/odroid.h | 9 +++++++++
  1 file changed, 9 insertions(+)

include/configs/odroid.h +2 -0

index e45b00e..f79847b 100644
@@ -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} " \

include/configs/odroid.h +3 -0

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

include/configs/odroid.h +3 -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; " \
  		"if test -e mmc 0 Image.itb; then; " \
  			"run boot_fit;" \

  		"elif test -e mmc 0 zImage; then; " \

include/configs/odroid.h +1 -0

@@ -171,6 +179,7 @@
  	"consoleoff=set console console=ram; save; reset\0" \
  	"initrdname=uInitrd\0" \
  	"initrdaddr=42000000\0" \
+	"scriptaddr=0x42000000\0" \
  	"fdtaddr=40800000\0"

Quoted 2 lines

include/configs/odroid.h line 185
Quoted 1 line
include/configs/odroid.h +0 -0
  /* I2C */

Best regards,

Signature · 4 lines

Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

Przemyslaw Marczak

2015-10-09 10:24 UTC #11 lore raw

PATCH v2 2/2 odroid: Add boot script (boot.scr) support

In reply to Guillaume GARDET

Hello Guillaume,

Quoted 35 lines · Guillaume GARDET

Add boot script (boot.scr) support. If no boot script are found, it boots as usual.

Signed-off-by Guillaume GARDET <[email protected]>

Cc Przemyslaw Marczak <[email protected]>

Cc Minkyu Kang <[email protected]>

---
  include/configs/odroid.h | 9 +++++++++
  1 file changed, 9 insertions(+)

include/configs/odroid.h +5 -0

index e45b00e..f79847b 100644
@@ -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;" \

include/configs/odroid.h line 162

Quoted 6 lines

include/configs/odroid.h +3 -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; " \

include/configs/odroid.h line 185

Quoted 12 lines

include/configs/odroid.h +1 -0

  		"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

Signature · 4 lines

Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

Guillaume Gardet

author

2015-10-09 11:59 UTC #12 lore raw

PATCH v2 2/2 odroid: Add boot script (boot.scr) support

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

Quoted 47 lines

Hello Guillaume,

Quoted 35 lines · Guillaume GARDET

Add boot script (boot.scr) support. If no boot script are found, it boots as usual.

Signed-off-by Guillaume GARDET <[email protected]>

Cc Przemyslaw Marczak <[email protected]>

Cc Minkyu Kang <[email protected]>

---
  include/configs/odroid.h | 9 +++++++++
  1 file changed, 9 insertions(+)

include/configs/odroid.h +5 -0

index e45b00e..f79847b 100644
@@ -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;" \

include/configs/odroid.h line 162

Quoted 6 lines

include/configs/odroid.h +3 -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:

Quoted 3 lines

"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

Quoted 15 lines

include/configs/odroid.h line 185

Quoted 13 lines

include/configs/odroid.h +1 -0

          "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

2015-10-09 12:18 UTC #13 lore raw

PATCH v2 2/2 odroid: Add boot script (boot.scr) support

Hello,

Quoted 54 lines · Guillaume Gardet

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

Quoted 51 lines

Hello Guillaume,

Quoted 39 lines · Guillaume GARDET

Add boot script (boot.scr) support. If no boot script are found, it boots as usual.

Signed-off-by Guillaume GARDET <[email protected]>

Cc Przemyslaw Marczak <[email protected]>

Cc Minkyu Kang <[email protected]>

---
  include/configs/odroid.h | 9 +++++++++
  1 file changed, 9 insertions(+)

include/configs/odroid.h +2 -0

index e45b00e..f79847b 100644
@@ -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}

" \

include/configs/odroid.h +3 -0

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

include/configs/odroid.h line 162

Quoted 6 lines

include/configs/odroid.h +3 -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:

Quoted 7 lines

Quoted 3 lines
"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.

I think, that only one boot path should be chosen at each boot. Even if boot script will fail, it means, that the boot path was found, and loading uImage directly is not preferred - since maybe something can be missing then.

If user wants boot from script, then he puts it to disk, if not then he can choose one of supported image type, but not all at a time.

Quoted 7 lines

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

I suggested that version to you in last review. I would like to apply locally the patch and test, if can compile with no error/warning, make test of run the board and test of booting the kernel. And after positive test sequence, your patch will be acked, and then can be taken by Minkyu.

So yes, please send the correct version.

Quoted 13 lines

include/configs/odroid.h +1 -0

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

Quoted 6 lines

Quoted 4 lines
include/configs/odroid.h line 185
Quoted 2 lines
include/configs/odroid.h +0 -0
  /* I2C */
Best regards

Best regards

Signature · 4 lines

Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

Guillaume GARDET

author

2015-10-09 12:26 UTC #14 lore raw

v3 cover *Enhance Odroid board

In reply to Guillaume GARDET

Changes in V3:
* Uses 'elif' version as requested by Przemyslaw Marczak

Changes in V2:
* Expand commit messages
* Better code consistency

Signed-off-by Guillaume GARDET <[email protected]>

Cc Przemyslaw Marczak <[email protected]>

Cc Minkyu Kang <[email protected]>

---

Guillaume GARDET (2):
odroid: replace 'fatload' with 'load' to be able to use EXT*
partitions
odroid: Add boot script (boot.scr) support

 include/configs/odroid.h | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

Signature · 1 line

1.8.4.5

Guillaume GARDET

author

2015-10-09 12:26 UTC #15 lore raw

PATCH v3 1/2 odroid: replace 'fatload' with 'load' to be able to use EXT* partitions

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

Signed-off-by Guillaume GARDET <[email protected]>

Cc Przemyslaw Marczak <[email protected]>

Cc Minkyu Kang <[email protected]>

---
 include/configs/odroid.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

include/configs/odroid.h +3 -3

index 1afe04a..e45b00e 100644
@@ -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 " \

Signature · 1 line

1.8.4.5

Guillaume GARDET

author

2015-10-09 12:26 UTC #16 lore raw

PATCH v3 2/2 odroid: Add boot script (boot.scr) support

In reply to Guillaume GARDET

Add boot script (boot.scr) support. If no boot script are found, it boots as usual.

Signed-off-by Guillaume GARDET <[email protected]>

Cc Przemyslaw Marczak <[email protected]>

Cc Minkyu Kang <[email protected]>

---
 include/configs/odroid.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

include/configs/odroid.h +9 -1

index e45b00e..4c85e85 100644
@@ -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 */

Signature · 1 line

1.8.4.5

Przemyslaw Marczak

2015-10-13 10:16 UTC #17 lore raw

v3 cover *Enhance Odroid board

In reply to Guillaume GARDET

Hello,

Quoted 19 lines · Guillaume GARDET

Those 2 patches enhances Odroid board support.
* First patch replace 'fatload' command by 'load', to be able to use EXT* partitions while keeping FAT partition compatibility.
* Second patch adds boot script (boot.scr) support. If no boot script are found, it boots as usual.
Changes in V3:
* Uses 'elif' version as requested by Przemyslaw Marczak
Changes in V2:
* Expand commit messages
* Better code consistency
Signed-off-by Guillaume GARDET <[email protected]>
Cc Przemyslaw Marczak <[email protected]>
Cc Minkyu Kang <[email protected]>
---

Quoted 8 lines

Guillaume GARDET (2):
odroid: replace 'fatload' with 'load' to be able to use EXT*
partitions
odroid: Add boot script (boot.scr) support
  include/configs/odroid.h | 16 ++++++++++++----
  1 file changed, 12 insertions(+), 4 deletions(-)

For the series:

Tested-by Przemyslaw Marczak <[email protected]>

Acked-by Przemyslaw Marczak <[email protected]>

Thanks!

Signature · 4 lines

Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

Minkyu Kang

2015-10-13 11:51 UTC #18 lore raw

v3 cover *Enhance Odroid board

Dear Guillaume GARDET,

Quoted 31 lines · Przemyslaw Marczak

Hello,
Quoted 19 lines · Guillaume GARDET
Those 2 patches enhances Odroid board support.
* First patch replace 'fatload' command by 'load', to be able to use EXT* partitions while keeping FAT partition compatibility.
* Second patch adds boot script (boot.scr) support. If no boot script are found, it boots as usual.
Changes in V3:
* Uses 'elif' version as requested by Przemyslaw Marczak
Changes in V2:
* Expand commit messages
* Better code consistency
Signed-off-by Guillaume GARDET <[email protected]>
Cc Przemyslaw Marczak <[email protected]>
Cc Minkyu Kang <[email protected]>
---
Quoted 8 lines
Guillaume GARDET (2):
odroid: replace 'fatload' with 'load' to be able to use EXT*
partitions
odroid: Add boot script (boot.scr) support
  include/configs/odroid.h | 16 ++++++++++++----
  1 file changed, 12 insertions(+), 4 deletions(-)

Quoted 6 lines

For the series:
Tested-by Przemyslaw Marczak <[email protected]>
Acked-by Przemyslaw Marczak <[email protected]>
Thanks!

applied to u-boot-samsung.

Thanks,
Minkyu Kang.