Merge with /home/sr/git/u-boot

diff --git a/CHANGELOG b/CHANGELOG
index 338a04c26a8affa36326594af81da7a4b27c2ccf..f63aa1c7fdf9959bc21c59d198b427d3f70cc33d 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,10 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Add fat & ext2 support to AMCC 440EP boards Yosemite & Bamboo.
+  Fix identification on ext2ls help entry.
+  Patch by Stefan Roese, 14 Oct 2005
+
 * Add support for TQM834x boards.
   Cleanup.
 

diff --git a/common/cmd_ext2.c b/common/cmd_ext2.c
index 927e22f0300e89cad388976accbeb4760ea7e274..5db42f2b0d65e79e9d3b546b1864abb4ba26799a 100644 (file)
--- a/common/cmd_ext2.c
+++ b/common/cmd_ext2.c
@@ -152,7 +152,7 @@ int do_ext2ls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        ext2ls, 4,      1,      do_ext2ls,
-       "ext2ls- list files in a directory (default /)\n",
+       "ext2ls  - list files in a directory (default /)\n",
        "<interface> <dev[:part]> [directory]\n"
        "    - list files from 'dev' on 'interface' in a 'directory'\n"
 );

diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h
index 29d333490cfd0a057239f7e275855fef107de962..01f86f514147945aac40a26828c15614cc42c018 100644 (file)
--- a/include/configs/bamboo.h
+++ b/include/configs/bamboo.h
@@ -321,9 +321,13 @@
                                CFG_CMD_REGINFO | \
                                CFG_CMD_SDRAM   | \
                                CFG_CMD_USB     | \
+                               CFG_CMD_FAT     | \
+                               CFG_CMD_EXT2    | \
                                _CFG_CMD_NAND   | \
                                CFG_CMD_SNTP    )
 
+#define CONFIG_SUPPORT_VFAT
+
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
 

diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h
index 5c9b0e9c8d97222fb54ce54b68496b99ae7875b8..141cdb19900b6f4bd0e3a9483b87720d7d1b1b61 100644 (file)
--- a/include/configs/yosemite.h
+++ b/include/configs/yosemite.h
@@ -236,8 +236,12 @@
                                CFG_CMD_PING    | \
                                CFG_CMD_REGINFO | \
                                CFG_CMD_SDRAM   | \
+                               CFG_CMD_FAT     | \
+                               CFG_CMD_EXT2    | \
                                CFG_CMD_USB     )
 
+#define CONFIG_SUPPORT_VFAT
+
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>