sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Fix endianess problem in TFTP / NFS default filenames 

Patch by Hiroshi Ito, 06 Dec 2004
This commit is contained in:
Wolfgang Denk 2005-08-04 01:09:44 +02:00
parent 6dfa434e32
commit c43352ccfa
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -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

10
net/nfs.c
View File

@ -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, NetOurIP & 0xFF,
(OurIP >> 8) & 0xFF, (NetOurIP >> 8) & 0xFF,
(OurIP >> 16) & 0xFF, (NetOurIP >> 16) & 0xFF,
(OurIP >> 24) & 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",

10
net/tftp.c
View File

@ -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, NetOurIP & 0xFF,
(OurIP >> 8) & 0xFF, (NetOurIP >> 8) & 0xFF,
(OurIP >> 16) & 0xFF, (NetOurIP >> 16) & 0xFF,
(OurIP >> 24) & 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",