X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=second%2Ffs_of.c;h=f6b2050da4731aa5fb8c9766c02f47357091a621;hp=ecc0366dae5c62ccf017ceac2f9e1aab69d40819;hb=a9e02f948a7e3f8ada87e07a0c1a382805ad15c6;hpb=98eacaa1983cde1532e80e67466dfa615e5564a2

diff --git a/second/fs_of.c b/second/fs_of.c
index ecc0366..f6b2050 100644
--- a/second/fs_of.c
+++ b/second/fs_of.c
@@ -45,7 +45,7 @@
 #include "debug.h"
 
 #define LOAD_BUFFER_POS		0x1000000
-#define LOAD_BUFFER_SIZE	0x1400000
+#define LOAD_BUFFER_SIZE	0x1800000
 
 static int of_open(struct boot_file_t* file,
 		   struct partition_t* part, struct boot_fspec_t* fspec);
@@ -137,6 +137,7 @@ of_net_open(struct boot_file_t* file,
      static char	buffer[1024];
      char               *filename = NULL;
      char               *p;
+     int                new_tftp;
 
      DEBUG_ENTER;
      DEBUG_OPEN;
@@ -151,19 +152,35 @@ of_net_open(struct boot_file_t* file,
      DEBUG_F("siaddr <%s>; filename <%s>; ciaddr <%s>; giaddr <%s>;\n",
 		fspec->siaddr, filename, fspec->ciaddr, fspec->giaddr);
      strncpy(buffer, fspec->dev, 768);
-     strcat(buffer, fspec->siaddr);
-     strcat(buffer, ",");
-     strcat(buffer, filename);
-     strcat(buffer, ",");
-     strcat(buffer, fspec->ciaddr);
-     strcat(buffer, ",");
-     strcat(buffer, fspec->giaddr);
-     strcat(buffer, ",");
-     strcat(buffer, fspec->bootp_retries);
-     strcat(buffer, ",");
-     strcat(buffer, fspec->tftp_retries);
-     strcat(buffer, ",");
-     strcat(buffer, fspec->addl_params);
+     /* If we didn't get a ':' include one */
+     if (fspec->dev[strlen(fspec->dev)-1] != ':')
+          strcat(buffer, ":");
+
+     /* If /packages/cas exists the we have a "new skool" tftp.
+      * This means that siaddr is the tftp server and that we can add
+      * {tftp,bootp}_retrys, subnet mask and tftp block size to the load
+      * method */
+     new_tftp = (prom_finddevice("/packages/cas") != PROM_INVALID_HANDLE);
+     DEBUG_F("Using %s tftp style\n", (new_tftp? "new": "old"));
+
+     if (new_tftp) {
+          strcat(buffer, fspec->siaddr);
+          strcat(buffer, ",");
+          strcat(buffer, filename);
+          strcat(buffer, ",");
+          strcat(buffer, fspec->ciaddr);
+          strcat(buffer, ",");
+          strcat(buffer, fspec->giaddr);
+          strcat(buffer, ",");
+          strcat(buffer, fspec->bootp_retries);
+          strcat(buffer, ",");
+          strcat(buffer, fspec->tftp_retries);
+          strcat(buffer, ",");
+          strcat(buffer, fspec->addl_params);
+     } else {
+          strcat(buffer, ",");
+          strcat(buffer, filename);
+     }
 
      DEBUG_F("Opening: \"%s\"\n", buffer);