[U-Boot] [PATCH] ORIGEN: Enhance origen config to be more flexible on boot.

[U-Boot] [PATCH] ORIGEN: Enhance origen config to be more flexible on boot.

[Guillaume GARDET]

This patch enhances the boot of origen board by adding support to ext2, bootz, initrd, bootenv loading and boot script.
It still keeps the previous mmc load command if boot script fails.

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

---
 include/configs/origen.h | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/include/configs/origen.h b/include/configs/origen.h
index 5d24916..2117fe1 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -61,6 +61,10 @@
 #undef CONFIG_CMD_PING
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_DHCP
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FS_GENERIC
+#define CONFIG_CMD_BOOTZ
+#define CONFIG_SUPPORT_RAW_INITRD
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS
 
@@ -68,7 +72,36 @@
 #define COPY_BL2_FNPTR_ADDR	0x02020030
 #define CONFIG_SPL_TEXT_BASE	0x02021410
 
-#define CONFIG_BOOTCOMMAND	"fatload mmc 0 40007000 uImage; bootm 40007000"
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"loadaddr=0x40007000\0" \
+	"rdaddr=0x48000000\0" \
+	"kerneladdr=0x40007000\0" \
+	"ramdiskaddr=0x48000000\0" \
+	"console=ttySAC2,115200n8\0" \
+	"mmcdev=0\0" \
+	"bootenv=uEnv.txt\0" \
+	"loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
+	"importbootenv=echo Importing environment from mmc ...; " \
+		"env import -t $loadaddr $filesize\0" \
+	"loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
+	"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
+		"source ${loadaddr}\0"
+#define CONFIG_BOOTCOMMAND \
+	"if mmc rescan; then " \
+		"echo SD/MMC found on device ${mmcdev}; " \
+		"if run loadbootenv; then " \
+			"echo Loaded environment from ${bootenv}; " \
+			"run importbootenv; " \
+		"fi; " \
+		"if test -n $uenvcmd; then " \
+			"echo Running uenvcmd ...; " \
+			"run uenvcmd; " \
+		"fi; " \
+		"if run loadbootscript; then " \
+			"run bootscript; " \
+		"fi; " \
+	"fi; " \
+	"load mmc ${mmcdev} ${loadaddr} uImage; bootm ${loadaddr} "
 
 #define CONFIG_IDENT_STRING		" for ORIGEN"
 
-- 
1.8.4.5

[U-Boot] [PATCH] ORIGEN: Enhance origen config to be more flexible on boot.

[Guillaume GARDET]

This patch enhances the boot of origen board by adding support to ext2, bootz, initrd, bootenv loading and boot script.
It still keeps the previous mmc load command if boot script fails.

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

---
 include/configs/origen.h | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/include/configs/origen.h b/include/configs/origen.h
index 5d24916..2117fe1 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -61,6 +61,10 @@
 #undef CONFIG_CMD_PING
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_DHCP
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FS_GENERIC
+#define CONFIG_CMD_BOOTZ
+#define CONFIG_SUPPORT_RAW_INITRD
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS
 
@@ -68,7 +72,36 @@
 #define COPY_BL2_FNPTR_ADDR	0x02020030
 #define CONFIG_SPL_TEXT_BASE	0x02021410
 
-#define CONFIG_BOOTCOMMAND	"fatload mmc 0 40007000 uImage; bootm 40007000"
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"loadaddr=0x40007000\0" \
+	"rdaddr=0x48000000\0" \
+	"kerneladdr=0x40007000\0" \
+	"ramdiskaddr=0x48000000\0" \
+	"console=ttySAC2,115200n8\0" \
+	"mmcdev=0\0" \
+	"bootenv=uEnv.txt\0" \
+	"loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
+	"importbootenv=echo Importing environment from mmc ...; " \
+		"env import -t $loadaddr $filesize\0" \
+	"loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
+	"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
+		"source ${loadaddr}\0"
+#define CONFIG_BOOTCOMMAND \
+	"if mmc rescan; then " \
+		"echo SD/MMC found on device ${mmcdev}; " \
+		"if run loadbootenv; then " \
+			"echo Loaded environment from ${bootenv}; " \
+			"run importbootenv; " \
+		"fi; " \
+		"if test -n $uenvcmd; then " \
+			"echo Running uenvcmd ...; " \
+			"run uenvcmd; " \
+		"fi; " \
+		"if run loadbootscript; then " \
+			"run bootscript; " \
+		"fi; " \
+	"fi; " \
+	"load mmc ${mmcdev} ${loadaddr} uImage; bootm ${loadaddr} "
 
 #define CONFIG_IDENT_STRING		" for ORIGEN"
 
