My yaboot changes for PPCRCD

Przemek Iskra sparky at pld-linux.org
Wed Mar 29 21:28:51 EST 2006


On Sun, Mar 26, 2006 at 06:20:57PM -0500, Paul Nasrat wrote:
> On Sun, 2006-03-26 at 22:22 +0200, Przemek Iskra wrote:
> > I was working on yaboot (binary part only) for a while, because I need
> > some additional functionality for my PPCRCD:
> > 
> > You can find my changes in PLD-linux's SVN:
> > - http://svn.pld-linux.org/svn/ppcrcd/trunk/yaboot
> > or throught web interface:
> > - http://svn.pld-linux.org/cgi-bin/viewsvn/ppcrcd/trunk/yaboot/

> Can you break up patches into indivual sets and mail to list thanks.

there they are:

* yaboot-crt0.patch *
  changes
	cmp	0,r10,r11
  to
	cmp	0,0,r10,r11
  I don't know what it is, but it was in my distribution
  anyway, afert assembling it becomes:
  	cmpw    r10,r11

* yaboot-net.patch *
  fix file detection in network device-path on iBook G4

* yaboot-dos_fs.patch *
  patch to use fat filesystem through OpenFirmware

* yaboot-malloc.patch *
  malloc taken from prom-libc, it's much better as it's realy freeing memory
  after free()

* yaboot-help_files.patch *
  display text files, configuration is similar to image:

  text=/boot/pld.hlp
  	label=pld
  	alias=1
  	single-key

  - requires malloc to work correctly

* yaboot-gunzip+zImage+multiinitrd.patch *
  if kernel_position in zImage is not specified, it chcecks gzip header,
  and if there isn't, try to load it like normal image
  if there is gzip header gunzips while loading file
  if kernel_position is specified jumps to specified file position before
  and extracts it from there; it is only binary so some infos are not
  stored, like position where to load it, or uncompressed file lenght,
  so they must be specified manually
  
  multiinitrd enables yaboot to boot multi-part initrd, all files has
  to be specified in one initrd= option, separated by | (pipe)
  - requires yaboot-dos_fs.patch to apply
  - requires malloc to work correctly

* yaboot-warnings.patch *
  killed some warnings and k&r style header


I realy wasn't able to split gunzip+zImage+multiinitrd more.
Anyway, it requires careful testing, and probably rewriting of some
parts; using some elf.h to be able to find vmlinux.bin.gz and initrd
position may be nice, but there would be much to do.


-- 
 ____  Sparky{PI] -- Przemyslaw _  ___  _  _  ........... LANG...Pl..Ca..Es..En
/____) ___  ___  _ _ || Iskra  |  | _ \| |  | : WWW........ppcrcd.pld-linux.org
\____\| -_)'___| ||^'||//\\// <   |  _/| |  | : JID......sparky<at>jabberes.org
(____/||   (_-_|_||  ||\\ ||   |_ |_|  |_| _| : Mail....sparky<at>pld-linux.org
-------------- next part --------------
diff -Nurw yaboot-1.3.14rc1/second/crt0.S yaboot-ppcrcd/second/crt0.S
--- yaboot-1.3.14rc1/second/crt0.S	2006-02-10 03:08:33.000000000 +0100
+++ yaboot-ppcrcd/second/crt0.S	2006-01-05 21:15:08.000000000 +0100
@@ -13,7 +13,7 @@
 	subi	r11,r11,4
 	li	r0, 0
 1:	stwu	r0,4(r10)
-	cmp	0,r10,r11
+	cmp	0,0,r10,r11
 	bne	1b
 	b	yaboot_start
 
-------------- next part --------------
diff -Nurw yaboot-1.3.14rc1/second/file.c yaboot-ppcrcd/second/file.c
--- yaboot-1.3.14rc1/second/file.c	2006-02-10 03:08:33.000000000 +0100
+++ yaboot-ppcrcd/second/file.c	2006-03-10 23:16:09.000000000 +0100
@@ -88,12 +88,14 @@
       * filename.  Otherwise, we must advance args once more.
       */
      args++;
+#if 0 // bullshit
      if (*tmp != ':') {
 	  args = strchr(args, ',');
 	  if (!args)
 	       return NULL;
 	  args++;
      }
+#endif
 
      /* filename may be empty; e.g. enet:192.168.1.1,,192.168.1.2 */
      if (*args == ',') {
-------------- next part --------------
diff -Nurw yaboot-1.3.14rc1/second/partition.c yaboot-ppcrcd/second/partition.c
--- yaboot-1.3.14rc1/second/partition.c	2006-02-10 03:08:33.000000000 +0100
+++ yaboot-ppcrcd/second/partition.c	2006-03-10 23:16:09.000000000 +0100
@@ -181,6 +181,24 @@
 				   swab32(*(unsigned int *)(part->size4)),
 				   512 /*blksize*/,
 				   part->sys_ind /* partition type */ );
+	       continue;
+	  }
+	  char fats[] = { 0x01, 0x04, 0x06, 0x0b, 0x0c, 0x0e, 0x11, 0x14, 0x16,
+	  	0x1b, 0x1c, 0x1e, 0xef };
+	  int fat;
+	  for (fat = 0; fat < sizeof(fats); fat++ )
+		  if ( part->sys_ind == fats[fat] ) {
+			  DEBUG_F("found fat partition: %d\n", partition);
+			  add_new_partition(
+				list,
+				partition,
+				"Fat",
+				'\0',
+				swab32(*(unsigned int *)(part->start4)),
+				swab32(*(unsigned int *)(part->size4)),
+				512 /*blksize*/,
+				part->sys_ind /* partition type */ );
+			  break;
 	  }
      }
 }
--- yaboot-1.3.14rc1/second/yaboot.c	2006-02-10 03:08:33.000000000 +0100
+++ yaboot-ppcrcd/second/yaboot.c	2006-03-29 11:14:02.000000000 +0200
@@ -55,7 +55,7 @@
 #include "bootinfo.h"
 #include "debug.h"
 
-#define CONFIG_FILE_NAME	"yaboot.conf"
+#define CONFIG_FILE_NAME	"yaboot.cfg"
 #define CONFIG_FILE_MAX		0x8000		/* 32k */
 
 #ifdef USE_MD5_PASSWORDS
@@ -730,7 +801,7 @@
 	       "Note that the comma (,) is only required if you specify an OpenFirmware\n"
 	       "device, if you only specify a filename you should not start it with a \",\"\n\n"
 	       "If you omit \"device:\" and \"partno\" yaboot will use the values of \n"
-	       "\"device=\" and \"partition=\" in yaboot.conf, right now those are set to: \n"
+		"\"device=\" and \"partition=\" in " CONFIG_FILE_NAME ", right now those are set to: \n"
 	       "device=%s\n"
 	       "partition=%d\n\n", defdevice, defpart);
 	  return 0;
-------------- next part --------------
diff -Nurw yaboot-1.3.14rc1/include/stdlib.h yaboot-ppcrcd/include/stdlib.h
--- yaboot-1.3.14rc1/include/stdlib.h	2006-02-10 03:08:33.000000000 +0100
+++ yaboot-ppcrcd/include/stdlib.h	2006-01-17 23:32:40.000000000 +0100
@@ -6,19 +6,30 @@
 #define __STDLIB_H
 
 #include "stdarg.h"
+#include "stddef.h"
 
-extern void malloc_init(void *bottom, unsigned long size);
-extern void malloc_dispose(void);
+extern int __alloc_freelist_init(void);
+//extern void malloc_init(void *bottom, unsigned long size);
+//extern void malloc_dispose(void);
 
 extern void *malloc(unsigned int size);
 extern void *realloc(void *ptr, unsigned int size);
 extern void free (void *m);
-extern void mark (void **ptr);
-extern void release (void *ptr);
+//extern void mark (void **ptr);
+//extern void release (void *ptr);
 
 extern int sprintf(char * buf, const char *fmt, ...);
 extern int vsprintf(char *buf, const char *fmt, va_list args);
 extern long simple_strtol(const char *cp,char **endp,unsigned int base);
 #define strtol(x,y,z) simple_strtol(x,y,z)
 
+extern inline int atoi( const char *ptr );
+
+extern inline int
+atoi (const char *ptr)
+{
+	return (int) strtol (ptr, (char **) NULL, 10);
+}
+
+
 #endif
diff -Nurw yaboot-1.3.14rc1/lib/malloc.c yaboot-ppcrcd/lib/malloc.c
--- yaboot-1.3.14rc1/lib/malloc.c	2006-02-10 03:08:33.000000000 +0100
+++ yaboot-ppcrcd/lib/malloc.c	2006-03-28 23:25:24.000000000 +0200
@@ -21,87 +21,219 @@
 
 #include "types.h"
 #include "stddef.h"
+#include "string.h"
+
+#define MALLOC_DEBUG 1
 
 /* Imported functions */
 extern void prom_printf (char *fmt, ...);
+extern void *prom_claim (void *virt, unsigned int size, unsigned int align);
 
