From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DUypQ-0000nK-5E for mharc-grub-devel@gnu.org; Sun, 08 May 2005 23:21:08 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DUypO-0000mg-O1 for grub-devel@gnu.org; Sun, 08 May 2005 23:21:06 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DUypO-0000mU-BY for grub-devel@gnu.org; Sun, 08 May 2005 23:21:06 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DUye4-00077F-Vk for grub-devel@gnu.org; Sun, 08 May 2005 23:09:25 -0400 Received: from [207.217.121.247] (helo=pop-a065c32.pas.sa.earthlink.net) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DUyHL-0001TH-ME for grub-devel@gnu.org; Sun, 08 May 2005 22:45:56 -0400 Received: from user-0vvde2g.cable.mindspring.com ([63.246.184.80] helo=miracle) by pop-a065c32.pas.sa.earthlink.net with esmtp (Exim 3.36 #10) id 1DUyBS-00020O-00 for grub-devel@gnu.org; Sun, 08 May 2005 19:39:50 -0700 Received: from hollis by miracle with local (Exim 3.36 #1 (Debian)) id 1DUyA4-0004aC-00 for ; Sun, 08 May 2005 21:38:24 -0500 Date: Sun, 8 May 2005 21:38:24 -0500 To: grub-devel@gnu.org Message-ID: <20050509023824.GA17587@miracle> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.6+20040907i From: Hollis Blanchard Subject: [patch] small PPC cleanups X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 May 2005 03:21:07 -0000 This patch corrects a couple of small issues I've come across in the PPC code: - struct module_info is unused - we're declaring space for a stack but not using it - GRUB_IEEE1275_MODULE_BASE is a 7-char address; add the missing 0 I've tested the stack change on briQ and G3. If there are no comments I will commit this patch in a couple days. -Hollis 2005-05-08 Hollis Blanchard * boot/powerpc/ieee1275/cmain.c (module_info): Remove struct. * boot/powerpc/ieee1275/crt0.S (_start): Use init_stack. * include/grub/powerpc/ieee1275/kernel.h (GRUB_IEEE1275_MODULE_BASE): Correct cosmetic typo. Index: boot/powerpc/ieee1275/cmain.c =================================================================== RCS file: /cvsroot/grub/grub2/boot/powerpc/ieee1275/cmain.c,v retrieving revision 1.7 diff -u -p -r1.7 cmain.c --- boot/powerpc/ieee1275/cmain.c 1 May 2005 03:45:35 -0000 1.7 +++ boot/powerpc/ieee1275/cmain.c 9 May 2005 02:29:56 -0000 @@ -24,12 +24,6 @@ #include #include -struct module_info -{ - uint32_t start; - uint32_t end; -}; - /* OpenFirmware entry point passed to us from the real bootloader. */ intptr_t (*grub_ieee1275_entry_fn) (void *); Index: boot/powerpc/ieee1275/crt0.S =================================================================== RCS file: /cvsroot/grub/grub2/boot/powerpc/ieee1275/crt0.S,v retrieving revision 1.5 diff -u -p -r1.5 crt0.S --- boot/powerpc/ieee1275/crt0.S 4 Jan 2005 14:01:45 -0000 1.5 +++ boot/powerpc/ieee1275/crt0.S 9 May 2005 02:29:56 -0000 @@ -25,6 +25,8 @@ .align 2 .globl _start _start: + lis 2, init_stack@h + ori 1, 2, init_stack@l li 2, 0 li 13, 0 Index: include/grub/powerpc/ieee1275/kernel.h =================================================================== RCS file: /cvsroot/grub/grub2/include/grub/powerpc/ieee1275/kernel.h,v retrieving revision 1.1 diff -u -p -r1.1 kernel.h --- include/grub/powerpc/ieee1275/kernel.h 4 Jan 2005 14:01:45 -0000 1.1 +++ include/grub/powerpc/ieee1275/kernel.h 9 May 2005 02:29:59 -0000 @@ -21,6 +21,6 @@ #define GRUB_KERNEL_MACHINE_HEADER 1 /* Where grub-mkimage places the core modules in memory. */ -#define GRUB_IEEE1275_MODULE_BASE 0x0300000 +#define GRUB_IEEE1275_MODULE_BASE 0x00300000 #endif /* ! GRUB_KERNEL_MACHINE_HEADER */