[U-Boot] [PATCH v3 0/6] Improve default environment for easy use

[U-Boot] [PATCH v3 0/6] Improve default environment for easy use

[Otavio Salvador]

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 v3:
- Add loadfdt
- Use loadfdt
- Call exit to abort script
- Add loadfdt
- Use loadfdt
- Call exit to abort script
- Add loadfdt
- Use loadfdt
- Call exit to abort script
- 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'
- Allow use of dynamic/static ip
- Allow force use, or not, of fdt
- Change 'auto' to 'try'
- Allow use of dynamic/static ip
- Allow force use, or not, of fdt
- Change 'auto' to 'try'
- 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 ftd use or not
  mx53loco: Add support to dynamically choose between ftd use or not
  mx6qsabrelite: Add support to dynamically choose between ftd use or
    not
  mx6qsabre{auto,sd}: Add support to dynamically choose between ftd use
    or not

 include/configs/mx28evk.h          |   49 ++++++++++++++---
 include/configs/mx53loco.h         |   41 +++++++++++++-
 include/configs/mx6qsabre_common.h |   43 +++++++++++++--
 include/configs/mx6qsabreauto.h    |    1 +
 include/configs/mx6qsabrelite.h    |  103 ++++++++++++++++++++++++------------
 include/configs/mx6qsabresd.h      |    1 +
 6 files changed, 193 insertions(+), 45 deletions(-)

-- 
1.7.10.4

[U-Boot] [PATCH v3 1/6] mx6qsabrelite: Use tabs to environment setting

[Otavio Salvador]

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

[U-Boot] [PATCH v3 2/6] mx28evk: We shouldn't hardcode a rootfs filesystem type

[Otavio Salvador]

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

[U-Boot] [PATCH v3 3/6] mx28evk: Add support to dynamically choose between ftd use or not

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
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 |   41 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index ac9522f..e7107b5 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" \
+	"ftd_file=imx28-evk.dtb\0" \
+	"ftd_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,48 @@
 	"bootscript=echo Running bootscript from mmc ...; "	\
 		"source\0" \
 	"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
+	"loadftd=fatload mmc ${mmcdev}:${mmcpart} ${ftd_addr} ${ftd_file}\0" \
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; "	\
-		"bootm\0" \
+		"if test ${boot_fdt} = yes; then " \
+			"if run loadfdt; then " \
+				"bootm ${loadaddr} - ${ftd_addr}; " \
+			"else " \
+				"if test ${boot_fdt} = try; then " \
+					"bootm; " \
+				"else " \
+					"echo ERROR: Cannot load the DT, aborting...; " \
+					"exit; " \
+				"fi;\0" \
+			"fi;\0" \
+		"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;\0" \
+		"run ${get_cmd} ${uimage}; " \
+		"if test ${boot_fdt} = no; then " \
+			"if run ${get_cmd} ${ftd_addr} ${ftd_file}; then " \
+				"bootm ${loadaddr} - ${ftd_addr}; " \
+			"else " \
+				"if test ${boot_fdt} = try; then " \
+					"bootm; " \
+				"else " \
+					"echo ERROR: Cannot load the DT, aborting...; " \
+					"exit; " \
+				"fi;\0" \
+			"fi;\0" \
+		"else " \
+			"bootm; " \
+		"fi;\0"
 
 #define CONFIG_BOOTCOMMAND \
 	"mmc dev ${mmcdev}; if mmc rescan; then " \
-- 
1.7.10.4

[U-Boot] [PATCH v3 4/6] mx53loco: Add support to dynamically choose between ftd use or not

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
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 |   41 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 996396b..237a94e 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" \
+	"ftd_file=imx53-qsb.dtb\0" \
+	"ftd_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,48 @@
 	"bootscript=echo Running bootscript from mmc ...; " \
 		"source\0" \
 	"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
