net: use common rand()/srand() functions

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

diff --git a/common/cmd_net.c b/common/cmd_net.c
index c9f2a0864ae02e67f0beffbeee7152aef5a9042a..a9ade8b927280308fe1b925efa09eafbed6e6d16 100644 (file)
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -43,7 +43,12 @@ U_BOOT_CMD(
 
 int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       return netboot_common(TFTPGET, cmdtp, argc, argv);
+       int ret;
+
+       bootstage_mark_name(BOOTSTAGE_KERNELREAD_START, "tftp_start");
+       ret = netboot_common(TFTPGET, cmdtp, argc, argv);
+       bootstage_mark_name(BOOTSTAGE_KERNELREAD_STOP, "tftp_done");
+       return ret;
 }
 
 U_BOOT_CMD(
@@ -148,12 +153,16 @@ static void netboot_update_env (void)
                ip_to_string (NetOurIP, tmp);
                setenv ("ipaddr", tmp);
        }
-
+#if !defined(CONFIG_BOOTP_SERVERIP)
+       /*
+        * Only attempt to change serverip if net/bootp.c:BootpCopyNetParams()
+        * could have set it
+        */
        if (NetServerIP) {
                ip_to_string (NetServerIP, tmp);
                setenv ("serverip", tmp);
        }
-
+#endif
        if (NetOurDNSIP) {
                ip_to_string (NetOurDNSIP, tmp);
                setenv ("dnsip", tmp);
@@ -230,36 +239,37 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
                break;
 #endif
        default:
-               show_boot_error(80);
+               bootstage_error(BOOTSTAGE_ID_NET_START);
                return CMD_RET_USAGE;
        }
+       bootstage_mark(BOOTSTAGE_ID_NET_START);
 
-       show_boot_progress(80);
        if ((size = NetLoop(proto)) < 0) {
-               show_boot_error(81);
+               bootstage_error(BOOTSTAGE_ID_NET_NETLOOP_OK);
                return 1;
        }
+       bootstage_mark(BOOTSTAGE_ID_NET_NETLOOP_OK);
 
-       show_boot_progress(81);
        /* NetLoop ok, update environment */
        netboot_update_env();
 
        /* done if no file was loaded (no errors though) */
        if (size == 0) {
-               show_boot_error(82);
+               bootstage_error(BOOTSTAGE_ID_NET_LOADED);
                return 0;
        }
 
        /* flush cache */
        flush_cache(load_addr, size);
 
-       show_boot_progress(82);
+       bootstage_mark(BOOTSTAGE_ID_NET_LOADED);
+
        rcode = bootm_maybe_autostart(cmdtp, argv[0]);
 
        if (rcode < 0)
-               show_boot_error(83);
+               bootstage_error(BOOTSTAGE_ID_NET_DONE_ERR);
        else
-               show_boot_progress(84);
+               bootstage_mark(BOOTSTAGE_ID_NET_DONE);
        return rcode;
 }
 
@@ -418,3 +428,34 @@ U_BOOT_CMD(
 );
 
 #endif /* CONFIG_CMD_DNS */
+
+#if defined(CONFIG_CMD_LINK_LOCAL)
+static int do_link_local(cmd_tbl_t *cmdtp, int flag, int argc,
+                       char * const argv[])
+{
+       char tmp[22];
+
+       if (NetLoop(LINKLOCAL) < 0)
+               return 1;
+
+       NetOurGatewayIP = 0;
+       ip_to_string(NetOurGatewayIP, tmp);
+       setenv("gatewayip", tmp);
+
+       ip_to_string(NetOurSubnetMask, tmp);
+       setenv("netmask", tmp);
+
+       ip_to_string(NetOurIP, tmp);
+       setenv("ipaddr", tmp);
+       setenv("llipaddr", tmp); /* store this for next time */
+
+       return 0;
+}
+
+U_BOOT_CMD(
+       linklocal,      1,      1,      do_link_local,
+       "acquire a network IP address using the link-local protocol",
+       ""
+);
+
+#endif  /* CONFIG_CMD_LINK_LOCAL */