Patchwork [U-Boot,8/9] mx6qsabrelite: Add support to dynamically choose between ftd use or not

login
register
mail settings
Submitter Otavio Salvador
Date Dec. 21, 2012, 4:59 p.m.
Message ID <1356109151-6623-9-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/207852/
State Changes Requested
Delegated to: Stefano Babic
Headers show

Comments

Otavio Salvador - Dec. 21, 2012, 4:59 p.m.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 include/configs/mx6qsabrelite.h |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

Patch

diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h
index 0f6bbb4..c74d75c 100644
--- a/include/configs/mx6qsabrelite.h
+++ b/include/configs/mx6qsabrelite.h
@@ -154,6 +154,8 @@ 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
        "uimage=uImage\0" \
+       "ftd_file=imx6q-sabrelite.dtb\0" \
+       "ftd_addr=0x11000000\0" \
 	"console=ttymxc1\0" \
 	"fdt_high=0xffffffff\0"	  \
 	"initrd_high=0xffffffff\0" \
@@ -169,13 +171,23 @@ 
        "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
        "mmcboot=echo Booting from mmc ...; " \
 	       "run mmcargs; " \
-	       "bootm\0" \
+	       "if fatload mmc ${mmcdev}:${mmcpart} ${ftd_addr} ${ftd_file}; then " \
+	           "bootm ${loadaddr} - ${ftd_addr}; " \
+	       "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" \
+	       "dhcp ${uimage}; " \
+	       "if dhcp ${ftd_addr} ${ftd_file}; then " \
+	           "bootm ${loadaddr} - ${ftd_addr}; " \
+	       "else " \
+	           "bootm; " \
+	       "fi;\0"
+
 
 #define CONFIG_BOOTCOMMAND \
        "mmc dev ${mmcdev};" \