+	"loadftd=fatload mmc ${mmcdev}:${mmcpart} ${ftd_addr} ${ftd_file}\0" \
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
-		"bootm\0" \
+		"if test ${boot_fdt} = yes; then " \
+			"if run loadfdt; then " \
+				"bootm ${loadaddr} - ${ftd_addr}; " \
+			"else " \
+				"if test ${boot_fdt} = try; then " \
+					"bootm; " \
+				"else " \
+					"echo ERROR: Cannot load the DT, aborting...; " \
+					"exit; " \
+				"fi;\0" \
+			"fi;\0" \
+		"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;\0" \
+		"run ${get_cmd} ${uimage}; " \
+		"if test ${boot_fdt} = no; then " \
+			"if run ${get_cmd} ${ftd_addr} ${ftd_file}; then " \
+				"bootm ${loadaddr} - ${ftd_addr}; " \
+			"else " \
+				"if test ${boot_fdt} = try; then " \
+					"bootm; " \
+				"else " \
+					"echo ERROR: Cannot load the DT, aborting...; " \
+					"exit; " \
+				"fi;\0" \
+			"fi;\0" \
+		"else " \
+			"bootm; " \
+		"fi;\0"
 
 #define CONFIG_BOOTCOMMAND \
 	"mmc dev ${mmcdev}; if mmc rescan; then " \
-- 
1.7.10.4

[U-Boot] [PATCH v3 5/6] mx6qsabrelite: Add support to dynamically choose between ftd use or not

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
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 |   41 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h
index ee86f9b..c1add28 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" \
+	"ftd_file=imx6q-sabrelite.dtb\0" \
+	"ftd_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,48 @@
 	"bootscript=echo Running bootscript from mmc ...; " \
 		"source\0" \
 	"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
+	"loadftd=fatload mmc ${mmcdev}:${mmcpart} ${ftd_addr} ${ftd_file}\0" \
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
-		"bootm\0" \
+		"if test ${boot_fdt} = yes; then " \
+			"if run loadfdt; then " \
+				"bootm ${loadaddr} - ${ftd_addr}; " \
+			"else " \
+				"if test ${boot_fdt} = try; then " \
+					"bootm; " \
+				"else " \
+					"echo ERROR: Cannot load the DT, aborting...; " \
+					"exit; " \
+				"fi;\0" \
+			"fi;\0" \
+		"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;\0" \
+		"run ${get_cmd} ${uimage}; " \
+		"if test ${boot_fdt} = no; then " \
+			"if run ${get_cmd} ${ftd_addr} ${ftd_file}; then " \
+				"bootm ${loadaddr} - ${ftd_addr}; " \
+			"else " \
+				"if test ${boot_fdt} = try; then " \
+					"bootm; " \
+				"else " \
+					"echo ERROR: Cannot load the DT, aborting...; " \
+					"exit; " \
+				"fi;\0" \
+			"fi;\0" \
+		"else " \
+			"bootm; " \
+		"fi;\0"
 
 #define CONFIG_BOOTCOMMAND \
 	   "mmc dev ${mmcdev};" \
-- 
1.7.10.4

[U-Boot] [PATCH v3 6/6] mx6qsabre{auto, sd}: Add support to dynamically choose between ftd use or not

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
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 |   43 +++++++++++++++++++++++++++++++++---
 include/configs/mx6qsabreauto.h    |    1 +
 include/configs/mx6qsabresd.h      |    1 +
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h
index bd2fb10..875478e 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" \
+	"ftd_file=" CONFIG_DEFAULT_FTD_FILE "\0" \
+	"ftd_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,48 @@
 	"bootscript=echo Running bootscript from mmc ...; " \
 		"source\0" \
 	"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
-		"mmcboot=echo Booting from mmc ...; " \
+	"loadftd=fatload mmc ${mmcdev}:${mmcpart} ${ftd_addr} ${ftd_file}\0" \
+	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
-		"bootm\0" \
+		"if test ${boot_fdt} = yes; then " \
+			"if run loadfdt; then " \
+				"bootm ${loadaddr} - ${ftd_addr}; " \
+			"else " \
+				"if test ${boot_fdt} = try; then " \
+					"bootm; " \
+				"else " \
+					"echo ERROR: Cannot load the DT, aborting...; " \
+					"exit; " \
+				"fi;\0" \
+			"fi;\0" \
+		"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;\0" \
+		"run ${get_cmd} ${uimage}; " \
+		"if test ${boot_fdt} = no; then " \
+			"if run ${get_cmd} ${ftd_addr} ${ftd_file}; then " \
+				"bootm ${loadaddr} - ${ftd_addr}; " \
+			"else " \
+				"if test ${boot_fdt} = try; then " \
+					"bootm; " \
+				"else " \
+					"echo ERROR: Cannot load the DT, aborting...; " \
+					"exit; " \
+				"fi;\0" \
+			"fi;\0" \
+		"else " \
+			"bootm; " \
+		"fi;\0"
 
 #define CONFIG_BOOTCOMMAND \
 	"mmc dev ${mmcdev};" \
diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
index f1ff201..7ea9f36 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_FTD_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..97b8846 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_FTD_FILE	"imx6q-sabresd.dtb"
 #define PHYS_SDRAM_SIZE		(1u * 1024 * 1024 * 1024)
 
 #include "mx6qsabre_common.h"
-- 
1.7.10.4

[U-Boot] [PATCH v3 3/6] mx28evk: Add support to dynamically choose between ftd use or not

[Fabio Estevam]

On Mon, Jan 7, 2013 at 2:43 PM, Otavio Salvador <otavio@ossystems.com.br> wrote:

>         "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
> +       "loadftd=fatload mmc ${mmcdev}:${mmcpart} ${ftd_addr} ${ftd_file}\0" \
>         "mmcboot=echo Booting from mmc ...; " \
>                 "run mmcargs; " \
> -               "bootm\0" \
> +               "if test ${boot_fdt} = yes; then " \
> +                       "if run loadfdt; then " \
> +                               "bootm ${loadaddr} - ${ftd_addr}; " \
> +                       "else " \
> +                               "if test ${boot_fdt} = try; then " \
> +                                       "bootm; " \
> +                               "else " \
> +                                       "echo ERROR: Cannot load the DT, aborting...; " \
> +                                       "exit; " \

Current behavior is to try to load uImage from mmc first, if it fails
then it tries tftp.

Isn't this 'exit' that you introduced preventing tftp transfer in the
case of mmc fail?

Also, can you confirm that your patchset works in the following cases:

1. Loading a non-dt kernel via mmc
2. Loading a dt kernel via mmc
3. Loading a non-dt kernel via tftp
4. Loading a dt kernel via tftp

[U-Boot] [PATCH v3 3/6] mx28evk: Add support to dynamically choose between ftd use or not

[Otavio Salvador]

On Mon, Jan 7, 2013 at 2:51 PM, Fabio Estevam <festevam@gmail.com> wrote:
> On Mon, Jan 7, 2013 at 2:43 PM, Otavio Salvador <otavio@ossystems.com.br> wrote:
>
>>         "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
>> +       "loadftd=fatload mmc ${mmcdev}:${mmcpart} ${ftd_addr} ${ftd_file}\0" \
>>         "mmcboot=echo Booting from mmc ...; " \
>>                 "run mmcargs; " \
>> -               "bootm\0" \
>> +               "if test ${boot_fdt} = yes; then " \
>> +                       "if run loadfdt; then " \
>> +                               "bootm ${loadaddr} - ${ftd_addr}; " \
>> +                       "else " \
>> +                               "if test ${boot_fdt} = try; then " \
>> +                                       "bootm; " \
>> +                               "else " \
>> +                                       "echo ERROR: Cannot load the DT, aborting...; " \
>> +                                       "exit; " \
>
> Current behavior is to try to load uImage from mmc first, if it fails
> then it tries tftp.
>
> Isn't this 'exit' that you introduced preventing tftp transfer in the
> case of mmc fail?

Yes; it will go out and won't try tftp. In this case I can remove the
exit and change the ERROR to WARNINF. What do you think?

> Also, can you confirm that your patchset works in the following cases:
>
> 1. Loading a non-dt kernel via mmc
> 2. Loading a dt kernel via mmc
> 3. Loading a non-dt kernel via tftp
> 4. Loading a dt kernel via tftp

Yes; it is the same patchset we applied in OE.

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

[U-Boot] [PATCH v3 3/6] mx28evk: Add support to dynamically choose between ftd use or not

[Fabio Estevam]

On Mon, Jan 7, 2013 at 2:58 PM, Otavio Salvador <otavio@ossystems.com.br> wrote:

> Yes; it will go out and won't try tftp. In this case I can remove the
> exit and change the ERROR to WARNINF. What do you think?

Yes, please remove the exit.

>
>> Also, can you confirm that your patchset works in the following cases:
>>
>> 1. Loading a non-dt kernel via mmc
>> 2. Loading a dt kernel via mmc
>> 3. Loading a non-dt kernel via tftp
>> 4. Loading a dt kernel via tftp
>
> Yes; it is the same patchset we applied in OE.

In OE we mainly boot from sd card, so that's why I asked to double
check whether tftp is also functional.