udoo_quad-support

Gbp-Pq: Name udoo_quad-support.patch

diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index 700e9c1b23c85de05ff73a510da31cd65a309d72..36f98dd5fc05144f665ed8025506f8d7d656b545 100644 (file)
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -95,6 +95,8 @@
 #define CONFIG_GENERIC_MMC
 #define CONFIG_BOUNCE_BUFFER
 #define CONFIG_CMD_EXT2
+#define CONFIG_CMD_EXT4
+#define CONFIG_CMD_FS_GENERIC
 #define CONFIG_CMD_FAT
 #define CONFIG_DOS_PARTITION
 
@@ -130,12 +132,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 " \
@@ -177,16 +183,32 @@
                "fi;\0"
 
 #define CONFIG_BOOTCOMMAND \
-          "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"
+       "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;"
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP
@@ -228,6 +250,7 @@
 
 #define CONFIG_OF_LIBFDT
 #define CONFIG_CMD_BOOTZ
+#define CONFIG_SUPPORT_RAW_INITRD
 
 #ifndef CONFIG_SYS_DCACHE_OFF
 #define CONFIG_CMD_CACHE