summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2005-10-17 00:19:16 +0200
committerWolfgang Denk <wd@pollux.denx.de>2005-10-17 00:19:16 +0200
commitea1fba136a4778b8f55e6b94a76a548cfad9f522 (patch)
tree016a5f42118f4b30a00d0201bdff2e290ad4e95b
parent20a374fe02724498b5e2c5a2d1195f77a18a60ea (diff)
parent3b6748ea0d67e33c7ccf0b0d736b2a13d59e46ee (diff)
downloadu-boot-imx-ea1fba136a4778b8f55e6b94a76a548cfad9f522.zip
u-boot-imx-ea1fba136a4778b8f55e6b94a76a548cfad9f522.tar.gz
u-boot-imx-ea1fba136a4778b8f55e6b94a76a548cfad9f522.tar.bz2
Merge with /home/sr/git/u-boot
-rw-r--r--CHANGELOG4
-rw-r--r--common/cmd_ext2.c2
-rw-r--r--include/configs/bamboo.h4
-rw-r--r--include/configs/yosemite.h4
4 files changed, 13 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 338a04c..f63aa1c 100644
--- 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 927e22f..5db42f2 100644
--- 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 29d3334..01f86f5 100644
--- 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 5c9b0e9..141cdb1 100644
--- 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>