]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - ubuntu-packaging-samples/u-boot.git/commitdiff
mx6qsabrelite: Use tabs to environment setting
authorOtavio Salvador <otavio@ossystems.com.br>
Thu, 10 Jan 2013 09:45:04 +0000 (09:45 +0000)
committerStefano Babic <sbabic@denx.de>
Sun, 13 Jan 2013 10:53:44 +0000 (11:53 +0100)
This rework the environment to use tabs for environment setting as
done in other boards.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
include/configs/mx6qsabrelite.h

index 0f6bbb4be24f671af84f565621583fea44039990..ee86f9b7f5f5349133c2db0cbba2a582c4d3fb3e 100644 (file)
 #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