All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot]  [PATCH 0/2] Enhance Odroid board
@ 2015-09-28  9:42 Guillaume GARDET
  2015-09-28  9:42 ` [U-Boot] [PATCH 1/2] odroid: replace 'fatload' with 'load' to be able to use EXT* partitions Guillaume GARDET
                   ` (2 more replies)
  0 siblings, 3 replies; 19+ messages in thread
From: Guillaume GARDET @ 2015-09-28  9:42 UTC (permalink / raw)
  To: u-boot

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 <guillaume.gardet@free.fr>
Cc: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>

---

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(-)

-- 
1.8.4.5

^ permalink raw reply	[flat|nested] 19+ messages in thread

* [U-Boot] [PATCH 1/2] odroid: replace 'fatload' with 'load' to be able to use EXT* partitions
  2015-09-28  9:42 [U-Boot] [PATCH 0/2] Enhance Odroid board Guillaume GARDET
@ 2015-09-28  9:42 ` Guillaume GARDET
  2015-10-01  9:18   ` Przemyslaw Marczak
  2015-09-28  9:42 ` [U-Boot] [PATCH 2/2] odroid: Add boot script (boot.scr) support Guillaume GARDET
  2015-10-05  9:07 ` [U-Boot] [PATCH V2 0/2] Enhance Odroid board Guillaume GARDET
  2 siblings, 1 reply; 19+ messages in thread
From: Guillaume GARDET @ 2015-09-28  9:42 UTC (permalink / raw)
  To: u-boot

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

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [U-Boot]  [PATCH 2/2] odroid: Add boot script (boot.scr) support
  2015-09-28  9:42 [U-Boot] [PATCH 0/2] Enhance Odroid board Guillaume GARDET
  2015-09-28  9:42 ` [U-Boot] [PATCH 1/2] odroid: replace 'fatload' with 'load' to be able to use EXT* partitions Guillaume GARDET
@ 2015-09-28  9:42 ` Guillaume GARDET
  2015-10-01  9:19   ` Przemyslaw Marczak
  2015-10-05  9:07 ` [U-Boot] [PATCH V2 0/2] Enhance Odroid board Guillaume GARDET
  2 siblings, 1 reply; 19+ messages in thread
From: Guillaume GARDET @ 2015-09-28  9:42 UTC (permalink / raw)
  To: u-boot

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" \
+	"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 */
-- 
1.8.4.5

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [U-Boot] [PATCH 1/2] odroid: replace 'fatload' with 'load' to be able to use EXT* partitions
  2015-09-28  9:42 ` [U-Boot] [PATCH 1/2] odroid: replace 'fatload' with 'load' to be able to use EXT* partitions Guillaume GARDET
@ 2015-10-01  9:18   ` Przemyslaw Marczak
  0 siblings, 0 replies; 19+ messages in thread
From: Przemyslaw Marczak @ 2015-10-01  9:18 UTC (permalink / raw)
  To: u-boot

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,
-- 
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

^ permalink raw reply	[flat|nested] 19+ messages in thread

* [U-Boot] [PATCH 2/2] odroid: Add boot script (boot.scr) support
  2015-09-28  9:42 ` [U-Boot] [PATCH 2/2] odroid: Add boot script (boot.scr) support Guillaume GARDET
@ 2015-10-01  9:19   ` Przemyslaw Marczak
  0 siblings, 0 replies; 19+ messages in thread
From: Przemyslaw Marczak @ 2015-10-01  9:19 UTC (permalink / raw)
  To: u-boot

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,
-- 
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

^ permalink raw reply	[flat|nested] 19+ messages in thread

* [U-Boot] [PATCH V2 0/2] Enhance Odroid board
  2015-09-28  9:42 [U-Boot] [PATCH 0/2] Enhance Odroid board Guillaume GARDET
  2015-09-28  9:42 ` [U-Boot] [PATCH 1/2] odroid: replace 'fatload' with 'load' to be able to use EXT* partitions Guillaume GARDET
  2015-09-28  9:42 ` [U-Boot] [PATCH 2/2] odroid: Add boot script (boot.scr) support Guillaume GARDET
