[U-Boot-Users] [PATCH] New u-boot-testing CONFIG_BOOTP_SERVERIP option

[Wilson Callan]

Added CONFIG_BOOTP_SERVERIP to allow the tftp server to be different  
from the bootp server

Signed-off-by: Wilson Callan <wcallan at savantav.com>

diff --git a/README b/README
index cfbd39a..d7812a3 100644
--- a/README
+++ b/README
@@ -1141,6 +1141,9 @@ The following options need to be configured:
		CONFIG_BOOTP_TIMEOFFSET
		CONFIG_BOOTP_VENDOREX

+		CONFIG_BOOTP_SERVERIP - TFTP server will be the serverip
+		environment variable, not the BOOTP server.
+
		CONFIG_BOOTP_DNS2 - If a DHCP client requests the DNS
		serverip from a DHCP server, it is possible that more
		than one DNS serverip is offered to the client.
@@ -1153,7 +1156,7 @@ The following options need to be configured:
		CONFIG_BOOTP_SEND_HOSTNAME - Some DHCP servers are capable
		to do a dynamic update of a DNS server. To do this, they
		need the hostname of the DHCP requester.
-		If CONFIG_BOOP_SEND_HOSTNAME is defined, the content
+		If CONFIG_BOOTP_SEND_HOSTNAME is defined, the content
		of the "hostname" environment variable is passed as
		option 12 to the DHCP server.

diff --git a/net/bootp.c b/net/bootp.c
index 80f53bc..be1ee33 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -120,10 +120,12 @@ static void BootpCopyNetParams(Bootp_t *bp)
	IPaddr_t tmp_ip;

	NetCopyIP(&NetOurIP, &bp->bp_yiaddr);
+#if !defined(CONFIG_BOOTP_SERVERIP)
	NetCopyIP(&tmp_ip, &bp->bp_siaddr);
	if (tmp_ip != 0)
		NetCopyIP(&NetServerIP, &bp->bp_siaddr);
	memcpy (NetServerEther, ((Ethernet_t *)NetRxPkt)->et_src, 6);
+#endif
	if (strlen(bp->bp_file) > 0)
		copy_filename (BootFile, bp->bp_file, sizeof(BootFile));




On Jul 27, 2007, at 11:54 AM, Jon Loeliger wrote:

> Any chance we can get this patch rebased on the version
> of things in the u-boot-testing tree?  It would save everyone
> a bunch of trouble!
>
> Thanks,
> jdl
>
>