-static char *malloc_ptr = 0;
-static char *malloc_top = 0;
-static char *last_alloc = 0;
+/*
+ * memory allocation routines from prom-libc
+ */
+
+void free(void *memory);
+
+/*** bits/malloc.h ***/
+struct __alloc_area
+{
+	struct __alloc_area *next;
+	unsigned int length;
+	long long foo;
+};
+
+/*** __freelist.c ***/
+/* the list of free areas */
+struct __alloc_area *__freelist = NULL;
+
+/*** __alloc_freelist_init.c ***/
+int __alloc_freelist_init(void)
+{
+     /* return if the freelist has already been set up. this will mean that
+      * one can call _init() to more than once without probs
+      */
+     if (__freelist)
+	  return 0;
+
+     /* assign an initial area */
+     __freelist = (struct __alloc_area *) prom_claim(
+	  (void *)MALLOCADDR, ((MALLOCSIZE / sizeof(struct __alloc_area))
+				* sizeof(struct __alloc_area)) , 0);
+     if ((void *)__freelist == (void *)-1)
+	  return 1;
+     __freelist->next = NULL;
+     __freelist->length = (MALLOCSIZE / sizeof(struct __alloc_area)) - 1;
+     return 0;
+}
+
+
+/*** malloc.c ***/
+void *malloc(unsigned int bytes)
+{
+     struct __alloc_area *previous;
+     struct __alloc_area *current;
+     unsigned int units;
+
+     /* __freelist is still NULL, set up the initial entry */
+     if (!__freelist)
+	  __alloc_freelist_init();
+
+     /* determine the number of __alloc_area sized blocks needed to hold
+      * the number of bytes requested. needs to be an even number, otherwise
+      * the following header struct might be mis-aligned
+      */
+     units = (bytes + sizeof(struct __alloc_area) - 1) /
+	  sizeof(struct __alloc_area);
+
+     previous = NULL;
+     for (current = __freelist; current; current = current->next) {
+	  if (units < current->length + 1) {
+	       /* make area smaller, to accommodate a new area of
+		* the required size, and its header
+		*/
+	       current->length -= units;
+	       current->length -= 1;
+
+	       /* move the pointer so that it points to the new area
+		* being set up
+		*/
+	       current += current->length + 1;
+	       current->length = units;
+
+	       /* return a pointer to the user that starts
+		* immediately after the area header
+		*/
+	       return (void *)(current + 1);
+			
+	  } else if (units == current->length) {
+	       /* current area is exactly the right size */
+
+	       /* unlink this area from the list */
+	       if (previous)
+		    previous->next = current->next;
 
-void malloc_init(void *bottom, unsigned long size)
-{
-	malloc_ptr = bottom;
-	malloc_top = bottom + size;
+	       return (void *)(current + 1);
 }
-
-void malloc_dispose(void)
-{
-	malloc_ptr = 0;
-	last_alloc = 0;
+	  previous = current;
+     }
+     return NULL;
 }
 
-void *malloc (unsigned int size)
+/*** realloc.c ***/
+void *realloc(void *old, unsigned int size)
 {
-    char *caddr;
+     struct __alloc_area *optr;
+     void *new;
+     unsigned int olen;
 
-    if (!malloc_ptr)
+     if (old && !size) {
+	  free(old);
     	return NULL;
-    if ((malloc_ptr + size + sizeof(int)) > malloc_top) {
-	prom_printf("malloc failed\n");
+     } else if (!old && !size)
     	return NULL;
+
+     if (!(new = malloc(size)))
+	  return NULL;
+
+     if (old) {
+	  optr = (struct __alloc_area *)old;
+	  optr--;
+	  olen = (optr->length * sizeof(struct __alloc_area));
+	  memcpy(new, old, olen <= size ? olen : size);
+	  free(old);
     }
-    *(int *)malloc_ptr = size;
-    caddr = malloc_ptr + sizeof(int);
-    malloc_ptr += size + sizeof(int);
-    last_alloc = caddr;
-    malloc_ptr = (char *) ((((unsigned int) malloc_ptr) + 3) & (~3));
-    return caddr;
+     return new;
 }
 
-void *realloc(void *ptr, unsigned int size)
+/*** free.c ***/
+/* join sequential areas in freelist */
+static void __alloc_freelist_join(void)
 {
-    char *caddr, *oaddr = ptr;
+     struct __alloc_area *previous, *current;
 
-    if (!malloc_ptr)
-    	return NULL;
-    if (oaddr == last_alloc) {
-	if (oaddr + size > malloc_top) {
-		prom_printf("realloc failed\n");
-		return NULL;
-	}
-	*(int *)(oaddr - sizeof(int)) = size;
-	malloc_ptr = oaddr + size;
-	return oaddr;
+     previous = NULL;
+
+     /* loop through areas in the freelist */
+     for (current = __freelist; current; current = current->next) {
+	  if (previous && previous + previous->length + 1 == current) {
+	       /* current area starts immediately after the previous
+		* one, join them
+		*/
+
+	       /* increase previous area's length to include the
+		* current area's header and length
+		*/
+	       previous->length++;
+	       previous->length += current->length;
+
+	       /* take the current entry out of the list */
+	       previous->next = current->next;
+	       current = previous;
+	  } else
+	       previous = current;
     }
-    caddr = malloc(size);
-    if (caddr != 0 && oaddr != 0)
-	memcpy(caddr, oaddr, *(int *)(oaddr - sizeof(int)));
-    return caddr;
 }
 
-void free (void *m)
+void free(void *memory)
 {
-    if (!malloc_ptr)
+     struct __alloc_area *free;
+     struct __alloc_area *before;
+     struct __alloc_area *current;
+
+#ifdef MALLOC_DEBUG
+     /* check that memory isn't a NULL pointer (possibly from a failed
+      * malloc). this check is nice, but not compulsory
+      */
+     if (!memory) {
+	  prom_printf("WARNING: attempt to free a NULL pointer\n");
     	return;
-    if (m == last_alloc)
-	malloc_ptr = (char *) last_alloc - sizeof(int);
 }
+#endif /* MALLOC_DEBUG */
 
-void mark (void **ptr)
-{
-    if (!malloc_ptr)
+     /* set free to point to the pointer supplied, move free one element so
+      * that it points to the actual header
+      */
+     free = (struct __alloc_area *)memory;
+     free--;
+
+#ifdef MALLOC_DEBUG
+     /* check that this pointer isn't already in the freelist, or a pointer
+      * to something that's inside something in the freelist. again, this
+      * check isn't essential for a non-broken program
+      */
+     for (current = __freelist; current; current = current->next)
+	  if (free >= current && free < current + current->length) {
+	       prom_printf("WARNING: memory area already in freelist\n");
     	return;
-    *ptr = (void *) malloc_ptr;
 }
+#endif /* MALLOC_DEBUG */
 
-void release (void *ptr)
-{
-    if (!malloc_ptr)
-    	return;
-    malloc_ptr = (char *) ptr;
+     /* free puts areas back in the freelist in order of the pointers, so
+      * that sequential areas can be joined later
+      */
+
+     /* try and find the area that immediately preceeds this one */
+     before = NULL;
+     for (current = __freelist; current && free > current; 
+	  current = current->next)
+	  before = current;
+
+     if (before) {
+	  /* put this area in just after the area before it */
+	  free->next = before->next;
+	  before->next = free;
+     } else {
+	  /* nothing before this area, place at beginning of freelist */
+	  free->next = __freelist;
+	  __freelist = free;
+     }
+
+     /* join any sequential areas */
+     __alloc_freelist_join();
 }
 
+// Should not be here
 char *strdup(char const *str)
 {
     char *p = malloc(strlen(str) + 1);
diff -Nurw yaboot-1.3.14rc1/second/yaboot.c yaboot-ppcrcd/second/yaboot.c
--- yaboot-1.3.14rc1/second/yaboot.c	2006-02-10 03:08:33.000000000 +0100
+++ yaboot-ppcrcd/second/yaboot.c	2006-03-26 21:57:17.000000000 +0200
@@ -193,6 +197,7 @@
      /* Initialize OF interface */
      prom_init ((prom_entry) r5);
 	
+#if 0
      /* Allocate some memory for malloc'ator */
      malloc_base = prom_claim((void *)MALLOCADDR, MALLOCSIZE, 0);
      if (malloc_base == (void *)-1) {
@@ -203,6 +208,13 @@
      malloc_init(malloc_base, MALLOCSIZE);
      DEBUG_F("Malloc buffer allocated at %p (%d bytes)\n",
 	     malloc_base, MALLOCSIZE);
+#endif
+	if ( __alloc_freelist_init() ) {
+		prom_printf("Can't claim malloc buffer (%d bytes at 0x%08x)\n",
+			MALLOCSIZE, MALLOCADDR);
+		return -1;
+	}
+
 		
      /* A few useless DEBUG_F's */
      DEBUG_F("reloc_offset :  %ld         (should be 0)\n", reloc_offset());
@@ -234,10 +246,8 @@
      result = yaboot_main();
 
      /* Get rid of malloc pool */
-     malloc_dispose();
      prom_release(malloc_base, MALLOCSIZE);
-     DEBUG_F("Malloc buffer released. Exiting with code %d\n",
-	     result);
+	DEBUG_F("Malloc buffer released. Exiting with code %d\n", result);
 
      /* Return to OF */
      prom_exit();
-------------- next part --------------
diff -Nurw yaboot-1.3.14rc1/second/cfg.c yaboot-ppcrcd/second/cfg.c
--- yaboot-1.3.14rc1/second/cfg.c	2006-02-10 03:08:33.000000000 +0100
+++ yaboot-ppcrcd/second/cfg.c	2006-03-10 23:16:08.000000000 +0100
@@ -67,11 +67,13 @@
      {cft_strg, "fgcolor", NULL},
      {cft_strg, "bgcolor", NULL},
      {cft_strg, "ptypewarning", NULL},
-     {cft_end, NULL, NULL}};
+	{cft_end, NULL, NULL}
+};
 
 CONFIG cf_image[] =
 {
      {cft_strg, "image", NULL},
+	{cft_strg, "text", NULL},
      {cft_strg, "label", NULL},
      {cft_strg, "alias", NULL},
      {cft_flag, "single-key", NULL},
@@ -106,7 +110,7 @@
 static struct IMAGES {
      CONFIG table[sizeof (cf_image) / sizeof (cf_image[0])];
      struct IMAGES *next;
-} *images = NULL;
+} *images = NULL, *texts = NULL;
 
 void cfg_error (char *msg,...)
 {
@@ -305,6 +310,21 @@
 	  curr_table = ((*p)->table);
 	  memcpy (curr_table, cf_image, sizeof (cf_image));
      }
+	else if (!strcasecmp (item, "text")) {
+		struct IMAGES **p = &texts;
+
+		while (*p)
+			p = &((*p)->next);
+		*p = (struct IMAGES *)malloc (sizeof (struct IMAGES));
+		if (*p == NULL) {
+			prom_printf("malloc error in cfg_set\n");
+			return -1;
+		}
+		(*p)->next = 0;
+		curr_table = ((*p)->table);
+		memcpy (curr_table, cf_image, sizeof (cf_image));
+	}
+
      for (walk = curr_table; walk->type != cft_end; walk++) {
 	  if (walk->name && !strcasecmp (walk->name, item)) {
 	       if (value && walk->type != cft_strg)
@@ -384,6 +404,17 @@
 	       return ret;
 	  }
      }
+	for (p = texts; p; p = p->next) {
+		label = cfg_get_strg_i (p->table, "label");
+		alias = cfg_get_strg_i (p->table, "alias");
+		if (!strcmp (label, image) || (alias && !strcmp (alias, image))) {
+			ret = cfg_get_strg_i (p->table, item);
+			if (!ret)
+				ret = cfg_get_strg_i (cf_options, item);
+			return ret;
+		}
+	}
+
      return 0;
 }
 
diff -Nurw yaboot-1.3.14rc1/second/yaboot.c yaboot-ppcrcd/second/yaboot.c
--- yaboot-1.3.14rc1/second/yaboot.c	2006-02-10 03:08:33.000000000 +0100
+++ yaboot-ppcrcd/second/yaboot.c	2006-03-26 21:57:17.000000000 +0200
@@ -264,7 +274,7 @@
 #endif /* CONFIG_COLOR_TEXT */
 
 
-void print_message_file(char *filename)
+void print_message_file(char *filename, int paging)
 {
      char *msg = NULL; 
      char *p, *endp;
@@ -288,28 +298,70 @@
 	  }
 
      strncpy(msgpath, filename, sizeof(msgpath));
-     if (!parse_device_path(msgpath, defdev, defpart, "/etc/yaboot.msg", &msgfile)) {
+	if (!parse_device_path(msgpath, defdev, defpart,
+			"/etc/yaboot.msg", &msgfile)) {
 	  prom_printf("%s: Unable to parse\n", msgpath);
 	  goto done;
      }
 
+	msg = malloc(2001);
+	if (!msg)
+		goto done;
+	else
+		memset(msg, 0, 2001);
+
      result = open_file(&msgfile, &file);
      if (result != FILE_ERR_OK) {
 	  prom_printf("%s:%d,", msgfile.dev, msgfile.part);
 	  prom_perror(result, msgfile.file);
 	  goto done;
-     } else
+	}
 	  opened = 1;
 
-     msg = malloc(2001);
-     if (!msg)
+	if ( file.fs->read(&file, 2000, msg) <= 0)
 	  goto done;
-     else
-	  memset(msg, 0, 2001);
 
-     if (file.fs->read(&file, 2000, msg) <= 0)
+	if ( paging ) {
+		char *nlp;
+		int c;
+		int len = 0;
+		int new_lines;
+
+		while ( *msg != '\0' ) {
+			new_lines = 20;
+			nlp = msg;
+			while (--new_lines > 0) {
+				nlp = strchr((nlp+1), '\n');
+				if ( nlp == NULL ) { /* less than 20 lines */
+					if ( msg[1999] == '\0' ) {
+						/* end of file */
+						prom_printf("\r                   \r%s", msg);
 	  goto done;
-     else
+					}
+					nlp = strrchr(msg, '\n');
+				}
+			}
+			c = *++nlp;
+			*nlp = '\0';
+
+			prom_printf("\r                   \r%s[Press a key, or Q]", msg);
+
+			len = nlp - msg; /* displayed message length */
+			*nlp = c;
+			memcpy(msg, nlp, 2000 - len);
+			memset(msg + (2000 - len), 0, len);
+			file.fs->read(&file, len, msg + (2000 - len));
+			msg[2000] = '\0';
+
+			/* wait until key */
+			while ( (c = prom_nbgetchar()) == -1 );
+			if ( c == 'q' || c == 'Q' ) {
+				prom_printf("\r                   \r");
+				goto done;
+			}
+		}
+		prom_printf("\r                   \rUnexpected end of file\n");
+	} else
 	  prom_printf("%s", msg);
 
 done:
@@ -426,7 +477,7 @@
 
      p = cfg_get_strg(0, "message");
      if (p)
-	  print_message_file(p);
+		print_message_file(p, 0);
 
      result = 1;
     
@@ -712,6 +776,14 @@
 			 check_password ("This image is restricted.");
 	       }
 	       params->args = make_params(label, params->args);
+		} else {	/* no *p */
+			p = cfg_get_strg(imagename, "text");
+			if (p && *p) {
+				if(!defdevice) defdevice = boot.dev;
+				prom_printf("\n");
+				print_message_file(p, 1);
+				return 0;
+			}
 	  }
      }
 
-------------- next part --------------
diff -Nurw yaboot-1.3.14rc1/include/gunzip.h yaboot-ppcrcd/include/gunzip.h
--- yaboot-1.3.14rc1/include/gunzip.h	1970-01-01 01:00:00.000000000 +0100
+++ yaboot-ppcrcd/include/gunzip.h	2006-01-05 21:15:07.000000000 +0100
@@ -0,0 +1,11 @@
+
+#include "file.h"
+extern struct boot_file_t gunzip_file;
+extern int compressed_file;
+
+//gunzip_test_header
+//gunzip_read
+int gunzip_test_header (void);
+int gunzip_read (void* buffer, unsigned int len);
+int gunzip_seek (unsigned int len);
+
diff -Nurw yaboot-1.3.14rc1/second/cfg.c yaboot-ppcrcd/second/cfg.c
--- yaboot-1.3.14rc1/second/cfg.c	2006-02-10 03:08:33.000000000 +0100
+++ yaboot-ppcrcd/second/cfg.c	2006-03-10 23:16:08.000000000 +0100
@@ -39,7 +39,7 @@
      void *data;
 } CONFIG;
 
-#define MAX_TOKEN 200
+#define MAX_TOKEN 511
 #define MAX_VAR_NAME MAX_TOKEN
 #define EOF -1
 
@@ -87,11 +89,13 @@
      {cft_strg, "initrd", NULL},
      {cft_flag, "initrd-prompt", NULL},
      {cft_strg, "initrd-size", NULL},
+	{cft_strg, "kernel-size", NULL},
      {cft_flag, "pause-after", NULL},
      {cft_strg, "pause-message", NULL},
      {cft_flag, "novideo", NULL},
      {cft_strg, "sysmap", NULL},
-     {cft_end, NULL, NULL}};
+	{cft_end, NULL, NULL}
+};
 
 static char flag_set;
 static char *last_token = NULL, *last_item = NULL, *last_value = NULL;
