public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH v5 0/6] Improve default environment for easy use
@ 2013-01-09 11:57 Otavio Salvador
  2013-01-09 11:57 ` [U-Boot] [PATCH v5 1/6] mx6qsabrelite: Use tabs to environment setting Otavio Salvador
                   ` (5 more replies)
  0 siblings, 6 replies; 12+ messages in thread
From: Otavio Salvador @ 2013-01-09 11:57 UTC (permalink / raw)
  To: u-boot

This patchset improves the default environment of machines currently
supported in OpenEmbedded and Yocto to  make it compatible with
mainline and Freescale BSP Linux kernel.

A new patch has been add to change the format in mx6qsabrelite in
environment setting and already merged patches removed from this new
pull request.

Changes in v5:
- Change subject
- Reword the warning

Changes in v4:
- Use a warning, instead of error when failing to fetch fdt
- Drop exit use
- Fix netboot
- Use fdt instead of ftd

Changes in v3:
- Add loadfdt
- Use loadfdt
- Call exit to abort script

Changes in v2:
- New patch
- reformat environment change to fit in 80 cols
- Allow use of dynamic/static ip
- Allow force use, or not, of fdt
- Change 'auto' to 'try'

Otavio Salvador (6):
  mx6qsabrelite: Use tabs to environment setting
  mx28evk: We shouldn't hardcode a rootfs filesystem type
  mx28evk: Add support to dynamically choose between fdt use or not
  mx53loco: Add support to dynamically choose between fdt use or not
  mx6qsabrelite: Add support to dynamically choose between fdt use or
    not
  mx6qsabre{auto,sd}: Add support to dynamically choose between fdt use
    or not

 include/configs/mx28evk.h          |   47 ++++++++++++++---
 include/configs/mx53loco.h         |   40 +++++++++++++-
 include/configs/mx6qsabre_common.h |   41 +++++++++++++--
 include/configs/mx6qsabreauto.h    |    1 +
 include/configs/mx6qsabrelite.h    |  101 ++++++++++++++++++++++++------------
 include/configs/mx6qsabresd.h      |    1 +
 6 files changed, 186 insertions(+), 45 deletions(-)

-- 
1.7.10.4

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

* [U-Boot] [PATCH v5 1/6] mx6qsabrelite: Use tabs to environment setting
  2013-01-09 11:57 [U-Boot] [PATCH v5 0/6] Improve default environment for easy use Otavio Salvador
@ 2013-01-09 11:57 ` Otavio Salvador
  2013-01-09 12:10   ` Liu Hui-R64343
  2013-01-09 11:57 ` [U-Boot] [PATCH v5 2/6] mx28evk: We shouldn't hardcode a rootfs filesystem type Otavio Salvador
                   ` (4 subsequent siblings)
  5 siblings, 1 reply; 12+ messages in thread
From: Otavio Salvador @ 2013-01-09 11:57 UTC (permalink / raw)
  To: u-boot

This rework the environment to use tabs for environment setting as
done in other boards.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2:
- New patch

 include/configs/mx6qsabrelite.h |   66 +++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h
index 0f6bbb4..ee86f9b 100644
--- a/include/configs/mx6qsabrelite.h
+++ b/include/configs/mx6qsabrelite.h
@@ -152,43 +152,43 @@
 #define CONFIG_SYS_TEXT_BASE	       0x17800000
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "script=boot.scr\0" \
-       "uimage=uImage\0" \
+	"script=boot.scr\0" \
+	"uimage=uImage\0" \
 	"console=ttymxc1\0" \
-	"fdt_high=0xffffffff\0"	  \
+	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
-       "mmcdev=0\0" \
-       "mmcpart=2\0" \
-       "mmcroot=/dev/mmcblk0p3 rootwait rw\0" \
-       "mmcargs=setenv bootargs console=${console},${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" \
-       "mmcboot=echo Booting from mmc ...; " \
-	       "run mmcargs; " \
-	       "bootm\0" \
-       "netargs=setenv bootargs console=${console},${baudrate} " \
-	       "root=/dev/nfs " \
-	       "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
-       "netboot=echo Booting from net ...; " \
-	       "run netargs; " \
-	       "dhcp ${uimage}; bootm\0" \
+	"mmcdev=0\0" \
+	"mmcpart=2\0" \
+	"mmcroot=/dev/mmcblk0p3 rootwait rw\0" \
+	"mmcargs=setenv bootargs console=${console},${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" \
+	"mmcboot=echo Booting from mmc ...; " \
+		"run mmcargs; " \
+		"bootm\0" \
+	"netargs=setenv bootargs console=${console},${baudrate} " \
+		"root=/dev/nfs " \
+	"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
+		"netboot=echo Booting from net ...; " \
+		"run netargs; " \
+		"dhcp ${uimage}; bootm\0"
 
 #define CONFIG_BOOTCOMMAND \
