Increase tftp buffer to ~6MB

* second/fs_of.c: increase tftp buffer to 6MB.  This is as far as it
  can go.
git-archimport-id: erbenson@alaska.net--public/yaboot--devel--1.3--patch-73

diff --git a/0arch-timestamps0 b/0arch-timestamps0
index 0ff1bfbf0c83b7bb1dc222b3599ccde53c890da4..83495ee9b907dbfbc400ef1f8fc577c3a889bd84 100644 (file)
--- a/0arch-timestamps0
+++ b/0arch-timestamps0
@@ -1,7 +1,7 @@
-./0arch-timestamps0    1089492902      1089575531
+./0arch-timestamps0    1089575537      1089575751
 ./BUGS 1089492902      1000991730
 ./COPYING      1089492902      1000991730
-./ChangeLog    1089575479      1089575528
+./ChangeLog    1089575707      1089575746
 ./Config       1089492902      1002101497
 ./INSTALL      1089492902      1000991730
 ./Makefile     1089492902      1082247755
@@ -22,18 +22,18 @@
 ./doc/examples/simpleboot.chrp 1089492902      1068017750
 ./doc/examples/yaboot.conf.multi-boot  1089492902      1006348765
 ./doc/examples/yaboot.conf.rs6000      1089492902      1006348765
-./doc/examples 1089575531      1068017750
+./doc/examples 1089575751      1068017750
 ./doc/yaboot-howto.de.sgml     1089492904      1077455488
 ./doc/yaboot-howto.sgml        1089492904      1077455511
-./doc  1089575531      1081830064
+./doc  1089575751      1081830064
 ./etc/yaboot.conf      1089492902      1006348765
-./etc  1089575531      1007269243
+./etc  1089575751      1007269243
 ./first/ofboot 1089492902      1065311880
-./first        1089575531      1071492158
+./first        1089575751      1071492158
 ./include/asm/elf.h    1089492903      1000991730
 ./include/asm/ppc_asm.tmpl     1089492903      1000991730
 ./include/asm/processor.h      1089492903      1000991730
-./include/asm  1089575531      1007269243
+./include/asm  1089575751      1007269243
 ./include/bootinfo.h   1089492903      1007200690
 ./include/byteorder.h  1089492903      1000991730
 ./include/cfg.h        1089492903      1007200690
@@ -42,12 +42,12 @@
 ./include/debug.h      1089492904      1007200690
 ./include/errors.h     1089492902      1007200690
 ./include/et/com_err.h 1089492903      1000991731
-./include/et   1089575531      1007269243
+./include/et   1089575751      1007269243
 ./include/ext2fs/bitops.h      1089492903      1003927524
 ./include/ext2fs/ext2_err.h    1089492903      1003927524
 ./include/ext2fs/ext2_io.h     1089492903      1003927524
 ./include/ext2fs/ext2fs.h      1089492903      1003927524
-./include/ext2fs       1089575531      1007269243
+./include/ext2fs       1089575751      1007269243
 ./include/fdisk-part.h 1089492903      1007200690
 ./include/file.h       1089492903      1007200690
 ./include/fs.h 1089492903      1007200690
@@ -56,13 +56,13 @@
 ./include/linux/iso_fs.h       1089492903      1000991731
 ./include/linux/stat.h 1089492903      1000991731
 ./include/linux/types.h        1089492903      1000991731
-./include/linux        1089575531      1007269243
+./include/linux        1089575751      1007269243
 ./include/mac-part.h   1089492903      1007200690
 ./include/md5.h        1089492903      1000991730
 ./include/partition.h  1089492903      1007200690
 ./include/prom.h       1089492903      1007200690
 ./include/reiserfs/reiserfs.h  1089492903      1025684115
-./include/reiserfs     1089575531      1025684115
+./include/reiserfs     1089575751      1025684115
 ./include/setjm2.h     1089492903      1000991730
 ./include/setjmp.h     1089492903      1000991730
 ./include/stdlib.h     1089492903      1000991730
@@ -70,9 +70,9 @@
 ./include/swab.h       1089492903      1000991730
 ./include/types.h      1089492903      1000991730
 ./include/xfs/xfs.h    1089492902      1002101334
