Patchwork [U-Boot] mx51evk: Update environmet in order to allow booting a dt kernel

login
register
mail settings
Submitter Fabio Estevam
Date April 18, 2013, 11:37 p.m.
Message ID <1366328263-8468-1-git-send-email-festevam@gmail.com>
Download mbox | patch
Permalink /patch/237773/
State Superseded
Delegated to: Stefano Babic
Headers show

Comments

Fabio Estevam - April 18, 2013, 11:37 p.m.
From: Fabio Estevam <fabio.estevam@freescale.com>

Update the environment as done in other imx boards to allow easy switching 
between booting a non-dt kernel and a dt kernel.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 include/configs/mx51evk.h |   49 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 41 insertions(+), 8 deletions(-)
Wolfgang Denk - April 19, 2013, 5:29 a.m.
Dear Fabio Estevam,

In message <1366328263-8468-1-git-send-email-festevam@gmail.com> you wrote:
> 

There is a typo in the Subject:  s/environmet/environment/

> -	"mmcroot=/dev/mmcblk0p3 rw\0" \
> -	"mmcrootfstype=ext3 rootwait\0" \
> -	"mmcargs=setenv bootargs console=ttymxc0,${baudrate} " \
> -		"root=${mmcroot} " \
> -		"rootfstype=${mmcrootfstype}\0" \
> +	"mmcroot=/dev/mmcblk0p3 rw rootwait\0" \
> +	"mmcargs=setenv bootargs console=ttymxc0,${baudrate} root=${mmcroot}\0"\

You are dropping the "mmcrootfstype" part here.  Is this intentional?
If yes, it appears to be an unrelated change that should be done in a
separate commit.

Best regards,

Wolfgang Denk
Otavio Salvador - April 19, 2013, 12:14 p.m.
On Fri, Apr 19, 2013 at 2:29 AM, Wolfgang Denk <wd@denx.de> wrote:
> Dear Fabio Estevam,
>
> In message <1366328263-8468-1-git-send-email-festevam@gmail.com> you wrote:
>>
>
> There is a typo in the Subject:  s/environmet/environment/
>
>> -     "mmcroot=/dev/mmcblk0p3 rw\0" \
>> -     "mmcrootfstype=ext3 rootwait\0" \
>> -     "mmcargs=setenv bootargs console=ttymxc0,${baudrate} " \
>> -             "root=${mmcroot} " \
>> -             "rootfstype=${mmcrootfstype}\0" \
>> +     "mmcroot=/dev/mmcblk0p3 rw rootwait\0" \
>> +     "mmcargs=setenv bootargs console=ttymxc0,${baudrate} root=${mmcroot}\0"\
>
> You are dropping the "mmcrootfstype" part here.  Is this intentional?
> If yes, it appears to be an unrelated change that should be done in a
> separate commit.

He is doing the sync of environment being used here with the other
boards so I think the commit log could be reworded so it is clear
about it.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Patch

diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index cb3d938..594ff4b 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -149,32 +149,65 @@ 
 
 #define CONFIG_ETHPRIME		"FEC0"
 
-#define CONFIG_LOADADDR		0x90800000	/* loadaddr env var */
+#define CONFIG_LOADADDR		0x92000000	/* loadaddr env var */
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"uimage=uImage\0" \
+	"fdt_file=imx51-babbage.dtb\0" \
+	"fdt_addr=0x91000000\0" \
+	"boot_fdt=try\0" \
+	"ip_dyn=yes\0" \
 	"mmcdev=0\0" \
 	"mmcpart=2\0" \
-	"mmcroot=/dev/mmcblk0p3 rw\0" \
-	"mmcrootfstype=ext3 rootwait\0" \
-	"mmcargs=setenv bootargs console=ttymxc0,${baudrate} " \
-		"root=${mmcroot} " \
-		"rootfstype=${mmcrootfstype}\0" \
+	"mmcroot=/dev/mmcblk0p3 rw rootwait\0" \
+	"mmcargs=setenv bootargs console=ttymxc0,${baudrate} root=${mmcroot}\0"\
 	"loadbootscript=" \
 		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
 	"bootscript=echo Running bootscript from mmc ...; " \
 		"source\0" \
 	"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
+	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
-		"bootm\0" \
+		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+			"if run loadfdt; then " \
+				"bootm ${loadaddr} - ${fdt_addr}; " \
+			"else " \
+				"if test ${boot_fdt} = try; then " \
+					"bootm; " \
+				"else " \
+					"echo WARN: Cannot load the DT; " \
+				"fi; " \
+			"fi; " \
+		"else " \
+			"bootm; " \
+		"fi;\0" \
 	"netargs=setenv bootargs console=ttymxc0,${baudrate} " \
 		"root=/dev/nfs " \
 		"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
 	"netboot=echo Booting from net ...; " \
 		"run netargs; " \
-		"dhcp ${uimage}; bootm\0" \
+		"if test ${ip_dyn} = yes; then " \
+			"setenv get_cmd dhcp; " \
+		"else " \
+			"setenv get_cmd tftp; " \
+		"fi; " \
+		"${get_cmd} ${uimage}; " \
+		"if test ${boot_fdt} = yes ||  test ${boot_fdt} = try; then " \
+			"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
+				"bootm ${loadaddr} - ${fdt_addr}; " \
+			"else " \
+				"if test ${boot_fdt} = try; then " \
+					"bootm; " \
+				"else " \
+					"echo ERROR: Cannot load the DT; " \
+					"exit; " \
+				"fi; " \
+			"fi; " \
+		"else " \
+			"bootm; " \
+		"fi;\0"
 
 #define CONFIG_BOOTCOMMAND \
 	"mmc dev ${mmcdev}; if mmc rescan; then " \