@ 2015-10-05  9:07 ` Guillaume GARDET
  2015-10-05  9:07   ` [U-Boot] [PATCH V2 1/2] odroid: replace 'fatload' with 'load' to be able to use EXT* partitions Guillaume GARDET
                     ` (2 more replies)
  2 siblings, 3 replies; 19+ messages in thread
From: Guillaume GARDET @ 2015-10-05  9:07 UTC (permalink / raw)
  To: u-boot

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 V2:
* Expand commit messages
* Better code consistency

Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Cc: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>

---

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(-)

-- 
1.8.4.5

^ permalink raw reply	[flat|nested] 19+ messages in thread

* [U-Boot] [PATCH V2 1/2] odroid: replace 'fatload' with 'load' to be able to use EXT* partitions
  2015-10-05  9:07 ` [U-Boot] [PATCH V2 0/2] Enhance Odroid board Guillaume GARDET
@ 2015-10-05  9:07   ` Guillaume GARDET
  2015-10-05  9:07   ` [U-Boot] [PATCH V2 2/2] odroid: Add boot script (boot.scr) support Guillaume GARDET
  2015-10-09 12:26   ` [U-Boot] [PATCH V3 0/2] *Enhance Odroid board Guillaume GARDET
  2 siblings, 0 replies; 19+ messages in thread
From: Guillaume GARDET @ 2015-10-05  9:07 UTC (permalink / raw)
  To: u-boot

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

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [U-Boot] [PATCH V2 2/2] odroid: Add boot script (boot.scr) support
  2015-10-05  9:07 ` [U-Boot] [PATCH V2 0/2] Enhance Odroid board Guillaume GARDET
  2015-10-05  9:07   ` [U-Boot] [PATCH V2 1/2] odroid: replace 'fatload' with 'load' to be able to use EXT* partitions Guillaume GARDET
@ 2015-10-05  9:07   ` Guillaume GARDET
  2015-10-05  9:13     ` Sjoerd Simons
  2015-10-09 10:24     ` Przemyslaw Marczak
  2015-10-09 12:26   ` [U-Boot] [PATCH V3 0/2] *Enhance Odroid board Guillaume GARDET
  2 siblings, 2 replies; 19+ messages in thread
From: Guillaume GARDET @ 2015-10-05  9:07 UTC (permalink / raw)
  To: u-boot

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; " \
 		"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 */
-- 
1.8.4.5

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [U-Boot] [PATCH V2 2/2] odroid: Add boot script (boot.scr) support
  2015-10-05  9:07   ` [U-Boot] [PATCH V2 2/2] odroid: Add boot script (boot.scr) support Guillaume GARDET
@ 2015-10-05  9:13     ` Sjoerd Simons
  2015-10-08  9:31       ` Guillaume Gardet
  2015-10-09 10:18       ` Przemyslaw Marczak
  2015-10-09 10:24     ` Przemyslaw Marczak
  1 sibling, 2 replies; 19+ messages in thread
From: Sjoerd Simons @ 2015-10-05  9:13 UTC (permalink / raw)
  To: u-boot

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

-- 
Sjoerd Simons
Collabora Ltd.

^ permalink raw reply	[flat|nested] 19+ messages in thread

* [U-Boot] [PATCH V2 2/2] odroid: Add boot script (boot.scr) support
  2015-10-05  9:13     ` Sjoerd Simons
@ 2015-10-08  9:31       ` Guillaume Gardet
  2015-10-09 10:18       ` Przemyslaw Marczak
  1 sibling, 0 replies; 19+ messages in thread
From: Guillaume Gardet @ 2015-10-08  9:31 UTC (permalink / raw)
  To: u-boot



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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* [U-Boot] [PATCH V2 2/2] odroid: Add boot script (boot.scr) support
  2015-10-05  9:13     ` Sjoerd Simons
  2015-10-08  9:31       ` Guillaume Gardet
@ 2015-10-09 10:18       ` Przemyslaw Marczak
  1 sibling, 0 replies; 19+ messages in thread
From: Przemyslaw Marczak @ 2015-10-09 10:18 UTC (permalink / raw)
  To: u-boot

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,
-- 
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

^ permalink raw reply	[flat|nested] 19+ messages in thread

* [U-Boot] [PATCH V2 2/2] odroid: Add boot script (boot.scr) support
  2015-10-05  9:07   ` [U-Boot] [PATCH V2 2/2] odroid: Add boot script (boot.scr) support Guillaume GARDET
  2015-10-05  9:13     ` Sjoerd Simons