-       "mmc dev ${mmcdev};" \
-       "mmc dev ${mmcdev}; if mmc rescan; then " \
-	       "if run loadbootscript; then " \
-		       "run bootscript; " \
-	       "else " \
-		       "if run loaduimage; then " \
-			       "run mmcboot; " \
-		       "else run netboot; " \
-		       "fi; " \
-	       "fi; " \
-       "else run netboot; fi"
+	   "mmc dev ${mmcdev};" \
+	   "mmc dev ${mmcdev}; if mmc rescan; then " \
+		   "if run loadbootscript; then " \
+			   "run bootscript; " \
+		   "else " \
+			   "if run loaduimage; then " \
+				   "run mmcboot; " \
+			   "else run netboot; " \
+			   "fi; " \
+		   "fi; " \
+	   "else run netboot; fi"
 
 #define CONFIG_ARP_TIMEOUT     200UL
 
-- 
1.7.10.4

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

* [U-Boot] [PATCH v5 2/6] mx28evk: We shouldn't hardcode a rootfs filesystem type
  2013-01-09 11:57 [U-Boot] [PATCH v5 0/6] Improve default environment for easy use Otavio Salvador
  2013-01-09 11:57 ` [U-Boot] [PATCH v5 1/6] mx6qsabrelite: Use tabs to environment setting Otavio Salvador
@ 2013-01-09 11:57 ` Otavio Salvador
  2013-01-09 11:57 ` [U-Boot] [PATCH v5 3/6] mx28evk: Add support to dynamically choose between fdt use or not Otavio Salvador
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 12+ messages in thread
From: Otavio Salvador @ 2013-01-09 11:57 UTC (permalink / raw)
  To: u-boot

For a generic environment, we shouldn't have a fixed rootfs filesystem
so we drop it from env.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2:
 - reformat environment change to fit in 80 cols

 include/configs/mx28evk.h |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 8b89b25..ac9522f 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -292,11 +292,9 @@
 	"console_mainline=ttyAMA0\0" \
 	"mmcdev=0\0" \
 	"mmcpart=2\0" \
-	"mmcroot=/dev/mmcblk0p3 rw\0" \
-	"mmcrootfstype=ext3 rootwait\0"	\
-	"mmcargs=setenv bootargs console=${console_mainline},${baudrate} " \
-		"root=${mmcroot} " \
-		"rootfstype=${mmcrootfstype}\0"	\
+	"mmcroot=/dev/mmcblk0p3 rw rootwait\0" \
+	"mmcargs=setenv bootargs console=${console_mainline},${baudrate} "
+		"root=${mmcroot}\0" \
 	"loadbootscript="  \
 		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
 	"bootscript=echo Running bootscript from mmc ...; "	\
-- 
1.7.10.4

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

* [U-Boot] [PATCH v5 3/6] mx28evk: Add support to dynamically choose between fdt use or not
  2013-01-09 11:57 [U-Boot] [PATCH v5 0/6] Improve default environment for easy use Otavio Salvador
  2013-01-09 11:57 ` [U-Boot] [PATCH v5 1/6] mx6qsabrelite: Use tabs to environment setting Otavio Salvador
  2013-01-09 11:57 ` [U-Boot] [PATCH v5 2/6] mx28evk: We shouldn't hardcode a rootfs filesystem type Otavio Salvador
@ 2013-01-09 11:57 ` Otavio Salvador
  2013-01-09 11:57 ` [U-Boot] [PATCH v5 4/6] mx53loco: " Otavio Salvador
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 12+ messages in thread
From: Otavio Salvador @ 2013-01-09 11:57 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v5:
- Change subject
- Reword the warning

Changes in v4:
- Use a warning, instead of error when failing to fetch fdt
- Drop exit use
- Fix netboot
- Use fdt instead of ftd

Changes in v3:
- Add loadfdt
- Use loadfdt
- Call exit to abort script

Changes in v2:
- Allow use of dynamic/static ip
- Allow force use, or not, of fdt
- Change 'auto' to 'try'

 include/configs/mx28evk.h |   39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index ac9522f..4a95156 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -290,6 +290,10 @@
 	"uimage=uImage\0" \
 	"console_fsl=ttyAM0\0" \
 	"console_mainline=ttyAMA0\0" \
+	"fdt_file=imx28-evk.dtb\0" \
+	"fdt_addr=0x41000000\0" \
+	"boot_fdt=try\0" \
+	"ip_dyn=yes\0" \
 	"mmcdev=0\0" \
 	"mmcpart=2\0" \
 	"mmcroot=/dev/mmcblk0p3 rw rootwait\0" \
@@ -300,15 +304,46 @@
 	"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; 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=${console_mainline},${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; then " \
+			"if ${get_cmd} ${fdt_addr} ${fdt_file}; 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"
 
 #define CONFIG_BOOTCOMMAND \
 	"mmc dev ${mmcdev}; if mmc rescan; then " \
-- 
1.7.10.4

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

* [U-Boot] [PATCH v5 4/6] mx53loco: Add support to dynamically choose between fdt use or not
  2013-01-09 11:57 [U-Boot] [PATCH v5 0/6] Improve default environment for easy use Otavio Salvador
                   ` (2 preceding siblings ...)
  2013-01-09 11:57 ` [U-Boot] [PATCH v5 3/6] mx28evk: Add support to dynamically choose between fdt use or not Otavio Salvador
@ 2013-01-09 11:57 ` Otavio Salvador
  2013-01-09 12:12   ` Liu Hui-R64343
  2013-01-09 18:21   ` Stefano Babic
  2013-01-09 11:57 ` [U-Boot] [PATCH v5 5/6] mx6qsabrelite: " Otavio Salvador
  2013-01-09 11:58 ` [U-Boot] [PATCH v5 6/6] mx6qsabre{auto, sd}: " Otavio Salvador
  5 siblings, 2 replies; 12+ messages in thread
