ppcrcd: Makefile boot.dir/images.help yaboot/Makefile yaboot/gunzip.c yaboot/yaboot.c

[sparky]

Author: sparky
Date: Thu Jun 16 19:01:26 2005
New Revision: 6103

Modified:
   ppcrcd/Makefile
   ppcrcd/boot.dir/images.help
   ppcrcd/yaboot/Makefile
   ppcrcd/yaboot/gunzip.c
   ppcrcd/yaboot/yaboot.c
Log:
- stopping gunzip on last block is not working (why ?)
- other minor fixes


Modified: ppcrcd/Makefile
==============================================================================
--- ppcrcd/Makefile	(original)
+++ ppcrcd/Makefile	Thu Jun 16 19:01:26 2005
@@ -37,7 +37,7 @@
 		-sysid "PPCRCD"		\
 		-volset "PPCRCD"	\
 		-hfs-volid "PPCRCD"	\
-		-hfs-bless image/boot	\
+		-hfs-bless image/ppc	\
 		-chrp-boot		\
 		-rational-rock		\
 		-sort files.sort	\
@@ -88,6 +88,7 @@
 		-i boot.work/boot.msg
 	cp root.inst/boot/vmlinux-* boot.work/vmlinux
 	strip boot.work/vmlinux
+	strip -R.comment boot.work/vmlinux
 	gzip -9 boot.work/vmlinux
 	cp yaboot/yaboot boot.work
 	$(SU) cp initrd.sqf boot.work

Modified: ppcrcd/boot.dir/images.help
==============================================================================
--- ppcrcd/boot.dir/images.help	(original)
+++ ppcrcd/boot.dir/images.help	Thu Jun 16 19:01:26 2005
@@ -19,7 +19,7 @@
 	and mounts it from there. Umounts CDROM so drive can be used.
 	Requires 128Mb of ram. Works only with cdroms connected to pmac-ide.
 	This option should run faster than 'tomem' if you have DMA switched
-	on by default, there is no hdparm in initrd (and will not be).
+	on, try adding ide1=ata66 or something similar (check ide help).
 	Options: all
 
 memtest:

Modified: ppcrcd/yaboot/Makefile
==============================================================================
--- ppcrcd/yaboot/Makefile	(original)
+++ ppcrcd/yaboot/Makefile	Thu Jun 16 19:01:26 2005
@@ -75,11 +75,11 @@
 	@chmod -x yaboot
 
 
-%.o: %.c
+%.o: %.c Makefile
 	@echo "	[CC]		$@"
 	@$(CC) $(YBCFLAGS) -c -o $@ $<
 
-%.o: %.S
+%.o: %.S Makefile
 	@echo "	[ASM]		$@"
 	@$(CC) $(YBCFLAGS) -D__ASSEMBLY__  -c -o $@ $<
 	

Modified: ppcrcd/yaboot/gunzip.c
==============================================================================
--- ppcrcd/yaboot/gunzip.c	(original)
+++ ppcrcd/yaboot/gunzip.c	Thu Jun 16 19:01:26 2005
@@ -1134,7 +1134,7 @@
 	       reset_gzmalloc();
     }
 
-  saved_filepos += wp; // WSIZE
+  saved_filepos += WSIZE;
 
   /* XXX do CRC calculation here! */
 }
@@ -1197,10 +1197,11 @@
       gzip_filepos += size;
       ret += size;
 
-      if (last_block) {
+    
+/*      if (last_block) {
 	      reset_gzmalloc();
 	      break;
-      }
+      }*/
     }
 
   return ret;

Modified: ppcrcd/yaboot/yaboot.c
==============================================================================
--- ppcrcd/yaboot/yaboot.c	(original)
+++ ppcrcd/yaboot/yaboot.c	Thu Jun 16 19:01:26 2005
@@ -308,12 +308,12 @@
 	  prom_perror(result, msgfile.file);
 	  goto done;
      }
-     gunzip_file = file;
-     gunzip_test_header();
+     /*gunzip_file = file;
+     gunzip_test_header();*/
      opened = 1;
     
-     if ( ( compressed_file ?
-            gunzip_read(msg, (2000 - paging * 1000)) :
+     if ( ( /*compressed_file ?
+            gunzip_read(msg, (2000 - paging * 1000)) :*/
             file.fs->read(&file, (2000 - paging * 1000), msg) 
           ) <= 0)
 	  goto done;
@@ -331,13 +331,13 @@
 		     len += last_nl - msg + 1;
 		     
 		     memset(msg, 0, 1001);
-		     if ( compressed_file ) {
+/*		     if ( compressed_file ) {
 			     gunzip_seek(len);
 			     gunzip_read(msg, 1000);
-		     } else {
+		     } else {*/
 			     file.fs->seek(&file, len);
 			     file.fs->read(&file, 1000, msg);
-		     }
+//		     }
 
 		     // wait until key
 		     while ( prom_nbgetchar() == -1 );