diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-05 11:22:28 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-05 11:22:28 +0200 |
| commit | cbf9c117282b8729bdb86071997b58fcab58c444 (patch) | |
| tree | ff9175f1d987c49ef8b3b334bffae4f35ca8b759 /net | |
| parent | a99a0a98b9fcf78ee2ceda893e8d4bd9b11e427a (diff) | |
| parent | 2c61f14c60ccc5a1c90205991bf555872887a831 (diff) | |
| download | talos-obmc-uboot-cbf9c117282b8729bdb86071997b58fcab58c444.tar.gz talos-obmc-uboot-cbf9c117282b8729bdb86071997b58fcab58c444.zip | |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'net')
| -rw-r--r-- | net/nfs.c | 10 | ||||
| -rw-r--r-- | net/tftp.c | 10 |
2 files changed, 8 insertions, 12 deletions
@@ -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 5a5ae22ac8..64a5576663 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", |