@ 2015-10-09 10:24     ` Przemyslaw Marczak
  2015-10-09 11:59       ` Guillaume Gardet
  1 sibling, 1 reply; 19+ messages in thread
From: Przemyslaw Marczak @ 2015-10-09 10:24 UTC (permalink / raw)
  To: u-boot

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

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* [U-Boot] [PATCH V2 2/2] odroid: Add boot script (boot.scr) support
  2015-10-09 10:24     ` Przemyslaw Marczak
@ 2015-10-09 11:59       ` Guillaume Gardet
  2015-10-09 12:18         ` Przemyslaw Marczak
  0 siblings, 1 reply; 19+ messages in thread
From: Guillaume Gardet @ 2015-10-09 11:59 UTC (permalink / raw)
  To: u-boot



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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* [U-Boot] [PATCH V2 2/2] odroid: Add boot script (boot.scr) support
  2015-10-09 11:59       ` Guillaume Gardet
@ 2015-10-09 12:18         ` Przemyslaw Marczak
  0 siblings, 0 replies; 19+ messages in thread
From: Przemyslaw Marczak @ 2015-10-09 12:18 UTC (permalink / raw)
  To: u-boot

Hello,

On 10/09/2015 01:59 PM, Guillaume Gardet wrote:
>
>
> 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.

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.

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

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

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* [U-Boot] [PATCH V3 0/2] *Enhance Odroid board
  2015-10-05  9:07 ` [U-Boot] [PATCH V2 0/2] Enhance Odroid board Guillaume GARDET
  2015-10-05  9:07   ` [U-Boot] [PATCH V2 1/2] odroid: replace 'fatload' with 'load' to be able to use EXT* partitions Guillaume GARDET
  2015-10-05  9:07   ` [U-Boot] [PATCH V2 2/2] odroid: Add boot script (boot.scr) support Guillaume GARDET
@ 2015-10-09 12:26   ` Guillaume GARDET
  2015-10-09 12:26     ` [U-Boot] [PATCH V3 1/2] odroid: replace 'fatload' with 'load' to be able to use EXT* partitions Guillaume GARDET
                       ` (2 more replies)
  2 siblings, 3 replies; 19+ messages in thread
From: Guillaume GARDET @ 2015-10-09 12:26 UTC (permalink / raw)
  To: u-boot

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 <guillaume.gardet@free.fr>
Cc: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>

---

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(-)

-- 
1.8.4.5

^ permalink raw reply	[flat|nested] 19+ messages in thread

* [U-Boot] [PATCH V3 1/2] odroid: replace 'fatload' with 'load' to be able to use EXT* partitions
  2015-10-09 12:26   ` [U-Boot] [PATCH V3 0/2] *Enhance Odroid board Guillaume GARDET
@ 2015-10-09 12:26     ` Guillaume GARDET
  2015-10-09 12:26     ` [U-Boot] [PATCH V3 2/2] odroid: Add boot script (boot.scr) support Guillaume GARDET
  2015-10-13 10:16     ` [U-Boot] [PATCH V3 0/2] *Enhance Odroid board Przemyslaw Marczak
  2 siblings, 0 replies; 19+ messages in thread
From: Guillaume GARDET @ 2015-10-09 12:26 UTC (permalink / raw)
  To: u-boot

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

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [U-Boot] [PATCH V3 2/2] odroid: Add boot script (boot.scr) support
  2015-10-09 12:26   ` [U-Boot] [PATCH V3 0/2] *Enhance Odroid board Guillaume GARDET
  2015-10-09 12:26     ` [U-Boot] [PATCH V3 1/2] odroid: replace 'fatload' with 'load' to be able to use EXT* partitions Guillaume GARDET
@ 2015-10-09 12:26     ` Guillaume GARDET
  2015-10-13 10:16     ` [U-Boot] [PATCH V3 0/2] *Enhance Odroid board Przemyslaw Marczak
  2 siblings, 0 replies; 19+ messages in thread
From: Guillaume GARDET @ 2015-10-09 12:26 UTC (permalink / raw)
  To: u-boot

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

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [U-Boot] [PATCH V3 0/2] *Enhance Odroid board
  2015-10-09 12:26   ` [U-Boot] [PATCH V3 0/2] *Enhance Odroid board Guillaume GARDET
  2015-10-09 12:26     ` [U-Boot] [PATCH V3 1/2] odroid: replace 'fatload' with 'load' to be able to use EXT* partitions Guillaume GARDET
  2015-10-09 12:26     ` [U-Boot] [PATCH V3 2/2] odroid: Add boot script (boot.scr) support Guillaume GARDET
