summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2005-08-05 11:22:28 +0200
committerWolfgang Denk <wd@pollux.denx.de>2005-08-05 11:22:28 +0200
commitcbf9c117282b8729bdb86071997b58fcab58c444 (patch)
treeff9175f1d987c49ef8b3b334bffae4f35ca8b759 /net
parenta99a0a98b9fcf78ee2ceda893e8d4bd9b11e427a (diff)
parent2c61f14c60ccc5a1c90205991bf555872887a831 (diff)
downloadu-boot-imx-cbf9c117282b8729bdb86071997b58fcab58c444.zip
u-boot-imx-cbf9c117282b8729bdb86071997b58fcab58c444.tar.gz
u-boot-imx-cbf9c117282b8729bdb86071997b58fcab58c444.tar.bz2
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'net')
-rw-r--r--net/nfs.c10
-rw-r--r--net/tftp.c10
2 files changed, 8 insertions, 12 deletions
diff --git a/net/nfs.c b/net/nfs.c
index 2d94c08..1c697ad 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 5a5ae22..64a5576 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",