new 405ep defines added

[u-boot] / common / cmd_usb.c

diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index d8f2f2cde159cf74d5b15139e4300e672d2aef0e..83004b53ac999c413c9e78d006cc3657a96d704a 100644 (file)
--- a/common/cmd_usb.c
+++ b/common/cmd_usb.c
@@ -31,7 +31,6 @@
 #if (CONFIG_COMMANDS & CFG_CMD_USB)
 
 #include <usb.h>
-#include <cmd_disk.h>
 
 #undef CMD_USB_DEBUG
 
@@ -42,7 +41,7 @@
 #endif
 static int usb_stor_curr_dev=-1; /* current device */
 
-/* somme display routines (info command) */
+/* some display routines (info command) */
 char * usb_get_class_desc(unsigned char dclass)
 {
        switch(dclass) {
@@ -595,30 +594,30 @@ int do_usb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 #if (CONFIG_COMMANDS & CFG_CMD_USB)
 
 #ifdef CONFIG_USB_STORAGE
-cmd_tbl_t U_BOOT_CMD(USB) = MK_CMD_ENTRY(
-       "usb",  5,      1,      do_usb,
+U_BOOT_CMD(
+       usb,    5,      1,      do_usb,
        "usb     - USB sub-system\n",
        "reset - reset (rescan) USB controller\n"
-       "usb  stop [f]  - stop USB [f]=force stop\n"
-       "usb  tree  - show USB device tree\n"
-       "usb  info [dev] - show available USB devices\n"
-       "usb  scan  - (re-)scan USB bus for storage devices\n"
-       "usb  device [dev] - show or set current USB storage device\n"
-       "usb  part [dev] - print partition table of one or all USB storage devices\n"
-       "usb  read addr blk# cnt - read `cnt' blocks starting at block `blk#'\n"
-       "     to memory address `addr'\n"
+       "usb stop [f]  - stop USB [f]=force stop\n"
+       "usb tree  - show USB device tree\n"
+       "usb info [dev] - show available USB devices\n"
+       "usb scan  - (re-)scan USB bus for storage devices\n"
+       "usb device [dev] - show or set current USB storage device\n"
+       "usb part [dev] - print partition table of one or all USB storage devices\n"
+       "usb read addr blk# cnt - read `cnt' blocks starting at block `blk#'\n"
+       "    to memory address `addr'\n"
 );
 
 
-cmd_tbl_t U_BOOT_CMD(USBBOOT) = MK_CMD_ENTRY(
-       "usbboot",      3,      1,      do_usbboot,
+U_BOOT_CMD(
+       usbboot,        3,      1,      do_usbboot,
        "usbboot - boot from USB device\n",
        "loadAddr dev:part\n"
 );
 
 #else
-cmd_tbl_t U_BOOT_CMD(USB) = MK_CMD_ENTRY(
-       "usb",  5,      1,      do_usb,
+U_BOOT_CMD(
+       usb,    5,      1,      do_usb,
        "usb     - USB sub-system\n",
        "reset - reset (rescan) USB controller\n"
        "usb  tree  - show USB device tree\n"