From: Otavio Salvador @ 2013-01-09 11:57 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v5:
- Change subject
- Reword the warning

Changes in v4:
- Use a warning, instead of error when failing to fetch fdt
- Drop exit use
- Fix netboot
- Use fdt instead of ftd

Changes in v3:
- Add loadfdt
- Use loadfdt
- Call exit to abort script

Changes in v2:
- Allow use of dynamic/static ip
- Allow force use, or not, of fdt
- Change 'auto' to 'try'

 include/configs/mx53loco.h |   40 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 996396b..cbc3a82 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -119,6 +119,10 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"uimage=uImage\0" \
+	"fdt_file=imx53-qsb.dtb\0" \
+	"fdt_addr=0x71000000\0" \
+	"boot_fdt=try\0" \
+	"ip_dyn=yes\0" \
 	"mmcdev=0\0" \
 	"mmcpart=2\0" \
 	"mmcroot=/dev/mmcblk0p3 rw rootwait\0" \
@@ -128,15 +132,47 @@
 	"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; 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; 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 " \
-- 
1.7.10.4

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

* [U-Boot] [PATCH v5 5/6] mx6qsabrelite: Add support to dynamically choose between fdt use or not
  2013-01-09 11:57 [U-Boot] [PATCH v5 0/6] Improve default environment for easy use Otavio Salvador
                   ` (3 preceding siblings ...)
  2013-01-09 11:57 ` [U-Boot] [PATCH v5 4/6] mx53loco: " Otavio Salvador
