From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1JHfbK-0001sK-AY for mharc-grub-devel@gnu.org; Wed, 23 Jan 2008 08:25:10 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JHfbI-0001rb-0E for grub-devel@gnu.org; Wed, 23 Jan 2008 08:25:08 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JHfbG-0001rD-C2 for grub-devel@gnu.org; Wed, 23 Jan 2008 08:25:07 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JHfbG-0001rA-9u for grub-devel@gnu.org; Wed, 23 Jan 2008 08:25:06 -0500 Received: from aybabtu.com ([69.60.117.155]) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JHfbG-0001YB-4U for grub-devel@gnu.org; Wed, 23 Jan 2008 08:25:06 -0500 Received: from [192.168.10.6] (helo=thorin) by aybabtu.com with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1JHfbC-0005FE-CE for grub-devel@gnu.org; Wed, 23 Jan 2008 14:25:05 +0100 Received: from rmh by thorin with local (Exim 4.63) (envelope-from ) id 1JHfZW-0007il-4x for grub-devel@gnu.org; Wed, 23 Jan 2008 14:23:18 +0100 Date: Wed, 23 Jan 2008 14:23:18 +0100 From: Robert Millan To: grub-devel@gnu.org Message-ID: <20080123132318.GA29666@thorin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="C7zPtVaVf+AK4Oqc" Content-Disposition: inline Content-Transfer-Encoding: 8bit Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.13 (2006-08-11) X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [PATCH] loader cleanup for i386-ieee1275 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: Wed, 23 Jan 2008 13:25:08 -0000 --C7zPtVaVf+AK4Oqc Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Some cleanup for i386-ieee1275. -- Robert Millan I know my rights; I want my phone call! What use is a phone call… if you are unable to speak? (as seen on /.) --C7zPtVaVf+AK4Oqc Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="mb2_ieee1275_cleanup.diff" * include/grub/i386/ieee1275/loader.h: Include `', `' and `'. (grub_multiboot2_real_boot): New function prototype. * include/grub/i386/pc/memory.h: Include `'. (grub_lower_mem, grub_upper_mem): Disable for IEEE1275. * kern/i386/ieee1275/init.c (grub_os_area_addr) (grub_os_area_size, grub_lower_mem, grub_upper_mem): Remove variables. diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/include/grub/i386/ieee1275/loader.h ./include/grub/i386/ieee1275/loader.h --- ../grub2/include/grub/i386/ieee1275/loader.h 2008-01-23 10:57:25.000000000 +0100 +++ ./include/grub/i386/ieee1275/loader.h 2008-01-23 13:42:12.000000000 +0100 @@ -1 +1,30 @@ -#include +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2002,2003,2004,2007,2008 Free Software Foundation, Inc. + * + * GRUB is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GRUB is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GRUB. If not, see . + */ + +#ifndef GRUB_LOADER_MACHINE_HEADER +#define GRUB_LOADER_MACHINE_HEADER 1 + +#include +#include +#include + +void EXPORT_FUNC(grub_multiboot2_real_boot) (grub_addr_t entry, + struct grub_multiboot_info *mbi) + __attribute__ ((noreturn)); + +#endif /* ! GRUB_LOADER_MACHINE_HEADER */ diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/include/grub/i386/pc/memory.h ./include/grub/i386/pc/memory.h --- ../grub2/include/grub/i386/pc/memory.h 2008-01-21 16:49:59.000000000 +0100 +++ ./include/grub/i386/pc/memory.h 2008-01-23 13:45:44.000000000 +0100 @@ -21,6 +21,7 @@ #define GRUB_MEMORY_MACHINE_HEADER 1 #include +#include #ifndef ASM_FILE #include #endif @@ -75,9 +76,11 @@ /* The data segment of the pseudo real mode. */ #define GRUB_MEMORY_MACHINE_PSEUDO_REAL_DSEG 0x20 +#ifndef GRUB_MACHINE_IEEE1275 #ifndef ASM_FILE extern grub_size_t EXPORT_VAR(grub_lower_mem); extern grub_size_t EXPORT_VAR(grub_upper_mem); #endif +#endif #endif /* ! GRUB_MEMORY_MACHINE_HEADER */ diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/kern/i386/ieee1275/init.c ./kern/i386/ieee1275/init.c --- ../grub2/kern/i386/ieee1275/init.c 2008-01-23 10:59:37.000000000 +0100 +++ ./kern/i386/ieee1275/init.c 2008-01-23 13:38:58.000000000 +0100 @@ -19,10 +19,6 @@ #include -grub_addr_t grub_os_area_addr; -grub_size_t grub_os_area_size; -grub_size_t grub_lower_mem, grub_upper_mem; - void grub_stop_floppy (void) { --C7zPtVaVf+AK4Oqc--