-./include/xfs  1089575531      1007269244
+./include/xfs  1089575751      1007269244
 ./include/yaboot.h     1089492903      1007200690
-./include      1089575531      1007269244
+./include      1089575751      1007269244
 ./lib/ctype.c  1089492903      1000991731
 ./lib/libext2fs.a      1089492903      1003927524
 ./lib/malloc.c 1089492903      1007200690
@@ -81,7 +81,7 @@
 ./lib/strstr.c 1089492903      1000991731
 ./lib/strtol.c 1089492903      1000991731
 ./lib/vsprintf.c       1089492903      1000991731
-./lib  1089575531      1069320301
+./lib  1089575751      1069320301
 ./man/bootstrap.8      1089492903      1000991731
 ./man/mkofboot.8       1089492903      1006348765
 ./man/ofpath.8 1089492903      1000991731
@@ -89,7 +89,7 @@
 ./man/yaboot.conf.5    1089492903      1004256691
 ./man/yabootconfig.8   1089492903      1027929577
 ./man/ybin.8   1089492903      1006348765
-./man  1089575531      1027929577
+./man  1089575751      1027929577
 ./man.patch    1089492903      1006348761
 ./second/cache.S       1089492903      1007200690
 ./second/cfg.c 1089492903      1007200690
@@ -99,7 +99,7 @@
 ./second/fs.c  1089492904      1032059574
 ./second/fs_ext2.c     1089492904      1032059564
 ./second/fs_iso.c      1089492904      1007200690
-./second/fs_of.c       1089492904      1032059553
+./second/fs_of.c       1089575662      1089575693
 ./second/fs_reiserfs.c 1089492904      1007200690
 ./second/fs_xfs.c      1089492902      1032059541
 ./second/iso_util.c    1089492904      1003656415
@@ -108,13 +108,13 @@
 ./second/prom.c        1089492904      1067937197
 ./second/setjmp.S      1089492904      1000991732
 ./second/yaboot.c      1089492904      1032059504
-./second       1089575531      1069320301
+./second       1089575751      1089575693
 ./util/addnote.c       1089492904      1007200691
 ./util/elfextract.c    1089492904      1007303237
-./util 1089575531      1069320301
-./ybin/mkofboot        1089575530      1073219938
+./util 1089575751      1069320301
+./ybin/mkofboot        1089575751      1073219938
 ./ybin/ofpath  1089491303      1083997485
 ./ybin/ybin    1089492904      1084053572
-./ybin/yabootconfig    1089575452      1089575448
-./ybin 1089575531      1089575390
-.      1089575531      1089575528
+./ybin/yabootconfig    1089575537      1089575448
+./ybin 1089575751      1089575390
+.      1089575751      1089575746

diff --git a/ChangeLog b/ChangeLog
index ee8bb4e873fedc33d6a79c480dd77123b67a3b91..00fecf6c975b369d053a173a3557c9c6bc07ad91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,20 @@
 # arch-tag: automatic-ChangeLog--erbenson@alaska.net--public/yaboot--devel--1.3
 #
 
+2004-07-11 19:55:54 GMT        Ethan Benson <erbenson@alaska.net>      patch-73
+
+    Summary:
+      Increase tftp buffer to ~6MB
+    Revision:
+      yaboot--devel--1.3--patch-73
+
+    * second/fs_of.c: increase tftp buffer to 6MB.  This is as far as it
+      can go.
+
+    modified files:
+     0arch-timestamps0 ChangeLog second/fs_of.c
+
+
 2004-07-11 19:52:17 GMT        Ethan Benson <erbenson@alaska.net>      patch-72
 
     Summary:

diff --git a/second/fs_of.c b/second/fs_of.c
index d9caa3226be9b24a29779354cf6fded84b193fb9..0d5e4115b59d129d8911f6172bf9c1d1e24c31de 100644 (file)
--- a/second/fs_of.c
+++ b/second/fs_of.c
@@ -44,7 +44,8 @@
 #include "debug.h"
 
 #define LOAD_BUFFER_POS                0x600000
-#define LOAD_BUFFER_SIZE       0x400000
+/* this cannot be safely increased any further */
+#define LOAD_BUFFER_SIZE       0x600000
 
 static int of_open(struct boot_file_t* file, const char* dev_name,
                   struct partition_t* part, const char* file_name);