@ 2013-01-09 11:57 ` Otavio Salvador
  2013-01-09 12:11   ` Liu Hui-R64343
  2013-01-09 11:58 ` [U-Boot] [PATCH v5 6/6] mx6qsabre{auto, sd}: " Otavio Salvador
  5 siblings, 1 reply; 12+ messages in thread
From: Otavio Salvador @ 2013-01-09 11:57 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v5:
- Change subject
- Reword the warning

Changes in v4:
- Use a warning, instead of error when failing to fetch fdt
- Drop exit use
- Fix netboot
- Use fdt instead of ftd

Changes in v3:
- Add loadfdt
- Use loadfdt
- Call exit to abort script

Changes in v2:
- Allow use of dynamic/static ip
- Allow force use, or not, of fdt
- Change 'auto' to 'try'

 include/configs/mx6qsabrelite.h |   39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h
index ee86f9b..fbcab2f 100644
--- a/include/configs/mx6qsabrelite.h
+++ b/include/configs/mx6qsabrelite.h
@@ -157,6 +157,10 @@
 	"console=ttymxc1\0" \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
+	"fdt_file=imx6q-sabrelite.dtb\0" \
+	"fdt_addr=0x11000000\0" \
+	"boot_fdt=try\0" \
+	"ip_dyn=yes\0" \
 	"mmcdev=0\0" \
 	"mmcpart=2\0" \
 	"mmcroot=/dev/mmcblk0p3 rootwait rw\0" \
@@ -167,15 +171,46 @@
 	"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; 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=${console},${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; then " \
+			"if ${get_cmd} ${fdt_addr} ${fdt_file}; 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"
 
 #define CONFIG_BOOTCOMMAND \
 	   "mmc dev ${mmcdev};" \
-- 
1.7.10.4

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

* [U-Boot] [PATCH v5 6/6] mx6qsabre{auto, sd}: Add support to dynamically choose between fdt use or not
  2013-01-09 11:57 [U-Boot] [PATCH v5 0/6] Improve default environment for easy use Otavio Salvador
                   ` (4 preceding siblings ...)
  2013-01-09 11:57 ` [U-Boot] [PATCH v5 5/6] mx6qsabrelite: " Otavio Salvador
@ 2013-01-09 11:58 ` Otavio Salvador
  2013-01-09 12:12   ` Liu Hui-R64343
  5 siblings, 1 reply; 12+ messages in thread
From: Otavio Salvador @ 2013-01-09 11:58 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v5:
- Change subject
- Reword the warning

Changes in v4:
- Use a warning, instead of error when failing to fetch fdt
- Drop exit use
- Fix netboot
- Use fdt instead of ftd

Changes in v3:
- Add loadfdt
- Use loadfdt
- Call exit to abort script

Changes in v2:
- Allow use of dynamic/static ip
- Allow force use, or not, of fdt
- Change 'auto' to 'try'

 include/configs/mx6qsabre_common.h |   41 +++++++++++++++++++++++++++++++++---
 include/configs/mx6qsabreauto.h    |    1 +
 include/configs/mx6qsabresd.h      |    1 +
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h
index bd2fb10..0f0e51f 100644
--- a/include/configs/mx6qsabre_common.h
+++ b/include/configs/mx6qsabre_common.h
@@ -83,6 +83,10 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"uimage=uImage\0" \
+	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
+	"fdt_addr=0x11000000\0" \
+	"boot_fdt=try\0" \
+	"ip_dyn=yes\0" \
 	"console=" CONFIG_CONSOLE_DEV "\0" \
 	"fdt_high=0xffffffff\0"	  \
 	"initrd_high=0xffffffff\0" \
@@ -96,15 +100,46 @@
 	"bootscript=echo Running bootscript from mmc ...; " \
 		"source\0" \
 	"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
-		"mmcboot=echo Booting from mmc ...; " \
+	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
-		"bootm\0" \
+		"if test ${boot_fdt} = yes; 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=${console},${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; then " \
+			"if ${get_cmd} ${fdt_addr} ${fdt_file}; 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"
 
 #define CONFIG_BOOTCOMMAND \
 	"mmc dev ${mmcdev};" \
diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
index f1ff201..f4a082a 100644
--- a/include/configs/mx6qsabreauto.h
+++ b/include/configs/mx6qsabreauto.h
@@ -15,6 +15,7 @@
 #define CONFIG_MACH_TYPE	3529
 #define CONFIG_MXC_UART_BASE	UART4_BASE
 #define CONFIG_CONSOLE_DEV		"ttymxc3"
+#define CONFIG_DEFAULT_FDT_FILE	"imx6q-sabreauto.dtb"
 #define CONFIG_MMCROOT			"/dev/mmcblk0p2"
 #define PHYS_SDRAM_SIZE		(2u * 1024 * 1024 * 1024)
 
diff --git a/include/configs/mx6qsabresd.h b/include/configs/mx6qsabresd.h
index a1d9285..b64e925 100644
--- a/include/configs/mx6qsabresd.h
+++ b/include/configs/mx6qsabresd.h
@@ -21,6 +21,7 @@
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 #define CONFIG_CONSOLE_DEV		"ttymxc0"
 #define CONFIG_MMCROOT			"/dev/mmcblk1p2"
+#define CONFIG_DEFAULT_FDT_FILE	"imx6q-sabresd.dtb"
 #define PHYS_SDRAM_SIZE		(1u * 1024 * 1024 * 1024)
 
 #include "mx6qsabre_common.h"
-- 
1.7.10.4

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

* [U-Boot] [PATCH v5 1/6] mx6qsabrelite: Use tabs to environment setting
  2013-01-09 11:57 ` [U-Boot] [PATCH v5 1/6] mx6qsabrelite: Use tabs to environment setting Otavio Salvador