-- 
1.8.4.5

[U-Boot] [PATCH] ORIGEN: Enhance origen config to be more flexible on boot.

[Guillaume Gardet]

Ping.

Guillaume

Le 19/09/2014 15:32, Guillaume GARDET a ?crit :
> This patch enhances the boot of origen board by adding support to ext2, bootz, initrd, bootenv loading and boot script.
> It still keeps the previous mmc load command if boot script fails.
>
> Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
> Cc: Minkyu Kang <mk7.kang@samsung.com>
>
> ---
>   include/configs/origen.h | 35 ++++++++++++++++++++++++++++++++++-
>   1 file changed, 34 insertions(+), 1 deletion(-)
>
> diff --git a/include/configs/origen.h b/include/configs/origen.h
> index 5d24916..2117fe1 100644
> --- a/include/configs/origen.h
> +++ b/include/configs/origen.h
> @@ -61,6 +61,10 @@
>   #undef CONFIG_CMD_PING
>   #define CONFIG_CMD_ELF
>   #define CONFIG_CMD_DHCP
> +#define CONFIG_CMD_EXT2
> +#define CONFIG_CMD_FS_GENERIC
> +#define CONFIG_CMD_BOOTZ
> +#define CONFIG_SUPPORT_RAW_INITRD
>   #undef CONFIG_CMD_NET
>   #undef CONFIG_CMD_NFS
>   
> @@ -68,7 +72,36 @@
>   #define COPY_BL2_FNPTR_ADDR	0x02020030
>   #define CONFIG_SPL_TEXT_BASE	0x02021410
>   
> -#define CONFIG_BOOTCOMMAND	"fatload mmc 0 40007000 uImage; bootm 40007000"
> +#define CONFIG_EXTRA_ENV_SETTINGS \
> +	"loadaddr=0x40007000\0" \
> +	"rdaddr=0x48000000\0" \
> +	"kerneladdr=0x40007000\0" \
> +	"ramdiskaddr=0x48000000\0" \
> +	"console=ttySAC2,115200n8\0" \
> +	"mmcdev=0\0" \
> +	"bootenv=uEnv.txt\0" \
> +	"loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
> +	"importbootenv=echo Importing environment from mmc ...; " \
> +		"env import -t $loadaddr $filesize\0" \
> +	"loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
> +	"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
> +		"source ${loadaddr}\0"
> +#define CONFIG_BOOTCOMMAND \
> +	"if mmc rescan; then " \
> +		"echo SD/MMC found on device ${mmcdev}; " \
> +		"if run loadbootenv; then " \
> +			"echo Loaded environment from ${bootenv}; " \
> +			"run importbootenv; " \
> +		"fi; " \
> +		"if test -n $uenvcmd; then " \
> +			"echo Running uenvcmd ...; " \
> +			"run uenvcmd; " \
> +		"fi; " \
> +		"if run loadbootscript; then " \
> +			"run bootscript; " \
> +		"fi; " \
> +	"fi; " \
> +	"load mmc ${mmcdev} ${loadaddr} uImage; bootm ${loadaddr} "
>   
>   #define CONFIG_IDENT_STRING		" for ORIGEN"
>   

[U-Boot] [PATCH] ORIGEN: Enhance origen config to be more flexible on boot.

[Minkyu Kang]

Hi,

On 29/09/14 15:35, Guillaume Gardet wrote:
> Ping.
> 
> Guillaume
> 
> Le 19/09/2014 15:32, Guillaume GARDET a ?crit :
>> This patch enhances the boot of origen board by adding support to ext2, bootz, initrd, bootenv loading and boot script.
>> It still keeps the previous mmc load command if boot script fails.
>>
>> Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
>> Cc: Minkyu Kang <mk7.kang@samsung.com>
>>
>> ---
>>   include/configs/origen.h | 35 ++++++++++++++++++++++++++++++++++-
>>   1 file changed, 34 insertions(+), 1 deletion(-)
>>

Since Simon's patches are merged your patches are failed to apply.
Please recheck this patch.

Thanks,
Minkyu Kang.

