Use prom_claim_chunk to allocate malloc area

[yaboot.git] / second / fs_of.c

diff --git a/second/fs_of.c b/second/fs_of.c
index 4e61d7d23d446cc9ede24e6f0eadab97a6ca98c1..2e5feb92c57b3e89b364ad162cc69ea47b6d7467 100644 (file)
--- a/second/fs_of.c
+++ b/second/fs_of.c
@@ -45,7 +45,7 @@
 #include "debug.h"
 
 #define LOAD_BUFFER_POS                0x1000000
 #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);
 
 static int of_open(struct boot_file_t* file,
                   struct partition_t* part, struct boot_fspec_t* fspec);


@@ -92,8 +92,9 @@ of_open(struct boot_file_t* file,
      strncpy(buffer, fspec->dev, 768);
      strcat(buffer, ":");
      if (part) {
      strncpy(buffer, fspec->dev, 768);
      strcat(buffer, ":");
      if (part) {

-          if (part->sys_ind == LINUX_RAID) {
-              DEBUG_F("skipping because partition is marked LINUX_RAID\n");
+          if (part->sys_ind == LINUX_RAID || part->sys_ind == LINUX_NATIVE) {
+              DEBUG_F("skipping because partition is tagged %08x\n",
+                       part->sys_ind  );

               DEBUG_LEAVE(FILE_ERR_BAD_FSYS);
               return FILE_ERR_BAD_FSYS;
          }
               DEBUG_LEAVE(FILE_ERR_BAD_FSYS);
               return FILE_ERR_BAD_FSYS;
          }


@@ -135,21 +136,60 @@ of_net_open(struct boot_file_t* file,
            struct partition_t* part, struct boot_fspec_t* fspec)
 {
      static char       buffer[1024];
            struct partition_t* part, struct boot_fspec_t* fspec)
 {
      static char       buffer[1024];

-     char               *filename;
+     char               *filename = NULL;

      char               *p;
      char               *p;

+     int                new_tftp;

 
      DEBUG_ENTER;
      DEBUG_OPEN;
 
 
      DEBUG_ENTER;
      DEBUG_OPEN;
 

-     strncpy(buffer, fspec->dev, 768);

      if (fspec->file && strlen(fspec->file)) {
      if (fspec->file && strlen(fspec->file)) {

-         strcat(buffer, ",");

          filename = strdup(fspec->file);
          for (p = filename; *p; p++)
               if (*p == '/')
                    *p = '\\';
          filename = strdup(fspec->file);
          for (p = filename; *p; p++)
               if (*p == '/')
                    *p = '\\';

-         strcat(buffer, filename);
-         free(filename);
+     }
+
+     DEBUG_F("siaddr <%s>; filename <%s>; ciaddr <%s>; giaddr <%s>;"
+             " ipv6 <%d>\n",
+             fspec->siaddr, filename, fspec->ciaddr, fspec->giaddr,
+             fspec->is_ipv6);
+
+     strncpy(buffer, fspec->dev, 768);
+     /* 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, ",");
+
+          if (fspec->is_ipv6 && (strstr(filename, "filename=") == NULL))
+               strcat(buffer, "filename=");
+
+          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->subnetmask);
+          strcat(buffer, ",");
+          strcat(buffer, fspec->addl_params);
+     } else {
+          strcat(buffer, ",");
+          strcat(buffer, filename);

      }
 
      DEBUG_F("Opening: \"%s\"\n", buffer);
      }
 
      DEBUG_F("Opening: \"%s\"\n", buffer);