@ 2013-01-09 12:10   ` Liu Hui-R64343
  0 siblings, 0 replies; 12+ messages in thread
From: Liu Hui-R64343 @ 2013-01-09 12:10 UTC (permalink / raw)
  To: u-boot

>-----Original Message-----
From: u-boot-bounces@lists.denx.de [mailto:u-boot-bounces at lists.denx.de]
>On Behalf Of Otavio Salvador
>Sent: Wednesday, January 09, 2013 7:58 PM
>To: U-Boot Mailing List
>Cc: Estevam Fabio-R49496; Otavio Salvador
>Subject: [U-Boot] [PATCH v5 1/6] mx6qsabrelite: Use tabs to environment
>setting
>
>This rework the environment to use tabs for environment setting as done in
>other boards.
>
>Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>---
>Changes in v5: None
>Changes in v4: None
>Changes in v3: None
>Changes in v2:
>- New patch
>
> include/configs/mx6qsabrelite.h |   66 +++++++++++++++++++--------------------
> 1 file changed, 33 insertions(+), 33 deletions(-)

Acked-by: Jason Liu <r64343@freescale.com>

>
>diff --git a/include/configs/mx6qsabrelite.h
>b/include/configs/mx6qsabrelite.h index 0f6bbb4..ee86f9b 100644
>--- a/include/configs/mx6qsabrelite.h
>+++ b/include/configs/mx6qsabrelite.h
>@@ -152,43 +152,43 @@
> #define CONFIG_SYS_TEXT_BASE	       0x17800000
>
> #define CONFIG_EXTRA_ENV_SETTINGS \
>-       "script=boot.scr\0" \
>-       "uimage=uImage\0" \
>+	"script=boot.scr\0" \
>+	"uimage=uImage\0" \
> 	"console=ttymxc1\0" \
>-	"fdt_high=0xffffffff\0"	  \
>+	"fdt_high=0xffffffff\0" \
> 	"initrd_high=0xffffffff\0" \
>-       "mmcdev=0\0" \
>-       "mmcpart=2\0" \
>-       "mmcroot=/dev/mmcblk0p3 rootwait rw\0" \
>-       "mmcargs=setenv bootargs console=${console},${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" \
>-       "mmcboot=echo Booting from mmc ...; " \
>-	       "run mmcargs; " \
>-	       "bootm\0" \
>-       "netargs=setenv bootargs console=${console},${baudrate} " \
>-	       "root=/dev/nfs " \
>-	       "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
>-       "netboot=echo Booting from net ...; " \
>-	       "run netargs; " \
>-	       "dhcp ${uimage}; bootm\0" \
>+	"mmcdev=0\0" \
>+	"mmcpart=2\0" \
>+	"mmcroot=/dev/mmcblk0p3 rootwait rw\0" \
>+	"mmcargs=setenv bootargs console=${console},${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" \
>+	"mmcboot=echo Booting from mmc ...; " \
>+		"run mmcargs; " \
>+		"bootm\0" \
>+	"netargs=setenv bootargs console=${console},${baudrate} " \
>+		"root=/dev/nfs " \
>+	"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
>+		"netboot=echo Booting from net ...; " \
>+		"run netargs; " \
>+		"dhcp ${uimage}; bootm\0"
>
> #define CONFIG_BOOTCOMMAND \
>-       "mmc dev ${mmcdev};" \
>-       "mmc dev ${mmcdev}; if mmc rescan; then " \
>-	       "if run loadbootscript; then " \
>-		       "run bootscript; " \
>-	       "else " \
>-		       "if run loaduimage; then " \
>-			       "run mmcboot; " \
>-		       "else run netboot; " \
>-		       "fi; " \
>-	       "fi; " \
>-       "else run netboot; fi"
>+	   "mmc dev ${mmcdev};" \
>+	   "mmc dev ${mmcdev}; if mmc rescan; then " \
>+		   "if run loadbootscript; then " \
>+			   "run bootscript; " \
>+		   "else " \
>+			   "if run loaduimage; then " \
>+				   "run mmcboot; " \
>+			   "else run netboot; " \
>+			   "fi; " \
>+		   "fi; " \
>+	   "else run netboot; fi"
>
> #define CONFIG_ARP_TIMEOUT     200UL
>
>--
>1.7.10.4
>
>_______________________________________________
>U-Boot mailing list
>U-Boot at lists.denx.de
>http://lists.denx.de/mailman/listinfo/u-boot

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

* [U-Boot] [PATCH v5 5/6] mx6qsabrelite: Add support to dynamically choose between fdt use or not
  2013-01-09 11:57 ` [U-Boot] [PATCH v5 5/6] mx6qsabrelite: " Otavio Salvador
