[U-Boot-Users] Re: [Patch] default filename of tftp and nfs

[Hiroshi Ito <ito@mlb.co.jp>]

Sorry, I attached wrong file.

Here is a correct patch.

From: Hiroshi Ito <ito@mlb.co.jp>
Subject: [Patch] default filename of tftp and nfs
Date: Mon, 06 Dec 2004 03:35:22 +0900
Message-Id: <20041206033522R.ito@mlb.co.jp>
> Hello,
> 
> default filename of tftp and nfs has different value between little endian
> machine and big one.
> 
> This patch fixes endian problem.
> 
> Patch is for current cvs.
> 
> --------
> Hiroshi Ito
> Media Lab. Inc.,
> URL http://www.mlb.co.jp ( Sorry, Japanese only. )
> TEL +81-3-5294-7255  FAX +81-3-5294-7256
-------------- next part --------------
Index: net/nfs.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/net/nfs.c,v
retrieving revision 1.8
diff -u -b -B -w -p -r1.8 nfs.c
--- net/nfs.c	28 Sep 2004 21:51:43 -0000	1.8
+++ net/nfs.c	5 Dec 2004 18:24:36 -0000
@@ -703,13 +703,11 @@ NfsStart (void)
 	}
 
 	if (BootFile[0] == '\0') {
-		IPaddr_t OurIP = ntohl (NetOurIP);
-
 		sprintf (default_filename, "/nfsroot/%02lX%02lX%02lX%02lX.img",
-			OurIP & 0xFF,
-			(OurIP >>  8) & 0xFF,
-			(OurIP >> 16) & 0xFF,
-			(OurIP >> 24) & 0xFF	);
+			NetOurIP & 0xFF,
+			(NetOurIP >>  8) & 0xFF,
+			(NetOurIP >> 16) & 0xFF,
+			(NetOurIP >> 24) & 0xFF	);
 		strcpy (nfs_path, default_filename);
 
 		printf ("*** Warning: no boot file name; using '%s'\n",
Index: net/tftp.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/net/tftp.c,v
retrieving revision 1.9
diff -u -b -B -w -p -r1.9 tftp.c
--- net/tftp.c	15 Apr 2004 21:48:55 -0000	1.9
+++ net/tftp.c	5 Dec 2004 18:24:36 -0000
@@ -302,13 +302,11 @@ void
 TftpStart (void)
 {
 	if (BootFile[0] == '\0') {
-		IPaddr_t OurIP = ntohl(NetOurIP);
-
 		sprintf(default_filename, "%02lX%02lX%02lX%02lX.img",
-			OurIP & 0xFF,
-			(OurIP >>  8) & 0xFF,
-			(OurIP >> 16) & 0xFF,
-			(OurIP >> 24) & 0xFF	);
+			NetOurIP & 0xFF,
+			(NetOurIP >>  8) & 0xFF,
+			(NetOurIP >> 16) & 0xFF,
+			(NetOurIP >> 24) & 0xFF	);
 		tftp_filename = default_filename;
 
 		printf ("*** Warning: no boot file name; using '%s'\n",