Patchwork [2/10] Remove quik bootloader code

login
register
mail settings
Submitter Anton Blanchard
Date April 11, 2010, 4:02 a.m.
Message ID <20100411040256.GC3142@kryten>
Download mbox | patch
Permalink /patch/57968/
State Changes Requested
Headers show

Comments

Anton Blanchard - April 11, 2010, 4:02 a.m.
Has booting yaboot out of quik ever worked? The fact we do nothing with
quik_fip makes me suspect it hasn't. Remove the code.

Signed-off-by: Anton Blanchard <anton@samba.org>
---

Patch

Index: yaboot/second/yaboot.c
===================================================================
--- yaboot.orig/second/yaboot.c	2010-04-01 12:46:14.000000000 +1100
+++ yaboot/second/yaboot.c	2010-04-01 13:08:12.000000000 +1100
@@ -174,8 +174,6 @@  extern unsigned char linux_logo_blue[];
 extern char* __bss_start;
 extern char* _end;
 
-static struct first_info *quik_fip = NULL;
-
 int
 yaboot_start (unsigned long r3, unsigned long r4, unsigned long r5)
 {
@@ -187,15 +185,6 @@  yaboot_start (unsigned long r3, unsigned
      /* OF seems to do it, but I'm not very confident */
      memset(&__bss_start, 0, &_end - &__bss_start);
 
-     /* Check for quik first stage bootloader (but I don't think we are
-      * compatible with it anyway, I'll look into backporting to older OF
-      * versions later
-      */
-     if (r5 == 0xdeadbeef) {
-	  r5 = r3;
-	  quik_fip = (struct first_info *)r4;
-     }
-
      /* Initialize OF interface */
      prom_init ((prom_entry) r5);