diff -ur quik-2.0e/quik/quik.c quik-work/quik/quik.c
--- quik-2.0e/quik/quik.c	Fri Mar 10 15:59:28 2000
+++ quik-work/quik/quik.c	Sun Mar 12 14:31:22 2000
@@ -55,8 +55,8 @@

 int unit_shift;
 int part_mask;
-#define UNIT(dev)	(MINOR(dev) >> unit_shift)
-#define PART(dev)	(MINOR(dev) & part_mask)
+#define UNIT(dev)	(((int)MINOR(dev)) >> unit_shift)
+#define PART(dev)	(((int)MINOR(dev)) &  part_mask)

 #define swab_32(x)	((((x) >> 24) & 0xff) + (((x) >> 8) & 0xff00) \
 			 + (((x) & 0xff00) << 8) + (((x) & 0xff) << 24))
diff -ur quik-2.0e/second/Makefile quik-work/second/Makefile
--- quik-2.0e/second/Makefile	Fri Mar 10 15:59:28 2000
+++ quik-work/second/Makefile	Sun Mar 12 14:35:29 2000
@@ -4,7 +4,7 @@

 CFLAGS = -I../include -O2 -D__NO_STRING_INLINES

-LDFLAGS= -Ttext 0x3e0000
+LDFLAGS=-N -Ttext 0x3e0000

 OBJS =	crt0.o printf.o malloc.o main.o cmdline.o disk.o file.o \
 	cfg.o strtol.o prom.o cache.o string.o setjmp.o ctype.o \
diff -ur quik-2.0e/second/main.c quik-work/second/main.c
--- quik-2.0e/second/main.c	Fri Mar 10 15:59:28 2000
+++ quik-work/second/main.c	Sun Mar 12 14:42:46 2000
@@ -29,6 +29,7 @@

 #include "quik.h"
 #include <string.h>
+#define __KERNEL__
 #include <linux/elf.h>
 #include <layout.h>
 #ifdef BOOTINFO
@@ -497,10 +501,17 @@
      * point may actually be a procedure descriptor.
      */
     start = *(unsigned *)entry;
-    if (start < load_loc || start >= load_loc + len
-	|| ((unsigned *)entry)[2] != 0)
-	/* doesn't look like a procedure descriptor */
-	start += entry;
+    /* new boot strategy - see head.S in the kernel for more info -- Cort */
+    if (start == 0x60000000/* nop */ )
+	    start = load_loc;
+    /* not the new boot strategy, use old logic -- Cort */
+    else
+    {
+	    if (start < load_loc || start >= load_loc + len
+		|| ((unsigned *)entry)[2] != 0)
+		    /* doesn't look like a procedure descriptor */
+		    start += entry;
+    }
     printf("Starting at %x\n", start);
 #ifdef BOOTINFO
     /* setup the bootinfo */
diff -ur quik-2.0e/util/elfextract.c quik-work/util/elfextract.c
--- quik-2.0e/util/elfextract.c	Fri Mar 10 15:59:28 2000
+++ quik-work/util/elfextract.c	Sun Mar 12 12:46:21 2000
@@ -4,6 +4,7 @@
  * Copyright 1996 Paul Mackerras.
  */
 #include <stdio.h>
+#define __KERNEL__
 #include <linux/elf.h>

 FILE *fi, *fo;