From c43352ccfa1ebeb15da26e52bcb152f614cbfe0a Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@pollux.denx.de>
Date: Thu, 4 Aug 2005 01:09:44 +0200
Subject: [PATCH] Fix endianess problem in TFTP / NFS default filenames Patch
by Hiroshi Ito, 06 Dec 2004
---
CHANGELOG | 3 +++
net/nfs.c | 10 ++++------
net/tftp.c | 10 ++++------
3 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index b0b0c586a4d..d54a159f8df 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
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
loopback test code
Patch by Murray Jensen, 18 Jul 2005
diff --git a/net/nfs.c b/net/nfs.c
index 2d94c08f760..1c697ad3464 100644
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -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",
diff --git a/net/tftp.c b/net/tftp.c
index 5a5ae22ac85..64a5576663c 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -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",
--
GitLab