integratorap: remove hardcoded 32MB memory cmdline

[karo-tx-uboot.git] / common / cmd_net.c

diff --git a/common/cmd_net.c b/common/cmd_net.c
index 3ffb9df1de096d4138e36f9cb4ae3e294ffb5f47..872f4a69c827f1e15ad448596bce10ea412ddc04 100644 (file)
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -28,8 +28,6 @@
 #include <command.h>
 #include <net.h>
 
-extern int do_bootm (cmd_tbl_t *, int, int, char * const []);
-
 static int netboot_common (proto_t, cmd_tbl_t *, int , char * const []);
 
 int do_bootp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
@@ -54,6 +52,24 @@ U_BOOT_CMD(
        "[loadAddress] [[hostIPaddr:]bootfilename]"
 );
 
+#ifdef CONFIG_CMD_TFTPSRV
+static int do_tftpsrv(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+{
+       return netboot_common(TFTPSRV, cmdtp, argc, argv);
+}
+
+U_BOOT_CMD(
+       tftpsrv,        2,      1,      do_tftpsrv,
+       "act as a TFTP server and boot the first received file",
+       "[loadAddress]\n"
+       "Listen for an incoming TFTP transfer, receive a file and boot it.\n"
+       "The transfer is aborted if a transfer has not been started after\n"
+       "about 50 seconds or if Ctrl-C is pressed."
+);
+#endif
+
+
+#ifdef CONFIG_CMD_RARP
 int do_rarpb (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        return netboot_common (RARP, cmdtp, argc, argv);
@@ -64,6 +80,7 @@ U_BOOT_CMD(
        "boot image via network using RARP/TFTP protocol",
        "[loadAddress] [[hostIPaddr:]bootfilename]"
 );
+#endif
 
 #if defined(CONFIG_CMD_DHCP)
 int do_dhcp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
@@ -210,17 +227,8 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char * const argv[])
        /* flush cache */
        flush_cache(load_addr, size);
 
-       /* Loading ok, check if we should attempt an auto-start */
-       if (((s = getenv("autostart")) != NULL) && (strcmp(s,"yes") == 0)) {
-               char *local_args[2];
-               local_args[0] = argv[0];
-               local_args[1] = NULL;
-
-               printf ("Automatic boot of image at addr 0x%08lX ...\n",
-                       load_addr);
-               show_boot_progress (82);
-               rcode = do_bootm (cmdtp, 0, 1, local_args);
-       }
+       show_boot_progress(82);
+       rcode = bootm_maybe_autostart(cmdtp, argv[0]);
 
        if (rcode < 0)
                show_boot_progress (-83);
@@ -296,6 +304,7 @@ int do_cdp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 U_BOOT_CMD(
        cdp,    1,      1,      do_cdp,
        "Perform CDP network configuration",
+       "\n"
 );
 #endif
 
@@ -323,7 +332,8 @@ int do_sntp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        else NetTimeOffset = simple_strtol (toff, NULL, 10);
 
        if (NetLoop(SNTP) < 0) {
-               printf("SNTP failed: host %s not responding\n", argv[1]);
+               printf("SNTP failed: host %pI4 not responding\n",
+                       &NetNtpServerIP);
                return 1;
        }