@ 2013-01-09 12:11   ` Liu Hui-R64343
  0 siblings, 0 replies; 12+ messages in thread
From: Liu Hui-R64343 @ 2013-01-09 12:11 UTC (permalink / raw)
  To: u-boot

>-----Original Message-----
From: u-boot-bounces@lists.denx.de [mailto:u-boot-bounces at lists.denx.de]
>On Behalf Of Otavio Salvador
>Sent: Wednesday, January 09, 2013 7:58 PM
>To: U-Boot Mailing List
>Cc: Estevam Fabio-R49496; Otavio Salvador
>Subject: [U-Boot] [PATCH v5 5/6] mx6qsabrelite: Add support to dynamically
>choose between fdt use or not
>
>Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>---
>Changes in v5:
>- Change subject
>- Reword the warning
>
>Changes in v4:
>- Use a warning, instead of error when failing to fetch fdt
>- Drop exit use
>- Fix netboot
>- Use fdt instead of ftd
>
>Changes in v3:
>- Add loadfdt
>- Use loadfdt
>- Call exit to abort script
>
>Changes in v2:
>- Allow use of dynamic/static ip
>- Allow force use, or not, of fdt
>- Change 'auto' to 'try'
>
> include/configs/mx6qsabrelite.h |   39
>+++++++++++++++++++++++++++++++++++++--
> 1 file changed, 37 insertions(+), 2 deletions(-)

Acked-by: Jason Liu <r64343@freescale.com>

>
>diff --git a/include/configs/mx6qsabrelite.h
>b/include/configs/mx6qsabrelite.h index ee86f9b..fbcab2f 100644
>--- a/include/configs/mx6qsabrelite.h
>+++ b/include/configs/mx6qsabrelite.h
>@@ -157,6 +157,10 @@
> 	"console=ttymxc1\0" \
> 	"fdt_high=0xffffffff\0" \
> 	"initrd_high=0xffffffff\0" \
>+	"fdt_file=imx6q-sabrelite.dtb\0" \
>+	"fdt_addr=0x11000000\0" \
>+	"boot_fdt=try\0" \
>+	"ip_dyn=yes\0" \
> 	"mmcdev=0\0" \
> 	"mmcpart=2\0" \
> 	"mmcroot=/dev/mmcblk0p3 rootwait rw\0" \ @@ -167,15 +171,46
>@@
> 	"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; 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=${console},${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; then " \
>+			"if ${get_cmd} ${fdt_addr} ${fdt_file}; 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"
>
> #define CONFIG_BOOTCOMMAND \
> 	   "mmc dev ${mmcdev};" \
>--
>1.7.10.4
>
>_______________________________________________
>U-Boot mailing list
>U-Boot at lists.denx.de
>http://lists.denx.de/mailman/listinfo/u-boot

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

* [U-Boot] [PATCH v5 6/6] mx6qsabre{auto, sd}: Add support to dynamically choose between fdt use or not
  2013-01-09 11:58 ` [U-Boot] [PATCH v5 6/6] mx6qsabre{auto, sd}: " Otavio Salvador
