summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2012-02-17 23:52:52 +0100
committerWolfgang Denk <wd@denx.de>2012-02-17 23:52:52 +0100
commitdbe20fc79736d4f99a9bfaafeae600c9348504df (patch)
treea1c18bc78442d42cc174c5fbe999e62545631218
parente390e8709149664ff96cf19384264c84573f3082 (diff)
parentd1f862f97e49ae7a0a07187779bc4c19b16f558c (diff)
downloadu-boot-imx-dbe20fc79736d4f99a9bfaafeae600c9348504df.zip
u-boot-imx-dbe20fc79736d4f99a9bfaafeae600c9348504df.tar.gz
u-boot-imx-dbe20fc79736d4f99a9bfaafeae600c9348504df.tar.bz2
Merge branch 'trini@ti.com' of git://git.denx.de/u-boot-staging
* 'trini@ti.com' of git://git.denx.de/u-boot-staging: usb_ether: fix typo cmd_eeprom: typo doc: complete, typos
-rw-r--r--common/cmd_eeprom.c2
-rw-r--r--doc/README.commands12
-rw-r--r--drivers/usb/eth/usb_ether.c2
3 files changed, 8 insertions, 8 deletions
diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c
index e911377..a48b3d2 100644
--- a/common/cmd_eeprom.c
+++ b/common/cmd_eeprom.c
@@ -26,7 +26,7 @@
* Support for read and write access to EEPROM like memory devices. This
* includes regular EEPROM as well as FRAM (ferroelectic nonvolaile RAM).
* FRAM devices read and write data at bus speed. In particular, there is no
- * write delay. Also, there is no limit imposed on the numer of bytes that can
+ * write delay. Also, there is no limit imposed on the number of bytes that can
* be transferred with a single read or write.
*
* Use the following configuration options to ensure no unneeded performance
diff --git a/doc/README.commands b/doc/README.commands
index d678992..27815d2 100644
--- a/doc/README.commands
+++ b/doc/README.commands
@@ -1,19 +1,19 @@
Commands are added to U-Boot by creating a new command structure.
-This is done by first including command.h
-
-Then using the U_BOOT_CMD() macro to fill in a cmd_tbl_t struct.
+This is done by first including command.h, then using the U_BOOT_CMD() macro
+to fill in a cmd_tbl_t struct.
U_BOOT_CMD(name,maxargs,repeatable,command,"usage","help")
name: is the name of the commad. THIS IS NOT a string.
-maxargs: the maximumn numbers of arguments this function takes
+maxargs: the maximum number of arguments this function takes
+repeatable: either 0 or 1 to indicate if autorepeat is allowed
command: Function pointer (*cmd)(struct cmd_tbl_s *, int, int, char *[]);
usage: Short description. This is a string
-help: long description. This is a string
+help: Long description. This is a string
-**** Behinde the scene ******
+**** Behind the scene ******
The structure created is named with a special prefix (__u_boot_cmd_)
and placed by the linker in a special section.
diff --git a/drivers/usb/eth/usb_ether.c b/drivers/usb/eth/usb_ether.c
index 6565ea5..48a30eb 100644
--- a/drivers/usb/eth/usb_ether.c
+++ b/drivers/usb/eth/usb_ether.c
@@ -140,7 +140,7 @@ int usb_host_eth_scan(int mode)
dev = usb_get_dev_index(i); /* get device */
debug("i=%d\n", i);
if (dev == NULL)
- break; /* no more devices avaiable */
+ break; /* no more devices available */
/* find valid usb_ether driver for this device, if any */
probe_valid_drivers(dev);