Эх сурвалжийг харах

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

Wolfgang Denk 19 жил өмнө
parent
commit
ea1fba136a

+ 4 - 0
CHANGELOG

@@ -2,6 +2,10 @@
 Changes for U-Boot 1.1.4:
 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.
 * Add support for TQM834x boards.
   Cleanup.
   Cleanup.
 
 

+ 1 - 1
common/cmd_ext2.c

@@ -152,7 +152,7 @@ int do_ext2ls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 
 U_BOOT_CMD(
 U_BOOT_CMD(
 	ext2ls,	4,	1,	do_ext2ls,
 	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"
 	"<interface> <dev[:part]> [directory]\n"
 	"    - list files from 'dev' on 'interface' in a 'directory'\n"
 	"    - list files from 'dev' on 'interface' in a 'directory'\n"
 );
 );

+ 4 - 0
include/configs/bamboo.h

@@ -321,9 +321,13 @@
 				CFG_CMD_REGINFO	| \
 				CFG_CMD_REGINFO	| \
 				CFG_CMD_SDRAM	| \
 				CFG_CMD_SDRAM	| \
 				CFG_CMD_USB	| \
 				CFG_CMD_USB	| \
+				CFG_CMD_FAT	| \
+				CFG_CMD_EXT2	| \
 				_CFG_CMD_NAND	| \
 				_CFG_CMD_NAND	| \
 				CFG_CMD_SNTP	)
 				CFG_CMD_SNTP	)
 
 
+#define CONFIG_SUPPORT_VFAT
+
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
 #include <cmd_confdefs.h>
 
 

+ 4 - 0
include/configs/yosemite.h

@@ -236,8 +236,12 @@
 				CFG_CMD_PING	| \
 				CFG_CMD_PING	| \
 				CFG_CMD_REGINFO	| \
 				CFG_CMD_REGINFO	| \
 				CFG_CMD_SDRAM	| \
 				CFG_CMD_SDRAM	| \
+				CFG_CMD_FAT	| \
+				CFG_CMD_EXT2	| \
 				CFG_CMD_USB	)
 				CFG_CMD_USB	)
 
 
+#define CONFIG_SUPPORT_VFAT
+
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
 #include <cmd_confdefs.h>