Merge remote-tracking branch 'u-boot/master' into test

[karo-tx-uboot.git] / net / bootp.c

diff --git a/net/bootp.c b/net/bootp.c
index ccf9ee66758492c112595ee7d93c1066eea8b4a0..189a00383543982c448d9d6713725fe32c1ba86b 100644 (file)
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -41,9 +41,9 @@ ulong         BootpID;
 int            BootpTry;
 
 #if defined(CONFIG_CMD_DHCP)
-dhcp_state_t dhcp_state = INIT;
-unsigned long dhcp_leasetime;
-IPaddr_t NetDHCPServerIP;
+static dhcp_state_t dhcp_state = INIT;
+static unsigned long dhcp_leasetime;
+static IPaddr_t NetDHCPServerIP;
 static void DhcpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
                        unsigned len);
 
@@ -439,7 +439,7 @@ static int DhcpExtended(u8 *e, int message_type, IPaddr_t ServerID,
                        *e++ = 17;
                        *e++ = 0;       /* type 0 - UUID */
 
-                       uuid_str_to_bin(uuid, e);
+                       uuid_str_to_bin(uuid, e, UUID_STR_FORMAT_STD);
                        e += 16;
                } else {
                        printf("Invalid pxeuuid: %s\n", uuid);
@@ -535,9 +535,14 @@ static int BootpExtended(u8 *e)
        *e++ = (576 - 312 + OPT_FIELD_SIZE) & 0xff;
 #endif
 
-#ifdef CONFIG_BOOTP_VCI_STRING
+#if defined(CONFIG_BOOTP_VCI_STRING) || \
+       (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_NET_VCI_STRING))
+#ifdef CONFIG_SPL_BUILD
+       put_vci(e, CONFIG_SPL_NET_VCI_STRING);
+#else
        put_vci(e, CONFIG_BOOTP_VCI_STRING);
 #endif
+#endif
 
 #if defined(CONFIG_BOOTP_SUBNETMASK)
        *e++ = 1;               /* Subnet mask request */