@ 2013-01-09 12:12   ` Liu Hui-R64343
  0 siblings, 0 replies; 12+ messages in thread
From: Liu Hui-R64343 @ 2013-01-09 12:12 UTC (permalink / raw)
  To: u-boot

>-----Original Message-----
From: u-boot-bounces@lists.denx.de [mailto:u-boot-bounces at lists.denx.de]
>On Behalf Of Otavio Salvador
>Sent: Wednesday, January 09, 2013 7:58 PM
>To: U-Boot Mailing List
>Cc: Estevam Fabio-R49496; Otavio Salvador
>Subject: [U-Boot] [PATCH v5 6/6] mx6qsabre{auto, sd}: Add support to
>dynamically choose between fdt use or not
>
>Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>---
>Changes in v5:
>- Change subject
>- Reword the warning
>
>Changes in v4:
>- Use a warning, instead of error when failing to fetch fdt
>- Drop exit use
>- Fix netboot
>- Use fdt instead of ftd
>
>Changes in v3:
>- Add loadfdt
>- Use loadfdt
>- Call exit to abort script
>
>Changes in v2:
>- Allow use of dynamic/static ip
>- Allow force use, or not, of fdt
>- Change 'auto' to 'try'
>
> include/configs/mx6qsabre_common.h |   41
>+++++++++++++++++++++++++++++++++---

Acked-by: Jason Liu <r64343@freescale.com>

> include/configs/mx6qsabreauto.h    |    1 +
> include/configs/mx6qsabresd.h      |    1 +
> 3 files changed, 40 insertions(+), 3 deletions(-)
>
>diff --git a/include/configs/mx6qsabre_common.h
>b/include/configs/mx6qsabre_common.h
>index bd2fb10..0f0e51f 100644
>--- a/include/configs/mx6qsabre_common.h
>+++ b/include/configs/mx6qsabre_common.h
>@@ -83,6 +83,10 @@
> #define CONFIG_EXTRA_ENV_SETTINGS \
> 	"script=boot.scr\0" \
> 	"uimage=uImage\0" \
>+	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
>+	"fdt_addr=0x11000000\0" \
>+	"boot_fdt=try\0" \
>+	"ip_dyn=yes\0" \
> 	"console=" CONFIG_CONSOLE_DEV "\0" \
> 	"fdt_high=0xffffffff\0"	  \
> 	"initrd_high=0xffffffff\0" \
>@@ -96,15 +100,46 @@
> 	"bootscript=echo Running bootscript from mmc ...; " \
> 		"source\0" \
> 	"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr}
>${uimage}\0" \
>-		"mmcboot=echo Booting from mmc ...; " \
>+	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr}
>${fdt_file}\0" \
>+	"mmcboot=echo Booting from mmc ...; " \
> 		"run mmcargs; " \
>-		"bootm\0" \
>+		"if test ${boot_fdt} = yes; 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=${console},${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; then " \
>+			"if ${get_cmd} ${fdt_addr} ${fdt_file}; 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"
>
> #define CONFIG_BOOTCOMMAND \
> 	"mmc dev ${mmcdev};" \
>diff --git a/include/configs/mx6qsabreauto.h
>b/include/configs/mx6qsabreauto.h index f1ff201..f4a082a 100644
>--- a/include/configs/mx6qsabreauto.h
>+++ b/include/configs/mx6qsabreauto.h
>@@ -15,6 +15,7 @@
> #define CONFIG_MACH_TYPE	3529
> #define CONFIG_MXC_UART_BASE	UART4_BASE
> #define CONFIG_CONSOLE_DEV		"ttymxc3"
>+#define CONFIG_DEFAULT_FDT_FILE	"imx6q-sabreauto.dtb"
> #define CONFIG_MMCROOT			"/dev/mmcblk0p2"
> #define PHYS_SDRAM_SIZE		(2u * 1024 * 1024 * 1024)
>
>diff --git a/include/configs/mx6qsabresd.h b/include/configs/mx6qsabresd.h
>index a1d9285..b64e925 100644
>--- a/include/configs/mx6qsabresd.h
>+++ b/include/configs/mx6qsabresd.h
>@@ -21,6 +21,7 @@
> #define CONFIG_MXC_UART_BASE	UART1_BASE
> #define CONFIG_CONSOLE_DEV		"ttymxc0"
> #define CONFIG_MMCROOT			"/dev/mmcblk1p2"
>+#define CONFIG_DEFAULT_FDT_FILE	"imx6q-sabresd.dtb"
> #define PHYS_SDRAM_SIZE		(1u * 1024 * 1024 * 1024)
>
> #include "mx6qsabre_common.h"
>--
>1.7.10.4
>
>_______________________________________________
>U-Boot mailing list
>U-Boot at lists.denx.de
>http://lists.denx.de/mailman/listinfo/u-boot

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

* [U-Boot] [PATCH v5 4/6] mx53loco: Add support to dynamically choose between fdt use or not
  2013-01-09 11:57 ` [U-Boot] [PATCH v5 4/6] mx53loco: " Otavio Salvador
@ 2013-01-09 12:12   ` Liu Hui-R64343
  2013-01-09 18:21   ` Stefano Babic
  1 sibling, 0 replies; 12+ messages in thread
From: Liu Hui-R64343 @ 2013-01-09 12:12 UTC (permalink / raw)
  To: u-boot

>-----Original Message-----
From: u-boot-bounces@lists.denx.de [mailto:u-boot-bounces at lists.denx.de]
>On Behalf Of Otavio Salvador
>Sent: Wednesday, January 09, 2013 7:58 PM
>To: U-Boot Mailing List
>Cc: Estevam Fabio-R49496; Otavio Salvador
>Subject: [U-Boot] [PATCH v5 4/6] mx53loco: Add support to dynamically
>choose between fdt use or not
>
>Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>---
>Changes in v5:
>- Change subject
>- Reword the warning
>
>Changes in v4:
>- Use a warning, instead of error when failing to fetch fdt
>- Drop exit use
>- Fix netboot
>- Use fdt instead of ftd
>
>Changes in v3:
>- Add loadfdt
>- Use loadfdt
>- Call exit to abort script
>
>Changes in v2:
>- Allow use of dynamic/static ip
>- Allow force use, or not, of fdt
>- Change 'auto' to 'try'
>
> include/configs/mx53loco.h |   40
>++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 38 insertions(+), 2 deletions(-)

Acked-by: Jason Liu <r64343@freescale.com>