@ 2015-10-13 10:16     ` Przemyslaw Marczak
  2015-10-13 11:51       ` Minkyu Kang
  2 siblings, 1 reply; 19+ messages in thread
From: Przemyslaw Marczak @ 2015-10-13 10:16 UTC (permalink / raw)
  To: u-boot

Hello,

On 10/09/2015 02:26 PM, Guillaume GARDET wrote:
> 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 <guillaume.gardet@free.fr>
> Cc: Przemyslaw Marczak <p.marczak@samsung.com>
> Cc: Minkyu Kang <mk7.kang@samsung.com>
>
> ---
>
> 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 <p.marczak@samsung.com>
Acked-by: Przemyslaw Marczak <p.marczak@samsung.com>

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

^ permalink raw reply	[flat|nested] 19+ messages in thread

* [U-Boot] [PATCH V3 0/2] *Enhance Odroid board
  2015-10-13 10:16     ` [U-Boot] [PATCH V3 0/2] *Enhance Odroid board Przemyslaw Marczak
@ 2015-10-13 11:51       ` Minkyu Kang
  0 siblings, 0 replies; 19+ messages in thread
From: Minkyu Kang @ 2015-10-13 11:51 UTC (permalink / raw)
  To: u-boot

Dear Guillaume GARDET,

On 13/10/15 19:16, Przemyslaw Marczak wrote:
> Hello,
> 
> On 10/09/2015 02:26 PM, Guillaume GARDET wrote:
>> 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 <guillaume.gardet@free.fr>
>> Cc: Przemyslaw Marczak <p.marczak@samsung.com>
>> Cc: Minkyu Kang <mk7.kang@samsung.com>
>>
>> ---
>>
>> 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 <p.marczak@samsung.com>
> Acked-by: Przemyslaw Marczak <p.marczak@samsung.com>
> 
> Thanks!

applied to u-boot-samsung.

Thanks,
Minkyu Kang.

^ permalink raw reply	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2015-10-13 11:51 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-28  9:42 [U-Boot] [PATCH 0/2] Enhance Odroid board Guillaume GARDET
2015-09-28  9:42 ` [U-Boot] [PATCH 1/2] odroid: replace 'fatload' with 'load' to be able to use EXT* partitions Guillaume GARDET
2015-10-01  9:18   ` Przemyslaw Marczak
2015-09-28  9:42 ` [U-Boot] [PATCH 2/2] odroid: Add boot script (boot.scr) support Guillaume GARDET
2015-10-01  9:19   ` Przemyslaw Marczak
2015-10-05  9:07 ` [U-Boot] [PATCH V2 0/2] Enhance Odroid board Guillaume GARDET
2015-10-05  9:07   ` [U-Boot] [PATCH V2 1/2] odroid: replace 'fatload' with 'load' to be able to use EXT* partitions Guillaume GARDET
2015-10-05  9:07   ` [U-Boot] [PATCH V2 2/2] odroid: Add boot script (boot.scr) support Guillaume GARDET
2015-10-05  9:13     ` Sjoerd Simons
2015-10-08  9:31       ` Guillaume Gardet
2015-10-09 10:18       ` Przemyslaw Marczak
2015-10-09 10:24     ` Przemyslaw Marczak
2015-10-09 11:59       ` Guillaume Gardet
2015-10-09 12:18         ` Przemyslaw Marczak
2015-10-09 12:26   ` [U-Boot] [PATCH V3 0/2] *Enhance Odroid board Guillaume GARDET
2015-10-09 12:26     ` [U-Boot] [PATCH V3 1/2] odroid: replace 'fatload' with 'load' to be able to use EXT* partitions Guillaume GARDET
2015-10-09 12:26     ` [U-Boot] [PATCH V3 2/2] odroid: Add boot script (boot.scr) support Guillaume GARDET
2015-10-13 10:16     ` [U-Boot] [PATCH V3 0/2] *Enhance Odroid board Przemyslaw Marczak
2015-10-13 11:51       ` Minkyu Kang

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.