[U-Boot] [PATCH V2] ORIGEN: Enhance origen config to be more flexible on boot.

[Guillaume GARDET]

V2: rebased on latest GIT version

V1: This patch enhances the boot of origen board by adding support to ext2, bootz, initrd, bootenv loading and boot script.
It still keeps the previous mmc load command if boot script fails.

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

---
 include/configs/origen.h | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/include/configs/origen.h b/include/configs/origen.h
index da9d6a1..8f1e256 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -56,6 +56,10 @@
 #undef CONFIG_CMD_PING
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_DHCP
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FS_GENERIC
+#define CONFIG_CMD_BOOTZ
+#define CONFIG_SUPPORT_RAW_INITRD
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS
 
@@ -63,7 +67,36 @@
 #define COPY_BL2_FNPTR_ADDR	0x02020030
 #define CONFIG_SPL_TEXT_BASE	0x02021410
 
-#define CONFIG_BOOTCOMMAND	"fatload mmc 0 40007000 uImage; bootm 40007000"
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"loadaddr=0x40007000\0" \
+	"rdaddr=0x48000000\0" \
+	"kerneladdr=0x40007000\0" \
+	"ramdiskaddr=0x48000000\0" \
+	"console=ttySAC2,115200n8\0" \
+	"mmcdev=0\0" \
+	"bootenv=uEnv.txt\0" \
+	"loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
+	"importbootenv=echo Importing environment from mmc ...; " \
+		"env import -t $loadaddr $filesize\0" \
+        "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
+        "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
+                "source ${loadaddr}\0"
+#define CONFIG_BOOTCOMMAND \
+	"if mmc rescan; then " \
+		"echo SD/MMC found on device ${mmcdev};" \
+		"if run loadbootenv; then " \
+			"echo Loaded environment from ${bootenv};" \
+			"run importbootenv;" \
+		"fi;" \
+		"if test -n $uenvcmd; then " \
+			"echo Running uenvcmd ...;" \
+			"run uenvcmd;" \
+		"fi;" \
+		"if run loadbootscript; then " \
+			"run bootscript; " \
+		"fi; " \
+	"fi;" \
+	"load mmc ${mmcdev} ${loadaddr} uImage; bootm ${loadaddr} "
 
 #define CONFIG_IDENT_STRING		" for ORIGEN"
 
-- 
1.8.4.5

[U-Boot] [PATCH V2] ORIGEN: Enhance origen config to be more flexible on boot.

[Minkyu Kang]

On 08/10/14 22:04, Guillaume GARDET wrote:
> V2: rebased on latest GIT version
> 
> V1: This patch enhances the boot of origen board by adding support to ext2, bootz, initrd, bootenv loading and boot script.
> It still keeps the previous mmc load command if boot script fails.
> 
> Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
> Cc: Minkyu Kang <mk7.kang@samsung.com>
> 
> ---
>  include/configs/origen.h | 35 ++++++++++++++++++++++++++++++++++-
>  1 file changed, 34 insertions(+), 1 deletion(-)
> 

applied to u-boot-samsung.

Thanks,
Minkyu Kang.

[U-Boot] [PATCH V2] ORIGEN: Enhance origen config to be more flexible on boot.

[Sjoerd Simons]

On Tue, 2014-11-25 at 10:29 +0900, Minkyu Kang wrote:
> On 08/10/14 22:04, Guillaume GARDET wrote:
> > V2: rebased on latest GIT version
> > 
> > V1: This patch enhances the boot of origen board by adding support to ext2, bootz, initrd, bootenv loading and boot script.
> > It still keeps the previous mmc load command if boot script fails.
> > 
> > Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
> > Cc: Minkyu Kang <mk7.kang@samsung.com>
> > 
> > ---
> >  include/configs/origen.h | 35 ++++++++++++++++++++++++++++++++++-
> >  1 file changed, 34 insertions(+), 1 deletion(-)
> > 
> 
> applied to u-boot-samsung.

Would it not be better to standardize on the bootcmd from
config_distro_bootcmd.h, like Ian Campell did for exynos5 based boards?
_Especially_ when moving from current trivial bootcmds to a complex
ones. 

Not having standard bootcommands in the default u-boot settings, is
always a massive PITA when starting to work with new boards. Would be
great if that could slowly be fixed :) 

-- 
Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Collabora Ltd.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 6170 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141125/2c2b5309/attachment.bin>