* Patches by Martin Krause, 14 Jul 2003:

[platform/kernel/u-boot.git] / common / cmd_net.c

diff --git a/common/cmd_net.c b/common/cmd_net.c
index 44c86e2..4d4a1ea 100644 (file)
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -26,7 +26,6 @@
  */
 #include <common.h>
 #include <command.h>
-#include <cmd_autoscript.h>
 #include <net.h>
 
 #if (CONFIG_COMMANDS & CFG_CMD_NET)
@@ -41,8 +40,8 @@ int do_bootp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        return netboot_common (BOOTP, cmdtp, argc, argv);
 }
 
-cmd_tbl_t U_BOOT_CMD(BOOTP) = MK_CMD_ENTRY(
-       "bootp",        3,      1,      do_bootp,
+U_BOOT_CMD(
+       bootp,  3,      1,      do_bootp,
        "bootp   - boot image via network using BootP/TFTP protocol\n",
        "[loadAddress] [bootfilename]\n"
 );
@@ -52,10 +51,9 @@ int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        return netboot_common (TFTP, cmdtp, argc, argv);
 }
 
-cmd_tbl_t U_BOOT_CMD(TFTPB) = MK_CMD_ENTRY(
-       "tftpboot",     3,      1,      do_tftpb,
-       "tftpboot- boot image via network using TFTP protocol\n"
-       "               and env variables ipaddr and serverip\n",
+U_BOOT_CMD(
+       tftpboot,       3,      1,      do_tftpb,
+       "tftpboot- boot image via network using TFTP protocol\n",
        "[loadAddress] [bootfilename]\n"
 );
 
@@ -64,8 +62,8 @@ int do_rarpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        return netboot_common (RARP, cmdtp, argc, argv);
 }
 
-cmd_tbl_t U_BOOT_CMD(RARPB) = MK_CMD_ENTRY(
-       "rarpboot",     3,      1,      do_rarpb,
+U_BOOT_CMD(
+       rarpboot,       3,      1,      do_rarpb,
        "rarpboot- boot image via network using RARP/TFTP protocol\n",
        "[loadAddress] [bootfilename]\n"
 );
@@ -76,8 +74,8 @@ int do_dhcp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        return netboot_common(DHCP, cmdtp, argc, argv);
 }
 
-cmd_tbl_t U_BOOT_CMD(DHCP) = MK_CMD_ENTRY(
-       "dhcp", 3,      1,      do_dhcp,
+U_BOOT_CMD(
+       dhcp,   3,      1,      do_dhcp,
        "dhcp    - invoke DHCP client to obtain IP/boot params\n",
        "\n"
 );
@@ -212,6 +210,12 @@ int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        return 0;
 }
+
+U_BOOT_CMD(
+       ping,   2,      1,      do_ping,
+       "ping    - send ICMP ECHO_REQUEST to network host\n",
+       "pingAddress\n"
+);
 #endif /* CFG_CMD_PING */
 
 #endif /* CFG_CMD_NET */