Răsfoiți Sursa

Fix endianess problem in TFTP / NFS default filenames
Patch by Hiroshi Ito, 06 Dec 2004

Wolfgang Denk 20 ani în urmă
părinte
comite
c43352ccfa
3 a modificat fișierele cu 11 adăugiri și 12 ștergeri
  1. 3 0
      CHANGELOG
  2. 4 6
      net/nfs.c
  3. 4 6
      net/tftp.c

+ 3 - 0
CHANGELOG

@@ -2,6 +2,9 @@
 Changes for U-Boot 1.1.3:
 Changes for U-Boot 1.1.3:
 ======================================================================
 ======================================================================
 
 
+* Fix endianess problem in TFTP / NFS default filenames
+  Patch by Hiroshi Ito, 06 Dec 2004
+
 * Ignore broadcast status bit in received frames in 8260 FCC ethernet
 * Ignore broadcast status bit in received frames in 8260 FCC ethernet
   loopback test code
   loopback test code
   Patch by Murray Jensen, 18 Jul 2005
   Patch by Murray Jensen, 18 Jul 2005

+ 4 - 6
net/nfs.c

@@ -703,13 +703,11 @@ NfsStart (void)
 	}
 	}
 
 
 	if (BootFile[0] == '\0') {
 	if (BootFile[0] == '\0') {
-		IPaddr_t OurIP = ntohl (NetOurIP);
-
 		sprintf (default_filename, "/nfsroot/%02lX%02lX%02lX%02lX.img",
 		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);
 		strcpy (nfs_path, default_filename);
 
 
 		printf ("*** Warning: no boot file name; using '%s'\n",
 		printf ("*** Warning: no boot file name; using '%s'\n",

+ 4 - 6
net/tftp.c

@@ -302,13 +302,11 @@ void
 TftpStart (void)
 TftpStart (void)
 {
 {
 	if (BootFile[0] == '\0') {
 	if (BootFile[0] == '\0') {
-		IPaddr_t OurIP = ntohl(NetOurIP);
-
 		sprintf(default_filename, "%02lX%02lX%02lX%02lX.img",
 		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;
 		tftp_filename = default_filename;
 
 
 		printf ("*** Warning: no boot file name; using '%s'\n",
 		printf ("*** Warning: no boot file name; using '%s'\n",