From patchwork Sun Apr 11 04:02:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Blanchard X-Patchwork-Id: 57968 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bilbo.ozlabs.org X-Spam-Level: X-Spam-Status: No, score=-3.5 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.3.1 X-Original-To: tony@bakeyournoodle.com Delivered-To: tony@bilbo.ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 7CDF2B7DC1 for ; Sun, 11 Apr 2010 18:48:35 +1000 (EST) Received: by ozlabs.org (Postfix, from userid 1010) id EE99EB7D1C; Sun, 11 Apr 2010 14:07:30 +1000 (EST) Date: Sun, 11 Apr 2010 14:02:56 +1000 From: Anton Blanchard To: yaboot-devel@lists.ozlabs.org Subject: [PATCH 2/10] Remove quik bootloader code Message-ID: <20100411040256.GC3142@kryten> References: <20100411040149.GA3142@kryten> <20100411040226.GB3142@kryten> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100411040226.GB3142@kryten> User-Agent: Mutt/1.5.20 (2009-06-14) X-Mailman-Approved-At: Sun, 11 Apr 2010 18:48:32 +1000 X-BeenThere: yaboot-devel@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Technical and development discussion regarding yaboot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: yaboot-devel-bounces+tony=bakeyournoodle.com@lists.ozlabs.org Errors-To: yaboot-devel-bounces+tony=bakeyournoodle.com@lists.ozlabs.org Content-Length: 1317 Lines: 40 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 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);