>
>diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index
>996396b..cbc3a82 100644
>--- a/include/configs/mx53loco.h
>+++ b/include/configs/mx53loco.h
>@@ -119,6 +119,10 @@
> #define CONFIG_EXTRA_ENV_SETTINGS \
> 	"script=boot.scr\0" \
> 	"uimage=uImage\0" \
>+	"fdt_file=imx53-qsb.dtb\0" \
>+	"fdt_addr=0x71000000\0" \
>+	"boot_fdt=try\0" \
>+	"ip_dyn=yes\0" \
> 	"mmcdev=0\0" \
> 	"mmcpart=2\0" \
> 	"mmcroot=/dev/mmcblk0p3 rw rootwait\0" \ @@ -128,15 +132,47
>@@
> 	"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; 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; 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 " \
>--
>1.7.10.4
>
>_______________________________________________
>U-Boot mailing list
>U-Boot at lists.denx.de
>http://lists.denx.de/mailman/listinfo/u-boot

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

* [U-Boot] [PATCH v5 4/6] mx53loco: Add support to dynamically choose between fdt use or not
  2013-01-09 11:57 ` [U-Boot] [PATCH v5 4/6] mx53loco: " Otavio Salvador
  2013-01-09 12:12   ` Liu Hui-R64343
@ 2013-01-09 18:21   ` Stefano Babic
  1 sibling, 0 replies; 12+ messages in thread
From: Stefano Babic @ 2013-01-09 18:21 UTC (permalink / raw)
  To: u-boot

On 09/01/2013 12:57, Otavio Salvador wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---

Hi Otavio,

> Changes in v5:
> - Change subject
> - Reword the warning
> 
> Changes in v4:
> - Use a warning, instead of error when failing to fetch fdt
> - Drop exit use
> - Fix netboot
> - Use fdt instead of ftd
> 
> Changes in v3:
> - Add loadfdt
> - Use loadfdt
> - Call exit to abort script
> 
> Changes in v2:
> - Allow use of dynamic/static ip
> - Allow force use, or not, of fdt
> - Change 'auto' to 'try'
> 

I get some problems:
- loadbootscript is not correctly set. In fact:

 env default -f -a
## Resetting to default environment
MX53LOCO U-Boot > pri mmcargs
mmcargs=setenv bootargs console=ttymxc0,${baudrate} root=${mmcroot}
loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};

There is still a '0' missing for mmcargs, and loadbootscript is not set.

Then there is a problem with netboot. It is set correctly, but "pri
netboot" crashes:

pri netboot
netboot=echo Booting from net ...; run netargs; if test ${ip_dyn} = yes;
then setenv get_cmd dhcp; else setenv get_cmd tftp; fi; ${get_cmd}
${uimage}; if test ${boot_fdt} = yes; 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;
prefetch abort
pc : [<203b6d78>]	   lr : [<203b6d74>]
sp : af565e00  ip : 00000000	 fp : 00000000
r10: 00000002  r9 : 00000000	 r8 : af565f58
r7 : af568c7c  r6 : 00000001	 r5 : 00000000  r4 : 6f6f6220
r3 : 00000083  r2 : 00000060	 r1 : af565cc0  r0 : 00000173
Flags: nZCv  IRQs off  FIQs off  Mode SVC_32
Resetting CPU ...

Then I do not understand the boot_fdt when set to try. I have imagined
that it tries to start a DT kernel, and if no fdt find is found, it
tries with a legacy kernel without fdt. But it does not try to load the
FDT file, because this is done only when boot_fdt = yes. When boot_fdt =
try, it starts always a legacy kernel.

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

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

end of thread, other threads:[~2013-01-09 18:21 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-09 11:57 [U-Boot] [PATCH v5 0/6] Improve default environment for easy use Otavio Salvador
2013-01-09 11:57 ` [U-Boot] [PATCH v5 1/6] mx6qsabrelite: Use tabs to environment setting Otavio Salvador
2013-01-09 12:10   ` Liu Hui-R64343
2013-01-09 11:57 ` [U-Boot] [PATCH v5 2/6] mx28evk: We shouldn't hardcode a rootfs filesystem type Otavio Salvador
2013-01-09 11:57 ` [U-Boot] [PATCH v5 3/6] mx28evk: Add support to dynamically choose between fdt use or not Otavio Salvador
2013-01-09 11:57 ` [U-Boot] [PATCH v5 4/6] mx53loco: " Otavio Salvador
2013-01-09 12:12   ` Liu Hui-R64343
2013-01-09 18:21   ` Stefano Babic
2013-01-09 11:57 ` [U-Boot] [PATCH v5 5/6] mx6qsabrelite: " Otavio Salvador
2013-01-09 12:11   ` Liu Hui-R64343
2013-01-09 11:58 ` [U-Boot] [PATCH v5 6/6] mx6qsabre{auto, sd}: " Otavio Salvador
2013-01-09 12:12   ` Liu Hui-R64343

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox