udoo_quad-support

Gbp-Pq: Topic udoo
Gbp-Pq: Name udoo_quad-support.patch

diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index 8ec073d343b980fc93dab3460422c043b9800f38..fd9c8287cc7d2215e83c28344fd677d1a1eb9beb 100644 (file)
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -95,12 +95,16 @@
                "fi\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} " \
                "root=${mmcroot}\0" \
+       "loadbootenv=load mmc ${mmcdev}:${mmcpart} ${loadaddr} uEnv.txt\0" \
+       "importbootenv=echo Importing environment from mmc (uEnv.txt)...; " \
+               "env import -t $loadaddr $filesize\0" \
        "loadbootscript=" \
-               "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
+               "load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
        "bootscript=echo Running bootscript from mmc ...; " \
                "source\0" \
-       "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
-       "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+       "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
+       "loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} zImage\0" \
+       "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
        "mmcboot=echo Booting from mmc ...; " \
                "run mmcargs; " \
                "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
@@ -149,17 +153,33 @@
                                "echo WARNING: Could not determine dtb to use; fi; \0"
 
 #define CONFIG_BOOTCOMMAND \
-          "run findfdt; " \
-          "mmc dev ${mmcdev}; if mmc rescan; then " \
-                  "if run loadbootscript; then " \
-                          "run bootscript; " \
-                  "else " \
-                          "if run loadimage; then " \
-                                  "run mmcboot; " \
-                          "else run netboot; " \
-                          "fi; " \
-                  "fi; " \
-          "else run netboot; fi"
+       "run findfdt; " \
+       "mmc dev ${mmcdev};" \
+       "if mmc rescan; then " \
+               "echo SD/MMC found on device ${mmcdev};" \
+               "if run loadbootenv; then " \
+                       "run importbootenv;" \
+               "fi;" \
+               "echo Checking if uenvcmd is set ...;" \
+               "if test -n $uenvcmd; then " \
+                       "echo Running uenvcmd ...;" \
+                       "run uenvcmd;" \
+               "fi;" \
+               "if run loadbootscript; then " \
+                       "echo Running boot script ${script} ...;" \
+                       "run bootscript; " \
+               "fi;" \
+               "setenv script /boot/${script};" \
+               "if run loadbootscript; then " \
+                       "echo Running boot script ${script} ...;" \
+                       "run bootscript; " \
+               "fi;" \
+               "echo Running default loadzimage ...;" \
+               "if run loadzimage; then " \
+                       "run loadfdt;" \
+                       "run mmcboot;" \
+               "fi;" \
+       "fi;"
 
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)