arm:trats:pmic: Default PMIC(MAX8997) initialization for Samsung's TRATS board

[platform/kernel/u-boot.git] / net / net.c

diff --git a/net/net.c b/net/net.c
index 9de7d92..82c4cc9 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -180,7 +180,7 @@ IPaddr_t    NetNtpServerIP;
 int            NetTimeOffset;
 #endif
 
-uchar PktBuf[(PKTBUFSRX+1) * PKTSIZE_ALIGN + PKTALIGN];
+static uchar PktBuf[(PKTBUFSRX+1) * PKTSIZE_ALIGN + PKTALIGN];
 
 /* Receive packet */
 uchar *NetRxPackets[PKTBUFSRX];
@@ -256,6 +256,7 @@ static void NetInitLoop(void)
 #endif
                env_changed_id = env_id;
        }
+       memcpy(NetOurEther, eth_get_dev()->enetaddr, 6);
 
        return;
 }
@@ -314,16 +315,17 @@ int NetLoop(enum proto_t protocol)
 
        bootstage_mark_name(BOOTSTAGE_ID_ETH_START, "eth_start");
        net_init();
-       eth_halt();
-       eth_set_current();
-       if (eth_init(bd) < 0) {
+       if (eth_is_on_demand_init() || protocol != NETCONS) {
                eth_halt();
-               return -1;
-       }
+               eth_set_current();
+               if (eth_init(bd) < 0) {
+                       eth_halt();
+                       return -1;
+               }
+       } else
+               eth_init_state_only(bd);
 
 restart:
-       memcpy(NetOurEther, eth_get_dev()->enetaddr, 6);
-
        net_set_state(NETLOOP_CONTINUE);
 
        /*
@@ -461,6 +463,9 @@ restart:
 
                        net_cleanup_loop();
                        eth_halt();
+                       /* Invalidate the last protocol */
+                       eth_set_last_protocol(BOOTP);
+
                        puts("\nAbort\n");
                        /* include a debug print as well incase the debug
                           messages are directed to stderr */
@@ -518,13 +523,21 @@ restart:
                                sprintf(buf, "%lX", (unsigned long)load_addr);
                                setenv("fileaddr", buf);
                        }
-                       eth_halt();
+                       if (protocol != NETCONS)
+                               eth_halt();
+                       else
+                               eth_halt_state_only();
+
+                       eth_set_last_protocol(protocol);
+
                        ret = NetBootFileXferSize;
                        debug_cond(DEBUG_INT_STATE, "--- NetLoop Success!\n");
                        goto done;
 
                case NETLOOP_FAIL:
                        net_cleanup_loop();
+                       /* Invalidate the last protocol */
+                       eth_set_last_protocol(BOOTP);
                        debug_cond(DEBUG_INT_STATE, "--- NetLoop Fail!\n");
                        goto done;
 
@@ -653,7 +666,7 @@ NetSetTimeout(ulong iv, thand_f *f)
                        "--- NetLoop timeout handler set (%p)\n", f);
                timeHandler = f;
                timeStart = get_timer(0);
-               timeDelta = iv;
+               timeDelta = iv * CONFIG_SYS_HZ / 1000;
        }
 }
 
@@ -1148,6 +1161,7 @@ NetReceive(uchar *inpkt, int len)
 
 #ifdef CONFIG_NETCONSOLE
                nc_input_packet((uchar *)ip + IP_UDP_HDR_SIZE,
+                                       src_ip,
                                        ntohs(ip->udp_dst),
                                        ntohs(ip->udp_src),
                                        ntohs(ip->udp_len) - UDP_HDR_SIZE);