diff -Nurw yaboot-1.3.14rc1/second/gunzip.c yaboot-ppcrcd/second/gunzip.c
--- yaboot-1.3.14rc1/second/gunzip.c	1970-01-01 01:00:00.000000000 +0100
+++ yaboot-ppcrcd/second/gunzip.c	2006-03-26 21:57:17.000000000 +0200
@@ -0,0 +1,1215 @@
+/*
+ *  yaboot for ppcrcd
+ *  PLD Linux Distribution
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 1999  Free Software Foundation, Inc.
+ */
+
+/*
+ * Most of this file was originally the source file "inflate.c", written
+ * by Mark Adler.  It has been very heavily modified.  In particular, the
+ * original would run through the whole file at once, and this version can
+ * be stopped and restarted on any boundary during the decompression process.
+ *
+ * The license and header comments that file are included here.
+ */
+
+/* inflate.c -- Not copyrighted 1992 by Mark Adler
+ version c10p1, 10 January 1993 */
+
+/* You can do whatever you like with this source file, though I would
+  prefer that if you modify it and redistribute it that you include
+  comments to that effect with your name and the date.  Thank you.
+ */
+
+/*
+	Inflate deflated (PKZIP's method 8 compressed) data.  The compression
+	method searches for as much of the current string of bytes (up to a
+	length of 258) in the previous 32K bytes.  If it doesn't find any
+	matches (of at least length 3), it codes the next byte.  Otherwise, it
+	codes the length of the matched string and its distance backwards from
+	the current position.  There is a single Huffman code that codes both
+	single bytes (called "literals") and match lengths.  A second Huffman
+	code codes the distance information, which follows a length code.  Each
+	length or distance code actually represents a base value and a number
+	of "extra" (sometimes zero) bits to get to add to the base value.  At
+	the end of each deflated block is a special end-of-block (EOB) literal/
+	length code.  The decoding process is basically: get a literal/length
+	code; if EOB then done; if a literal, emit the decoded byte; if a
+	length then get the distance and emit the referred-to bytes from the
+	sliding window of previously emitted data.
+	
+	There are (currently) three kinds of inflate blocks: stored, fixed, and
+	dynamic.  The compressor deals with some chunk of data at a time, and
+	decides which method to use on a chunk-by-chunk basis.  A chunk might
+	typically be 32K or 64K.  If the chunk is uncompressible, then the
+	"stored" method is used.  In this case, the bytes are simply stored as
+	is, eight bits per byte, with none of the above coding.  The bytes are
+	preceded by a count, since there is no longer an EOB code.
+	
+	If the data is compressible, then either the fixed or dynamic methods
+	are used.  In the dynamic method, the compressed data is preceded by
+	an encoding of the literal/length and distance Huffman codes that are
+	to be used to decode this block.  The representation is itself Huffman
+	coded, and so is preceded by a description of that code.  These code
+	descriptions take up a little space, and so for small blocks, there is
+	a predefined set of codes, called the fixed codes.  The fixed method is
+	used if the block codes up smaller that way (usually for quite small
+	chunks), otherwise the dynamic method is used.  In the latter case, the
+	codes are customized to the probabilities in the current block, and so
+	can code it much better than the pre-determined fixed codes.
+	
+	The Huffman codes themselves are decoded using a mutli-level table
+	lookup, in order to maximize the speed of decoding plus the speed of
+	building the decoding tables.  See the comments below that precede the
+	lbits and dbits tuning parameters.
+*/
+
+
+/*
+	Notes beyond the 1.93a appnote.txt:
+	
+	1. Distance pointers never point before the beginning of the output
+	stream.
+	2. Distance pointers can point back across blocks, up to 32k away.
+	3. There is an implied maximum of 7 bits for the bit length table and
+	15 bits for the actual data.
+	4. If only one code exists, then it is encoded using one bit.  (Zero
+	would be more efficient, but perhaps a little confusing.)  If two
+	codes exist, they are coded using one bit each (0 and 1).
+	5. There is no way of sending zero distance codes--a dummy must be
+	sent if there are none.  (History: a pre 2.0 version of PKZIP would
+	store blocks with no distance codes, but this was discovered to be
+	too harsh a criterion.)  Valid only for 1.93a.  2.04c does allow
+	zero distance codes, which is sent as one code of zero bits in
+	length.
+	6. There are up to 286 literal/length codes.  Code 256 represents the
+	end-of-block.  Note however that the static length tree defines
+	288 codes just to fill out the Huffman codes.  Codes 286 and 287
+	cannot be used though, since there is no length base or extra bits
+	defined for them.  Similarly, there are up to 30 distance codes.
+	However, static trees define 32 codes (all 5 bits) to fill out the
+	Huffman codes, but the last two had better not show up in the data.
+	7. Unzip can check dynamic Huffman blocks for complete code sets.
+	The exception is that a single code would not be complete (see #4).
+	8. The five bits following the block type is really the number of
+	literal codes sent minus 257.
+	9. Length codes 8,16,16 are interpreted as 13 length codes of 8 bits
+	(1+6+6).  Therefore, to output three times the length, you output
+	three codes (1+1+1), whereas to output four times the same length,
+	you only need two codes (1+3).  Hmm.
+	10. In the tree reconstruction algorithm, Code = Code + Increment
+	only if BitLength(i) is not zero.  (Pretty obvious.)
+	11. Correction: 4 Bits: # of Bit Length codes - 4     (4 - 19)
+	12. Note: length code 284 can represent 227-258, but length code 285
+	really is 258.  The last length deserves its own, short code
+	since it gets used a lot in very redundant files.  The length
+	258 is special since 258 - 3 (the min match length) is 255.
+	13. The literal/length and distance code bit lengths are read as a
+	single stream of lengths.  It is possible (and advantageous) for
+	a repeat code (16, 17, or 18) to go across the boundary between
+	the two sets of lengths.
+*/
+
+#include "stdlib.h"
+#include "string.h"
+#include "errors.h"
+#include "file.h"
+#include "gunzip.h"
+
+int initialized_gzmalloc = 0;
+
+/* used to tell if "read" should be redirected to "gunzip_read" */
+int compressed_file;
+
+/* internal variables only */
+static int gzip_data_offset;
+static int gzip_filepos;
+static int saved_filepos;
+
+/* internal extra variables for use of inflate code */
+static int block_type;
+static int block_len;
+static int last_block;
+static int code_state;
+
+/* Function prototypes */
+static void initialize_tables (void);
+
+
+/* malloc replace */
+static char *gzmalloc_ptr = 0;
+static char *gzmalloc_start = 0;
+
+#define GZMEMSIZE 0x8000
+static unsigned int gzmalloc_size = GZMEMSIZE;
+
+
+void *
+gzmalloc (unsigned int size)
+{
+	char *caddr;
+
+	if (!gzmalloc_ptr)
+		return NULL;
+	while ((gzmalloc_ptr + size + sizeof(int)) 
+			> gzmalloc_start + gzmalloc_size) {
+		prom_printf("warning: gunzip needs more memory\n");
+		gzmalloc_size += GZMEMSIZE;
+		gzmalloc_start = realloc(gzmalloc_start, gzmalloc_size);
+	}
+	*(int *)gzmalloc_ptr = size;
+	caddr = gzmalloc_ptr + sizeof(int);
+	gzmalloc_ptr += size + sizeof(int);
+	gzmalloc_ptr = (char *) ((((unsigned int) gzmalloc_ptr) + 3) & (~3));
+	return caddr;
+}
+
+void
+reset_gzmalloc(void) {
+	gzmalloc_ptr = gzmalloc_start;
+}
+
+
+/* internal function for eating variable-length header fields */
+static int
+bad_field (int len)
+{
+	char ch = 1;
+	int not_retval = 1;
+
+	do
+	{
+		if (len >= 0)
+		{
+			if (!(len--))
+				break;
+		}
+		else
+		{
+			if (!ch)
+				break;
+		}
+	}
+	while ((not_retval = gunzip_file.fs->read(&gunzip_file, 1, &ch)) == 1);
+
+	return (!not_retval);
+}
+
+
+/* Big-Endian defines for the 2-byte magic number for gzip files */
+#define GZIP_HDR_BE		0x1F8B
+#define OLD_GZIP_HDR_BE	0x1F9E
+
+/* Compression methods (see algorithm.doc) */
+#define STORED		0
+#define COMPRESSED	1
+#define PACKED		2
+#define LZHED		3
+/* methods 4 to 7 reserved */
+#define DEFLATED	8
+#define MAX_METHODS	9
+
+/* gzip flag byte */
+#define ASCII_FLAG	 0x01	/* bit 0 set: file probably ascii text */
+#define CONTINUATION 0x02	/* bit 1 set: continuation of multi-part gzip file */
+#define EXTRA_FIELD	 0x04	/* bit 2 set: extra field present */
+#define ORIG_NAME	 0x08	/* bit 3 set: original file name present */
+#define COMMENT		 0x10	/* bit 4 set: file comment present */
+#define ENCRYPTED	 0x20	/* bit 5 set: file is encrypted */
+#define RESERVED	 0xC0	/* bit 6,7:   reserved */
+
+#define UNSUPP_FLAGS (CONTINUATION|ENCRYPTED|RESERVED)
+
+/* inflate block codes */
+#define INFLATE_STORED	0
+#define INFLATE_FIXED	1
+#define INFLATE_DYNAMIC	2
+
+typedef unsigned char uch;
+typedef unsigned short ush;
+typedef unsigned long ulg;
+
+
+
+/*
+ *  Window Size
+ *
+ *  This must be a power of two, and at least 32K for zip's deflate method
+ */
+
+#define WSIZE 0x8000
+
+int
+gunzip_test_header (void)
+{
+	unsigned char buf[10];
+
+	compressed_file = 0;
+
+	/*
+	 *  This checks if the file is gzipped.  If a problem occurs here
+	 *  (other than a real error with the disk) then we don't think it
+	 *  is a compressed file, and simply mark it as such.
+	 */
+	if ( gunzip_file.fs->read(&gunzip_file, 10, &buf) != 10
+			|| ((*((unsigned short *) buf) != GZIP_HDR_BE)
+			&& (*((unsigned short *) buf) != OLD_GZIP_HDR_BE)))
+	{
+		gunzip_file.fs->seek(&gunzip_file, 0);
+		return 1;
+	}
+
+	/*
+	 *  This does consistency checking on the header data.  If a
+	 *  problem occurs from here on, then we have corrupt or otherwise
+	 *  bad data, and the error should be reported to the user.
+	 */
+	if (buf[2] != DEFLATED
+			|| (buf[3] & UNSUPP_FLAGS)
+			|| ((buf[3] & EXTRA_FIELD)
+			&& (gunzip_file.fs->read(&gunzip_file, 2, &buf) != 2
+			|| bad_field (*((unsigned short *) buf))))
+			|| ((buf[3] & ORIG_NAME) && bad_field (-1))
+			|| ((buf[3] & COMMENT) && bad_field (-1)))
+	{
+		gunzip_file.fs->seek(&gunzip_file, 0);
+		return 10;
+	}
+
+	gzip_data_offset = gunzip_file.pos;
+
+	if (!initialized_gzmalloc)
+	{
+		gzmalloc_start = gzmalloc_ptr = malloc(gzmalloc_size);
+		if (gzmalloc_start == NULL ) {
+			prom_printf("malloc in gzunzip failed\n");
+			return 2;
+		}
+		initialized_gzmalloc = 1;
+	}
+
+	initialize_tables ();
+
+	compressed_file = 1;
+
+	gzip_filepos = 0;
+
+	return 0;
+}
+
+
+
+/* The inflate algorithm uses a sliding 32K byte window on the uncompressed
+ stream to find repeated byte strings.  This is implemented here as a
+ circular buffer.  The index is updated simply by incrementing and then
+ and'ing with 0x7fff (32K-1). */
+/* It is left to other modules to supply the 32K area.  It is assumed
+ to be usable as if it were declared "uch slide[32768];" or as just
+ "uch *slide;" and then malloc'ed in the latter case.  The definition
+ must be in unzip.h, included above. */
+
+
+/* sliding window in uncompressed data */
+static uch slide[WSIZE];
+
+/* current position in slide */
+static unsigned wp;
+
+
+/* Tables for deflate from PKZIP's appnote.txt. */
+static unsigned bitorder[] =
+{
+	/* Order of the bit length code lengths */
+	16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
+};
+static ush cplens[] =
+{
+	/* Copy lengths for literal codes 257..285 */
+	3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
+	35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0
+};
+/* note: see note #13 above about the 258 in this list. */
+static ush cplext[] =
+{
+	/* Extra bits for literal codes 257..285 */
+	0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
+	3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99
+};	/* 99==invalid */
+static ush cpdist[] =
+{
+	/* Copy offsets for distance codes 0..29 */
+	1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
+	257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
+	8193, 12289, 16385, 24577
+};
+static ush cpdext[] =
+{
+	/* Extra bits for distance codes */
+	0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
+	7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
+	12, 12, 13, 13
+};
+
+
+/*
+ Huffman code decoding is performed using a multi-level table lookup.
+ The fastest way to decode is to simply build a lookup table whose
+ size is determined by the longest code.  However, the time it takes
+ to build this table can also be a factor if the data being decoded
+ is not very long.  The most common codes are necessarily the
+ shortest codes, so those codes dominate the decoding time, and hence
+ the speed.  The idea is you can have a shorter table that decodes the
+ shorter, more probable codes, and then point to subsidiary tables for
+ the longer codes.  The time it costs to decode the longer codes is
+ then traded against the time it takes to make longer tables.
+
+ This results of this trade are in the variables lbits and dbits
+ below.  lbits is the number of bits the first level table for literal/
+ length codes can decode in one step, and dbits is the same thing for
+ the distance codes.  Subsequent tables are also less than or equal to
+ those sizes.  These values may be adjusted either when all of the
+ codes are shorter than that, in which case the longest code length in
+ bits is used, or when the shortest code is *longer* than the requested
+ table size, in which case the length of the shortest code in bits is
+ used.
+
+ There are two different values for the two tables, since they code a
+ different number of possibilities each.  The literal/length table
+ codes 286 possible values, or in a flat code, a little over eight
+ bits.  The distance table codes 30 possible values, or a little less
+ than five bits, flat.  The optimum values for speed end up being
+ about one bit more than those, so lbits is 8+1 and dbits is 5+1.
+ The optimum values may differ though from machine to machine, and
+ possibly even between compilers.  Your mileage may vary.
+*/
+
+
+static int lbits = 9;		/* bits in base literal/length lookup table */
+static int dbits = 6;		/* bits in base distance lookup table */
+
+
+/* If BMAX needs to be larger than 16, then h and x[] should be ulg. */
+#define BMAX 16			/* maximum bit length of any code (16 for explode) */
+#define N_MAX 288		/* maximum number of codes in any set */
+
+/* Macros for inflate() bit peeking and grabbing.
+ The usage is:
+
+	NEEDBITS(j)
+	x = b & mask_bits[j];
+	DUMPBITS(j)
+
+ where NEEDBITS makes sure that b has at least j bits in it, and
+ DUMPBITS removes the bits from b.  The macros use the variable k
+ for the number of bits in b.  Normally, b and k are register
+ variables for speed, and are initialized at the beginning of a
+ routine that uses these macros from a global bit buffer and count.
+ 
+ If we assume that EOB will be the longest code, then we will never
+ ask for bits with NEEDBITS that are beyond the end of the stream.
+ So, NEEDBITS should not read any more bytes than are needed to
+ meet the request.  Then no bytes need to be "returned" to the buffer
+ at the end of the last block.
+
+ However, this assumption is not true for fixed blocks--the EOB code
+ is 7 bits, but the other literal/length codes can be 8 or 9 bits.
+ (The EOB code is shorter than other codes because fixed blocks are
+ generally short.  So, while a block always has an EOB, many other
+ literal/length codes have a significantly lower probability of
+ showing up at all.)  However, by making the first table have a
+ lookup of seven bits, the EOB code will be found in that first
+ lookup, and so will not require that too many bits be pulled from
+ the stream.
+*/
+
+static ulg bb;			/* bit buffer */
+static unsigned bk;		/* bits in bit buffer */
+
+static ush mask_bits[] =
+{
+	0x0000,
+	0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,
+	0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff
+};
+
+#define NEEDBITS(n) { while( k<(n) )  { \
+					b |= ( (ulg)get_byte() ) << k;	k += 8;	} }
+#define DUMPBITS(n) { b >>= (n);  k -= (n);  }
+
+#define INBUFSIZ  0x2000
+
+static uch inbuf[INBUFSIZ];
+static int bufloc;
+
+static int
+get_byte (void)
+{
+	if (gunzip_file.pos == gzip_data_offset || bufloc == INBUFSIZ)
+	{
+		bufloc = 0;
+		gunzip_file.fs->read(&gunzip_file, INBUFSIZ, &inbuf);
+	}
+
+	return inbuf[bufloc++];
+}
+
+
+/* Huffman code lookup table entry--this entry is four bytes for machines
+ that have 16-bit pointers (e.g. PC's in the small or medium model).
+ Valid extra bits are 0..13.  e == 15 is EOB (end of block), e == 16
+ means that v is a literal, 16 < e < 32 means that v is a pointer to
+ the next table, which codes e - 16 bits, and lastly e == 99 indicates
+ an unused code.  If a code with e == 99 is looked up, this implies an
+ error in the data. */
+struct huft
+{
+	uch e;			/* number of extra bits or operation */
+	uch b;			/* number of bits in this code or subcode */
+	union
+	{
+		ush n;			/* literal, length base, or distance base */
+		struct huft *t;		/* pointer to next level of table */
+	}
+	v;
+};
+
+
+/* decompression global pointers */
+static int bl;			/* lookup bits for tl */
+static int bd;			/* lookup bits for td */
+static struct huft *tl;		/* literal/length code table */
+static struct huft *td;		/* distance code table */
+
+
+/* more function prototypes */
+static int huft_build (unsigned *, unsigned, unsigned, ush *, ush *,
+						struct huft **, int *);
+static int inflate_codes_in_window (void);
+
+
+/* Given a list of code lengths and a maximum table size, make a set of
+tables to decode that set of codes.  Return zero on success, one if
+the given code set is incomplete (the tables are still built in this
+case), two if the input is invalid (all zero length codes or an
+oversubscribed set of lengths), and three if not enough memory. */
+
+static int
+huft_build (unsigned *b,	/* code lengths in bits (all assumed <= BMAX) */
+		unsigned n,		/* number of codes (assumed <= N_MAX) */
+		unsigned s,		/* number of simple-valued codes (0..s-1) */
+		ush * d,		/* list of base values for non-simple codes */
+		ush * e,		/* list of extra bits for non-simple codes */
+		struct huft **t,	/* result: starting table */
+		int *m)		/* maximum lookup bits, returns actual */
+{
+	unsigned a;			/* counter for codes of length k */
+	unsigned c[BMAX + 1];		/* bit length count table */
+	unsigned f;			/* i repeats in table every f entries */
+	int g;			/* maximum code length */
+	int h;			/* table level */
+	register unsigned i;		/* counter, current code */
+	register unsigned j;		/* counter */
+	register int k;		/* number of bits in current code */
+	int l;			/* bits per table (returned in m) */
+	register unsigned *p;		/* pointer into c[], b[], or v[] */
+	register struct huft *q;	/* points to current table */
+	struct huft r;		/* table entry for structure assignment */
+	struct huft *u[BMAX];		/* table stack */
+	unsigned v[N_MAX];		/* values in order of bit length */
+	register int w;		/* bits before this table == (l * h) */
+	unsigned x[BMAX + 1];		/* bit offsets, then code stack */
+	unsigned *xp;			/* pointer into x */
+	int y;			/* number of dummy codes added */
+	unsigned z;			/* number of entries in current table */
+
+	/* Generate counts for each bit length */
+	memset ((char *) c, 0, sizeof (c));
+	p = b;
+	i = n;
+	do
+	{
+		c[*p]++;			/* assume all entries <= BMAX */
+		p++;			/* Can't combine with above line (Solaris bug) */
+	}
+	while (--i);
+	if (c[0] == n)		/* null input--all zero length codes */
+	{
+		*t = (struct huft *) NULL;
+		*m = 0;
+		return 0;
+	}
+
+	/* Find minimum and maximum length, bound *m by those */
+	l = *m;
+	for (j = 1; j <= BMAX; j++)
+		if (c[j])
+			break;
+	k = j;			/* minimum code length */
+	if ((unsigned) l < j)
+		l = j;
+	for (i = BMAX; i; i--)
+		if (c[i])
+			break;
+	g = i;			/* maximum code length */
+	if ((unsigned) l > i)
+		l = i;
+	*m = l;
+
+	/* Adjust last length count to fill out codes, if needed */
+	for (y = 1 << j; j < i; j++, y <<= 1)
+		if ((y -= c[j]) < 0)
+			return 2;			/* bad input: more codes than bits */
+	if ((y -= c[i]) < 0)
+		return 2;
+	c[i] += y;
+
+	/* Generate starting offsets into the value table for each length */
+	x[1] = j = 0;
+	p = c + 1;
+	xp = x + 2;
+	while (--i)
+	{				/* note that i == g from above */
+		*xp++ = (j += *p++);
+	}
+
+	/* Make a table of values in order of bit lengths */
+	p = b;
+	i = 0;
+	do
+	{
+		if ((j = *p++) != 0)
+			v[x[j]++] = i;
+	}
+	while (++i < n);
+
+	/* Generate the Huffman codes and for each, make the table entries */
+	x[0] = i = 0;			/* first Huffman code is zero */
+	p = v;			/* grab values in bit order */
+	h = -1;			/* no tables yet--level -1 */
+	w = -l;			/* bits decoded == (l * h) */
+	u[0] = (struct huft *) NULL;	/* just to keep compilers happy */
+	q = (struct huft *) NULL;	/* ditto */
+	z = 0;			/* ditto */
+
+	/* go through the bit lengths (k already is bits in shortest code) */
+	for (; k <= g; k++)
+	{
+		a = c[k];
+		while (a--)
+		{
+			/* here i is the Huffman code of length k bits for value *p */
+			/* make tables up to required level */
+			while (k > w + l)
+			{
+				h++;
+				w += l;		/* previous table always l bits */
+
+				/* compute minimum size table less than or equal to l bits */
+				z = (z = g - w) > (unsigned) l ? l : z;	/* upper limit on table size */
+				if ((f = 1 << (j = k - w)) > a + 1)	/* try a k-w bit table */
+				{		/* too few codes for k-w bit table */
+					f -= a + 1;	/* deduct codes from patterns left */
+					xp = c + k;
+					while (++j < z)	/* try smaller tables up to z bits */
+					{
+						if ((f <<= 1) <= *++xp)
+							break;	/* enough codes to use up j bits */
+						f -= *xp;	/* else deduct codes from patterns */
+					}
+				}
+				z = 1 << j;	/* table entries for j-bit table */
+
+				/* allocate and link in new table */
+				if ((q = (struct huft *)gzmalloc( (z + 1)*sizeof(struct huft) )) ==
+								 (struct huft *)NULL)
+				{
+					prom_printf("\ngunzip: malloc failed; not enought memory ?\n");
+					return 3;	/* not enough memory */
+				}
+
+			*t = q + 1;	/* link to list for huft_free() */
+			*(t = &(q->v.t)) = (struct huft *) NULL;
+			u[h] = ++q;	/* table starts after link */
+
+			/* connect to last table, if there is one */
+			if (h)
+			{
+				x[h] = i;	/* save pattern for backing up */
+				r.b = (uch) l;	/* bits to dump before this table */
+				r.e = (uch) (16 + j);		/* bits in this table */
+				r.v.t = q;	/* pointer to this table */
+				j = i >> (w - l);	/* (get around Turbo C bug) */
+				u[h - 1][j] = r;	/* connect to last table */
+			}
+			}
+
+			/* set up table entry in r */
+			r.b = (uch) (k - w);
+			if (p >= v + n)
+				r.e = 99;		/* out of values--invalid code */
+			else if (*p < s)
+			{
+				r.e = (uch) (*p < 256 ? 16 : 15);		/* 256 is end-of-block code */
+				r.v.n = (ush) (*p);	/* simple code is just the value */
+				p++;		/* one compiler does not like *p++ */
+			}
+			else
+			{
+				r.e = (uch) e[*p - s];	/* non-simple--look up in lists */
+				r.v.n = d[*p++ - s];
+			}
+
+			/* fill code-like entries with r */
+			f = 1 << (k - w);
+			for (j = i >> w; j < z; j += f)
+				q[j] = r;
+
+			/* backwards increment the k-bit code i */
+			for (j = 1 << (k - 1); i & j; j >>= 1)
+				i ^= j;
+			i ^= j;
+
+			/* backup over finished tables */
+			while ((i & ((1 << w) - 1)) != x[h])
+			{
+				h--;		/* don't need to update q */
+				w -= l;
+			}
+		}
+	}
+
+	/* Return true (1) if we were given an incomplete table */
+	return y != 0 && g != 1;
+}
+
+
+/*
+*  inflate (decompress) the codes in a deflated (compressed) block.
+*  Return an error code or zero if it all goes ok.
+*/
+
+static unsigned inflate_n, inflate_d;
+
+static int
+inflate_codes_in_window (void)
+{
+	register unsigned e;		/* table entry flag/number of extra bits */
+	unsigned n, d;		/* length and index for copy */
+	unsigned w;			/* current window position */
+	struct huft *t;		/* pointer to table entry */
+	unsigned ml, md;		/* masks for bl and bd bits */
+	register ulg b;		/* bit buffer */
+	register unsigned k;		/* number of bits in bit buffer */
+
+	/* make local copies of globals */
+	d = inflate_d;
+	n = inflate_n;
+	b = bb;			/* initialize bit buffer */
+	k = bk;
+	w = wp;			/* initialize window position */
+
+	/* inflate the coded data */
+	ml = mask_bits[bl];		/* precompute masks for speed */
+	md = mask_bits[bd];
+	for (;;)			/* do until end of block */
+	{
+		if (!code_state)
+		{
+			NEEDBITS ((unsigned) bl);
+			if ((e = (t = tl + ((unsigned) b & ml))->e) > 16)
+				do
+			{
+				if (e == 99)
+				{
+					prom_printf("ERR_BAD_GZIP_DATA: inflate_codes_in_window 1\n");
+					return 0;
+				}
+				DUMPBITS (t->b);
+				e -= 16;
+				NEEDBITS (e);
+			}
+			while ((e = (t = t->v.t + ((unsigned) b & mask_bits[e]))->e) > 16);
+			DUMPBITS (t->b);
+
+			if (e == 16)		/* then it's a literal */
+			{
+				slide[w++] = (uch) t->v.n;
+				if (w == WSIZE)
+					break;
+			}
+			else
+				/* it's an EOB or a length */
+			{
+				/* exit if end of block */
+				if (e == 15)
+				{
+					block_len = 0;
+					break;
+				}
+
+				/* get length of block to copy */
+				NEEDBITS (e);
+				n = t->v.n + ((unsigned) b & mask_bits[e]);
+				DUMPBITS (e);
+
+				/* decode distance of block to copy */
+				NEEDBITS ((unsigned) bd);
+				if ((e = (t = td + ((unsigned) b & md))->e) > 16)
+					do
+				{
+					if (e == 99)
+					{
+						prom_printf("ERR_BAD_GZIP_DATA: inflate_codes_in_window 2\n");
+						return 0;
+					}
+					DUMPBITS (t->b);
+					e -= 16;
+					NEEDBITS (e);
+				}
+				while ((e = (t = t->v.t + ((unsigned) b & mask_bits[e]))->e)
+								> 16);
+				DUMPBITS (t->b);
+				NEEDBITS (e);
+				d = w - t->v.n - ((unsigned) b & mask_bits[e]);
+				DUMPBITS (e);
+				code_state++;
+			}
+		}
+
+		if (code_state)
+		{
+			/* do the copy */
+			do
+			{
+				n -= (e = (e = WSIZE - ((d &= WSIZE - 1) > w ? d : w)) > n ? n
+					: e);
+				if (w - d >= e)
+				{
+					memmove (slide + w, slide + d, e);
+					w += e;
+					d += e;
+				}
+				else
+					/* purposefully use the overlap for extra copies here!! */
+				{
+					while (e--)
+						slide[w++] = slide[d++];
+				}
+				if (w == WSIZE)
+					break;
+			}
+			while (n);
+
+			if (!n)
+				code_state--;
+
+			/* did we break from the loop too soon? */
+			if (w == WSIZE)
+				break;
+		}
+	}
+
+	/* restore the globals from the locals */
+	inflate_d = d;
+	inflate_n = n;
+	wp = w;			/* restore global window pointer */
+	bb = b;			/* restore global bit buffer */
+	bk = k;
+
+	return !block_len;
+}
+
+
+/* get header for an inflated type 0 (stored) block. */
+
+static void
+init_stored_block (void)
+{
+	register ulg b;		/* bit buffer */
+	register unsigned k;		/* number of bits in bit buffer */
+
+	/* make local copies of globals */
+	b = bb;			/* initialize bit buffer */
+	k = bk;
+
+	/* go to byte boundary */
+	DUMPBITS (k & 7);
+
+	/* get the length and its complement */
+	NEEDBITS (16);
+	block_len = ((unsigned) b & 0xffff);
+	DUMPBITS (16);
+	NEEDBITS (16);
+	if (block_len != (unsigned) ((~b) & 0xffff))
+		prom_printf("ERR_BAD_GZIP_DATA: init_stored_block");
+	DUMPBITS (16);
+
+	/* restore global variables */
+	bb = b;
+	bk = k;
+}
+
+
+/* get header for an inflated type 1 (fixed Huffman codes) block.  We should
+  either replace this with a custom decoder, or at least precompute the
+  Huffman tables. */
+
+static void
+init_fixed_block ()
+{
+	int i;			/* temporary variable */
+	unsigned l[288];		/* length list for huft_build */
+
+	/* set up literal table */
+	for (i = 0; i < 144; i++)
+		l[i] = 8;
+	for (; i < 256; i++)
+		l[i] = 9;
+	for (; i < 280; i++)
+		l[i] = 7;
+	for (; i < 288; i++)		/* make a complete, but wrong code set */
+		l[i] = 8;
+	bl = 7;
+	if ((i = huft_build (l, 288, 257, cplens, cplext, &tl, &bl)) != 0)
+	{
+		prom_printf("ERR_BAD_GZIP_DATA: init_fixed_block 1\n");
+		return;
+	}
+
+	/* set up distance table */
+	for (i = 0; i < 30; i++)	/* make an incomplete code set */
+		l[i] = 5;
+	bd = 5;
+	if ((i = huft_build (l, 30, 0, cpdist, cpdext, &td, &bd)) > 1)
+	{
+		prom_printf("ERR_BAD_GZIP_DATA: init_fixed_block 2\n");
+		return;
+	}
+
+	/* indicate we're now working on a block */
+	code_state = 0;
+	block_len++;
+}
+
+
+/* get header for an inflated type 2 (dynamic Huffman codes) block. */
+
+static void
+init_dynamic_block (void)
+{
+	int i;			/* temporary variables */
+	unsigned j;
+	unsigned l;			/* last length */
+	unsigned m;			/* mask for bit lengths table */
+	unsigned n;			/* number of lengths to get */
+	unsigned nb;			/* number of bit length codes */
+	unsigned nl;			/* number of literal/length codes */
+	unsigned nd;			/* number of distance codes */
+	unsigned ll[286 + 30];	/* literal/length and distance code lengths */
+	register ulg b;		/* bit buffer */
+	register unsigned k;		/* number of bits in bit buffer */
+
+	/* make local bit buffer */
+	b = bb;
+	k = bk;
+
+	/* read in table lengths */
+	NEEDBITS (5);
+	nl = 257 + ((unsigned) b & 0x1f);	/* number of literal/length codes */
+	DUMPBITS (5);
+	NEEDBITS (5);
+	nd = 1 + ((unsigned) b & 0x1f);	/* number of distance codes */
+	DUMPBITS (5);
+	NEEDBITS (4);
+	nb = 4 + ((unsigned) b & 0xf);	/* number of bit length codes */
+	DUMPBITS (4);
+	if (nl > 286 || nd > 30)
+	{
+		prom_printf("ERR_BAD_GZIP_DATA: init_dynamic_block 1\n");
+		return;
+	}
+
+	/* read in bit-length-code lengths */
+	for (j = 0; j < nb; j++)
+	{
+		NEEDBITS (3);
+		ll[bitorder[j]] = (unsigned) b & 7;
+		DUMPBITS (3);
+	}
+	for (; j < 19; j++)
+		ll[bitorder[j]] = 0;
+
+	/* build decoding table for trees--single level, 7 bit lookup */
+	bl = 7;
+	if ((i = huft_build (ll, 19, 19, NULL, NULL, &tl, &bl)) != 0)
+	{
+		prom_printf("ERR_BAD_GZIP_DATA: init_dynamic_block 2\n");
+		return;
+	}
+
+	/* read in literal and distance code lengths */
+	n = nl + nd;
+	m = mask_bits[bl];
+	i = l = 0;
+	while ((unsigned) i < n)
+	{
+		NEEDBITS ((unsigned) bl);
+		j = (td = tl + ((unsigned) b & m))->b;
+		DUMPBITS (j);
+		j = td->v.n;
+		if (j < 16)		/* length of code in bits (0..15) */
+			ll[i++] = l = j;	/* save last length in l */
+		else if (j == 16)		/* repeat last length 3 to 6 times */
+		{
+			NEEDBITS (2);
+			j = 3 + ((unsigned) b & 3);
+			DUMPBITS (2);
+			if ((unsigned) i + j > n)
+			{
+				prom_printf("ERR_BAD_GZIP_DATA: init_dynamic_block 3\n");
+				return;
+			}
+			while (j--)
+				ll[i++] = l;
+		}
+		else if (j == 17)		/* 3 to 10 zero length codes */
+		{
+			NEEDBITS (3);
+			j = 3 + ((unsigned) b & 7);
+			DUMPBITS (3);
+			if ((unsigned) i + j > n)
+			{
+				prom_printf("ERR_BAD_GZIP_DATA: init_dynamic_block 4\n");
+				return;
+			}
+			while (j--)
+				ll[i++] = 0;
+			l = 0;
+		}
+		else
+			/* j == 18: 11 to 138 zero length codes */
+		{
+			NEEDBITS (7);
+			j = 11 + ((unsigned) b & 0x7f);
+			DUMPBITS (7);
+			if ((unsigned) i + j > n)
+			{
+				prom_printf("ERR_BAD_GZIP_DATA: init_dynamic_block 5\n");
+				return;
+			}
+			while (j--)
+				ll[i++] = 0;
+			l = 0;
+		}
+	}
+
+	/* free decoding table for trees */
+	reset_gzmalloc();
+
+	/* restore the global bit buffer */
+	bb = b;
+	bk = k;
+
+	/* build the decoding tables for literal/length and distance codes */
+	bl = lbits;
+	if ((i = huft_build (ll, nl, 257, cplens, cplext, &tl, &bl)) != 0)
+	{
+		prom_printf("ERR_BAD_GZIP_DATA: init_dynamic_block 6\n");
+		return;
+	}
+	bd = dbits;
+	if ((i = huft_build (ll + nl, nd, 0, cpdist, cpdext, &td, &bd)) != 0)
+	{
+		prom_printf("ERR_BAD_GZIP_DATA: init_dynamic_block 7\n");
+		return;
+	}
+
+	/* indicate we're now working on a block */
+	code_state = 0;
+	block_len++;
+}
+
+
+static void
+get_new_block (void)
+{
+	register ulg b;		/* bit buffer */
+	register unsigned k;		/* number of bits in bit buffer */
+
+	/* make local bit buffer */
+	b = bb;
+	k = bk;
+
+	/* read in last block bit */
+	NEEDBITS (1);
+	last_block = (int) b & 1;
+	DUMPBITS (1);
+
+	/* read in block type */
+	NEEDBITS (2);
+	block_type = (unsigned) b & 3;
+	DUMPBITS (2);
+
+	/* restore the global bit buffer */
+	bb = b;
+	bk = k;
+
+	if (block_type == INFLATE_STORED)
+		init_stored_block ();
+	if (block_type == INFLATE_FIXED)
+		init_fixed_block ();
+	if (block_type == INFLATE_DYNAMIC)
+		init_dynamic_block ();
+}
+
+
+static void
+inflate_window (void)
+{
+	/* initialize window */
+	wp = 0;
+
+	/*
+	 *  Main decompression loop.
+	 */
+
+	while (wp < WSIZE)
+	{
+		if (!block_len)
+		{
+			if (last_block)
+				break;
+
+			get_new_block ();
+		}
+
+		if (block_type > INFLATE_DYNAMIC) {
+			prom_printf("ERR_BAD_GZIP_DATA: init_window 1\n");
+			return;
+		}
+
+		/*
+		 *  Expand stored block here.
+		 */
+		if (block_type == INFLATE_STORED)
+		{
+			int w = wp;
+
+			/*
+			 *  This is basically a glorified pass-through
+			 */
+
+			while (block_len && w < WSIZE)
+			{
+				slide[w++] = get_byte ();
+				block_len--;
+			}
+
+			wp = w;
+
+			continue;
+		}
+
+		/*
+		 *  Expand other kind of block.
+		 */
+
+		if ( inflate_codes_in_window() )
+			reset_gzmalloc();
+	}
+
+	saved_filepos += WSIZE;
+
+	/* XXX do CRC calculation here! */
+}
+
+
+static void
+initialize_tables (void)
+{
+	saved_filepos = 0;
+
+	if (gunzip_file.fs->seek(&gunzip_file, gzip_data_offset) != FILE_ERR_OK )
+		prom_printf("Error seeking !!!\n");
+	
+
+	/* initialize window, bit buffer */
+	bk = 0;
+	bb = 0;
+
+	/* reset partial decompression code */
+	last_block = 0;
+	block_len = 0;
+
+	/* reset memory allocation stuff */
+	reset_gzmalloc();
+}
+
+
+int
+gunzip_read (void *buf, unsigned int len)
+{
+	int ret = 0;
+
+	/* do we reset decompression to the beginning of the file? */
+	if (saved_filepos > gzip_filepos + WSIZE)
+		initialize_tables ();
+
+	/*
+	 *  This loop operates upon uncompressed data only.  The only
+	 *  special thing it does is to make sure the decompression
+	 *  window is within the range of data it needs.
+	 */
+
+	while (len > 0)
+	{
+		register int size;
+		register char *srcaddr;
+
+		while (gzip_filepos >= saved_filepos)
+			inflate_window ();
+
+		srcaddr = (char *) ((gzip_filepos & (WSIZE - 1)) + slide);
+		size = saved_filepos - gzip_filepos;
+		if (size > len)
+			size = len;
+
+		memmove (buf, srcaddr, size);
+
+		buf += size;
+		len -= size;
+		gzip_filepos += size;
+		ret += size;
+	}
+
+	return ret;
+}
+
+int
+gunzip_seek(unsigned int len) 
+{
+	gzip_filepos = len;	
+	return FILE_ERR_OK;
+}
+
+/*
+ * vim: ts=4
+ */
diff -Nurw yaboot-1.3.14rc1/second/yaboot.c yaboot-ppcrcd/second/yaboot.c
--- yaboot-1.3.14rc1/second/yaboot.c	2006-02-10 03:08:33.000000000 +0100
+++ yaboot-ppcrcd/second/yaboot.c	2006-03-26 21:57:17.000000000 +0200
@@ -54,6 +54,7 @@
 #include "linux/elf.h"
 #include "bootinfo.h"
 #include "debug.h"
