wandboard-uEnv.txt-bootz-n-fixes

Downloaded from:

  https://raw.github.com/eewiki/u-boot-patches/master/v2014.01/0001-wandboard-uEnv.txt-bootz-n-fixes.patch

Modified to reduce diff with upstream:
- keep the default bootdelay.
- keep support for bootscripts.
- consistantly use "load" vs. "fatload".

From d0bf1e44422e4102859d9420a8abf42c3600f500 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Thu, 23 Jan 2014 16:24:13 -0600
Subject: [PATCH] wandboard: uEnv.txt, bootz, n fixes

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
Gbp-Pq: Topic wandboard
Gbp-Pq: Name wandboard-uEnv.txt-bootz-n-fixes.patch

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 9fb501a3412abd71a1e880fd72e42e90f6f47810..1aa98d83a81c13406e7d9f9d04b1ac3086e791a7 100644 (file)
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -76,6 +76,8 @@
 #define CONFIG_BOUNCE_BUFFER
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
+#define CONFIG_CMD_EXT4
+#define CONFIG_CMD_FS_GENERIC
 #define CONFIG_DOS_PARTITION
 
 /* Ethernet Configuration */
@@ -177,12 +179,16 @@
                        "echo '- no FWBADAPT-7WVGA-LCD-F07A-0102 display';" \
                "fi; " \
                "setenv bootargs ${bootargs} ${fbmem}\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 " \
@@ -224,16 +230,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
@@ -274,6 +296,7 @@
 
 #define CONFIG_OF_LIBFDT
 #define CONFIG_CMD_BOOTZ
+#define CONFIG_SUPPORT_RAW_INITRD
 
 #ifndef CONFIG_SYS_DCACHE_OFF
 #define CONFIG_CMD_CACHE