+#include "gunzip.h"
 
 #define CONFIG_FILE_NAME	"yaboot.cfg"
 #define CONFIG_FILE_MAX		0x8000		/* 32k */
@@ -117,6 +115,8 @@
 int _machine = _MACH_Pmac;
 int flat_vmlinux;
 
+struct boot_file_t gunzip_file;
+
 #ifdef CONFIG_COLOR_TEXT
 
 /* Color values for text ui */
@@ -171,6 +171,10 @@
 
 static struct first_info *quik_fip = NULL;
 
+unsigned long initrd_size = 0;
+int kernel_size = 0;
+unsigned long kernel_position = 0;
+
 int
 yaboot_start (unsigned long r3, unsigned long r4, unsigned long r5)
 {
@@ -518,11 +569,18 @@
      }
      p = cfg_get_strg(label, "initrd-size");
      if (p) {
+		initrd_size = atoi(p);
+
 	  strcpy (q, "ramdisk_size=");
 	  strcpy (q + 13, p);
 	  q = strchr (q, 0);
 	  *q++ = ' ';
      }
+	p = cfg_get_strg(label, "kernel-size");
+	if (p) {
+		kernel_size = atoi(p);
+	}
+
      if (cfg_get_flag(label, "novideo")) {
 	  strcpy (q, "video=ofonly");
 	  q = strchr (q, 0);
@@ -810,7 +882,6 @@
      int			result;
      static struct boot_param_t	params;
      void		*initrd_base;
-     unsigned long	initrd_size;
      void                *sysmap_base;
      unsigned long	sysmap_size;
      kernel_entry_t      kernel_entry;
@@ -827,6 +898,8 @@
 	  initrd_base = 0;
 	  sysmap_base = 0;
 	  sysmap_size = 0;
+		kernel_size = 0;
+		kernel_position = 0;
     	
 	  if (get_params(&params))
 	       return;
@@ -836,9 +909,18 @@
 	  prom_printf("Please wait, loading kernel...\n");
 
 	  memset(&file, 0, sizeof(file));
+		if ( ( loc = strchr(params.kernel.file, '@')) != NULL ) {
+			*loc = '\0';
+			kernel_position = atoi( ++loc);
+			prom_printf("kernel at: %d, uncompressed size: %d\n",
+				(int)kernel_position, (int)kernel_size);
+		}
+		loc = NULL;
 
-	  if (strlen(boot.file) && !strcmp(boot.file,"\\\\") && params.kernel.file[0] != '/'
-	      && params.kernel.file[0] != '\\') {
+
+		if (strlen(boot.file) && !strcmp(boot.file,"\\\\") &&
+				params.kernel.file[0] != '/' &&
+				params.kernel.file[0] != '\\') {
 	       loc=(char*)malloc(strlen(params.kernel.file)+3);
 	       if (!loc) {
 		    prom_printf ("malloc error\n");
@@ -855,11 +937,18 @@
 	       prom_perror(result, params.kernel.file);
 	       goto next;
 	  }
+		if ( kernel_position == 0 ) {
+			gunzip_file = file;
+			gunzip_test_header();
+		}
 
 	  /* Read the Elf e_ident, e_type and e_machine fields to
 	   * determine Elf file type
 	   */
-	  if (file.fs->read(&file, sizeof(Elf_Ident), &loadinfo.elf) < sizeof(Elf_Ident)) {
+		if ( ( compressed_file ?
+				gunzip_read(&loadinfo.elf, sizeof(Elf_Ident)) :
+				file.fs->read(&file, sizeof(Elf_Ident), &loadinfo.elf)
+				) < sizeof(Elf_Ident)) {
 	       prom_printf("\nCan't read Elf e_ident/e_type/e_machine info\n");
 	       file.fs->close(&file);
 	       memset(&file, 0, sizeof(file));
@@ -957,40 +1047,108 @@
 		    free(params.rd.file);
 		    params.rd.file=loc;
 	       }
-	       prom_printf("Loading ramdisk...\n");
+			prom_printf("Loading ramdisk...");
+
+			if ( initrd_size ) {
+				char *sep;
+				if ( (sep = strchr(params.rd.file, '@')) != NULL ) {
+					/* initrd is an elf part */
+					unsigned int initrd_position=0;
+					*sep = '\0';
+					initrd_position = atoi( ++sep);
+					prom_printf("initrd position: %d, size: %d\n",
+						(int)initrd_position, (int)initrd_size);
+
+					initrd_base = prom_claim(loadinfo.base+loadinfo.memsize,
+						initrd_size, 0);
 	       result = open_file(&params.rd, &file);
 	       if (result != FILE_ERR_OK) {
 		    prom_printf("%s:%d,", params.rd.dev, params.rd.part);
 		    prom_perror(result, params.rd.file);
 	       }
-	       else {
+					file.fs->seek(&file, initrd_position);
+					initrd_read = file.fs->read(&file, initrd_size,
+						initrd_base);
+					file.fs->close(&file);
+				} else {
+					/* probably multi-file initrd */
+					char *(part[16]);
+					int parts=0, i;
+
+					initrd_base = prom_claim(loadinfo.base+loadinfo.memsize,
+						initrd_size, 0);
+					prom_printf("size: %d\n", (int)initrd_size);
+
+					/* &params.rd .file- initrd path */
+					part[0] = strdup(params.rd.file);
+					while ( (sep = strchr(part[parts++], '|' )) ) {
+						*sep = '\0';
+						part[parts] = ++sep;
+					}
+					initrd_more = initrd_base;
+					for ( i=0; i<parts; i++ ) {
+						strcpy(params.rd.file, part[i]);
+						result = open_file(&params.rd, &file);
+						if (result != FILE_ERR_OK) {
+							prom_printf("%s:%d,", params.rd.dev,
+								params.rd.part);
+							prom_perror(result, params.rd.file);
+						}
+#define	INITRD_MAX 0xF00000
+						initrd_read = file.fs->read(&file, INITRD_MAX,
+							initrd_more);
+						initrd_more += initrd_read;
+						prom_printf("read: %s\n", params.rd.file);
+						file.fs->close(&file);
+					}
+					free(part[0]);
+				}
+			} else {
+				/* normal behaviour */
+				result = open_file(&params.rd, &file);
+				if (result != FILE_ERR_OK) {
+					prom_printf("%s:%d,", params.rd.dev, params.rd.part);
+					prom_perror(result, params.rd.file);
+				} else {
 #define INITRD_CHUNKSIZE 0x100000
-		    initrd_base = prom_claim(loadinfo.base+loadinfo.memsize, INITRD_CHUNKSIZE, 0);
+					initrd_base = prom_claim(loadinfo.base+loadinfo.memsize,
+						INITRD_CHUNKSIZE, 0);
 		    if (initrd_base == (void *)-1) {
-			 prom_printf("Claim failed for initrd memory\n");
+						prom_printf("\nClaim failed for initrd memory\n");
 			 initrd_base = 0;
 		    } else {
-			 initrd_size = file.fs->read(&file, INITRD_CHUNKSIZE, initrd_base);
+						initrd_size = file.fs->read(&file, INITRD_CHUNKSIZE,
+							initrd_base);
+						prom_printf(".");
 			 if (initrd_size == 0)
 			      initrd_base = 0;
 			 initrd_read = initrd_size;
 			 initrd_more = initrd_base;
-			 while (initrd_read == INITRD_CHUNKSIZE ) { /* need to read more? */
-			      initrd_want = (void *)((unsigned long)initrd_more+INITRD_CHUNKSIZE);
-			      initrd_more = prom_claim(initrd_want, INITRD_CHUNKSIZE, 0);
+						while (initrd_read == INITRD_CHUNKSIZE ) {
+							/* need to read more? */
+							initrd_want = (void *)((unsigned long)initrd_more
+								+ INITRD_CHUNKSIZE);
+							initrd_more = prom_claim(initrd_want,
+								INITRD_CHUNKSIZE, 0);
 			      if (initrd_more != initrd_want) {
-				   prom_printf("Claim failed for initrd memory at %p rc=%p\n",initrd_want,initrd_more);
+								prom_printf("\nClaim failed for initrd memory"
+									" at %p rc=%p\n",initrd_want,initrd_more);
 				   prom_pause();
 				   break;
 			      }
-			      initrd_read = file.fs->read(&file, INITRD_CHUNKSIZE, initrd_more);
-			      DEBUG_F("  block at %p rc=%lu\n",initrd_more,initrd_read);
+							initrd_read = file.fs->read(&file,
+								INITRD_CHUNKSIZE, initrd_more);
+							prom_printf(".");
+							DEBUG_F("  block at %p rc=%lu\n",
+								initrd_more,initrd_read);
 			      initrd_size += initrd_read;
 			 }
 		    }
+					prom_printf(".\n");
 		    file.fs->close(&file);
 		    memset(&file, 0, sizeof(file));
 	       }
+			}
 	       if (initrd_base)
 		    prom_printf("ramdisk loaded at %p, size: %lu Kbytes\n",
 				initrd_base, initrd_size >> 10);
@@ -1076,12 +1236,15 @@
 {
      int			i;
      Elf32_Ehdr		*e = &(loadinfo->elf.elf32hdr);
-     Elf32_Phdr		*p, *ph;
+	Elf32_Phdr	*p, *ph = NULL;
      int			size = sizeof(Elf32_Ehdr) - sizeof(Elf_Ident);
      unsigned long	addr, loadaddr;
 
      /* Read the rest of the Elf header... */
-     if ((*(file->fs->read))(file, size, &e->e_version) < size) {
+	if ( ( compressed_file ?
+			gunzip_read(&e->e_version, size) :
+			(*(file->fs->read))(file, size, &e->e_version)
+			) < size) {
 	  prom_printf("\nCan't read Elf32 image header\n");
 	  goto bail;
      }
@@ -1112,12 +1275,17 @@
      }
 
      /* Now, we read the section header */
-     if ((*(file->fs->seek))(file, e->e_phoff) != FILE_ERR_OK) {
+	if ( ( compressed_file ?
+			gunzip_seek(e->e_phoff) :
+			(*(file->fs->seek))(file, e->e_phoff)
+			) != FILE_ERR_OK) {
 	  prom_printf ("seek error\n");
 	  goto bail;
      }
-     if ((*(file->fs->read))(file, sizeof(Elf32_Phdr) * e->e_phnum, ph) !=
-	 sizeof(Elf32_Phdr) * e->e_phnum) {
+	if ( ( compressed_file ?
+			gunzip_read(ph, sizeof(Elf32_Phdr) * e->e_phnum) :
+			(*(file->fs->read))(file, sizeof(Elf32_Phdr) * e->e_phnum, ph)
+			) != sizeof(Elf32_Phdr) * e->e_phnum) {
 	  prom_printf ("read error\n");
 	  goto bail;
      }
@@ -1149,11 +1318,6 @@
 	  goto bail;
      }
 
-     /* leave some room (1Mb) for boot infos */
-     loadinfo->memsize = _ALIGN(loadinfo->memsize,(1<<20)) + 0x100000;
-     /* Claim OF memory */
-     DEBUG_F("Before prom_claim, mem_sz: 0x%08lx\n", loadinfo->memsize);
-
      /* Determine whether we are trying to boot a vmlinux or some
       * other binary image (eg, zImage).  We load vmlinux's at
       * KERNELADDR and all other binaries at their e_entry value.
@@ -1165,6 +1329,21 @@
           flat_vmlinux = 0;
           loadaddr = loadinfo->load_loc;
      }
+	if ( kernel_position > 0 ) {
+		flat_vmlinux = 1;
+		/* hardcode some info */
+		loadinfo->load_loc = 0xc0000000;
+		loadaddr = KERNELADDR;
+		loadinfo->entry = KERNEL_LINK_ADDR_PPC32;
+		/* memsize must be larger than filesize, but _ALIGN should help*/
+		loadinfo->memsize = kernel_size;
+		loadinfo->filesize = kernel_size;
+	}
+	
+	/* leave some room (1Mb) for boot infos */
+	loadinfo->memsize = _ALIGN(loadinfo->memsize,(1<<20)) + 0x100000;
+	/* Claim OF memory */
+	DEBUG_F("Before prom_claim, mem_sz: 0x%08lx\n", loadinfo->memsize);
 
      /* On some systems, loadaddr may already be claimed, so try some
       * other nearby addresses before giving up.
@@ -1183,6 +1362,7 @@
      DEBUG_F("    wanted load base: 0x%08lx, mem_sz: 0x%08lx\n",
 	     loadaddr, loadinfo->memsize);
 
+	if ( kernel_position == 0 ) {
      /* Load the program segments... */
      p = ph;
      for (i = 0; i < e->e_phnum; ++i, ++p) {
@@ -1191,18 +1371,46 @@
 	       continue;
 
 	  /* Now, we skip to the image itself */
-	  if ((*(file->fs->seek))(file, p->p_offset) != FILE_ERR_OK) {
+			if ( ( compressed_file ?
+					gunzip_seek(p->p_offset) :
+					(*(file->fs->seek))(file, p->p_offset)
+					) != FILE_ERR_OK) {
 	       prom_printf ("Seek error\n");
 	       prom_release(loadinfo->base, loadinfo->memsize);
 	       goto bail;
 	  }
 	  offset = p->p_vaddr - loadinfo->load_loc;
-	  if ((*(file->fs->read))(file, p->p_filesz, loadinfo->base+offset) != p->p_filesz) {
+			if ( ( compressed_file ?
+					gunzip_read(loadinfo->base+offset, p->p_filesz) :
+				(*(file->fs->read))(file, p->p_filesz, loadinfo->base+offset)
+					) != p->p_filesz ) {
 	       prom_printf ("Read failed\n");
 	       prom_release(loadinfo->base, loadinfo->memsize);
 	       goto bail;
 	  }
      }
+	} else {
+		/* load and uncompress vmlinux binary */
+		if ( (*(file->fs->seek))(file, kernel_position) != FILE_ERR_OK) {
+			prom_printf ("Seek error\n");
+			prom_release(loadinfo->base, loadinfo->memsize);
+			goto bail;
+		}
+		gunzip_file = *file;
+		gunzip_test_header();
+		if ( !compressed_file ) {
+			prom_printf ("Error: not compressed data at vmlinux position\n");
+			prom_release(loadinfo->base, loadinfo->memsize);
+			goto bail;
+		}
+		if ( gunzip_read(loadinfo->base, kernel_size) != kernel_size ) {
+			prom_printf ("Gunzip read failed\n");
+			prom_release(loadinfo->base, loadinfo->memsize);
+			goto bail;
+		} else {
+			prom_printf ("vmlinux extracted successfully !\n");
+		}
+	}
 
      free(ph);
     
-------------- next part --------------
diff -Nurw yaboot-1.3.14rc1/include/ext2fs/bitops.h yaboot-ppcrcd/include/ext2fs/bitops.h
--- yaboot-1.3.14rc1/include/ext2fs/bitops.h	2006-02-10 03:08:33.000000000 +0100
+++ yaboot-ppcrcd/include/ext2fs/bitops.h	2006-01-17 23:32:40.000000000 +0100
@@ -410,6 +410,8 @@
 #endif /* !_EXT2_HAVE_ASM_SWAB */
 
 #if !defined(_EXT2_HAVE_ASM_FINDBIT_)
+extern int ffs (int __i);
+	
 _INLINE_ int ext2fs_find_first_bit_set(void * addr, unsigned size)
 {
 	char	*cp = (unsigned char *) addr;
diff -Nurw yaboot-1.3.14rc1/lib/strtol.c yaboot-ppcrcd/lib/strtol.c
--- yaboot-1.3.14rc1/lib/strtol.c	2006-02-10 03:08:33.000000000 +0100
+++ yaboot-ppcrcd/lib/strtol.c	2006-01-17 23:32:40.000000000 +0100
@@ -26,10 +26,11 @@
 
 #include "ctype.h"
 
-int strtol (nptr, endptr, base)
-const char *nptr;
-char **endptr;
-int base;
+int strtol (
+	const char *nptr,
+	char **endptr,
+	int base
+	)
 {
     int negative;
     register unsigned int cutoff;
diff -Nurw yaboot-1.3.14rc1/second/fs_reiserfs.c yaboot-ppcrcd/second/fs_reiserfs.c
--- yaboot-1.3.14rc1/second/fs_reiserfs.c	2006-02-10 03:08:33.000000000 +0100
+++ yaboot-ppcrcd/second/fs_reiserfs.c	2006-01-17 23:32:41.000000000 +0100
@@ -150,7 +150,7 @@
 
 
 static __inline__ __u32
-log2( __u32 word )
+reiser_log2( __u32 word )
 {
      int i = 0;
      while( word && (word & (1 << ++i)) == 0 );
@@ -422,7 +422,7 @@
 
      INFO->version = le16_to_cpu(super.s_version);
      INFO->blocksize = le16_to_cpu(super.s_blocksize);
-     INFO->blocksize_shift = log2( INFO->blocksize );
+     INFO->blocksize_shift = reiser_log2( INFO->blocksize );
 
      INFO->journal_block = le32_to_cpu(super.s_journal_block);
      INFO->journal_block_count = le32_to_cpu(super.s_orig_journal_size);
diff -Nurw yaboot-1.3.14rc1/second/partition.c yaboot-ppcrcd/second/partition.c
--- yaboot-1.3.14rc1/second/partition.c	2006-02-10 03:08:33.000000000 +0100
+++ yaboot-ppcrcd/second/partition.c	2006-03-10 23:16:09.000000000 +0100
@@ -338,11 +356,11 @@
      struct partition_t* list = NULL;
      unsigned int prom_blksize, iso_root_block;
 	
-     strncpy(block_buffer, device, 2040);
-     strcat(block_buffer, ":0");
+     strncpy((char *)block_buffer, device, 2040);
+     strcat((char *)block_buffer, ":0");
 	
      /* Open device */
-     disk = prom_open(block_buffer);
+     disk = prom_open((char *)block_buffer);
      if (disk == NULL) {
 	  prom_printf("Can't open device <%s>\n", block_buffer);
 	  goto bail;
diff -Nurw yaboot-1.3.14rc1/second/prom.c yaboot-ppcrcd/second/prom.c
--- yaboot-1.3.14rc1/second/prom.c	2006-02-10 03:08:33.000000000 +0100
+++ yaboot-ppcrcd/second/prom.c	2006-01-06 21:24:05.000000000 +0100
@@ -33,6 +33,7 @@
 #include "asm/processor.h"
 #include "errors.h"
 #include "debug.h"
+#include "string.h"
 
 #define READ_BLOCKS_USE_READ	1
 
diff -Nurw yaboot-1.3.14rc1/second/yaboot.c yaboot-ppcrcd/second/yaboot.c
--- yaboot-1.3.14rc1/second/yaboot.c	2006-02-10 03:08:33.000000000 +0100
+++ yaboot-ppcrcd/second/yaboot.c	2006-03-26 21:57:17.000000000 +0200
@@ -1220,7 +1428,7 @@
 {
      int			i;
      Elf64_Ehdr		*e = &(loadinfo->elf.elf64hdr);
-     Elf64_Phdr		*p, *ph;
+	Elf64_Phdr	*p, *ph = NULL;
      int			size = sizeof(Elf64_Ehdr) - sizeof(Elf_Ident);
      unsigned long	addr, loadaddr;
 


More information about the Yaboot-devel mailing list