Some cleanup for i386-ieee1275. -- Robert Millan
<GPLv2> I know my rights; I want my phone call! <DRM> What use is a phone call… if you are unable to speak? (as seen on /.)
* include/grub/i386/ieee1275/loader.h: Include `<grub/types.h>', `<grub/symbol.h>' and `<grub/multiboot.h>'. (grub_multiboot2_real_boot): New function prototype. * include/grub/i386/pc/memory.h: Include `<grub/machine/machine.h>'. (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/cpu/loader.h> +/* + * 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 <http://www.gnu.org/licenses/>. + */ + +#ifndef GRUB_LOADER_MACHINE_HEADER +#define GRUB_LOADER_MACHINE_HEADER 1 + +#include <grub/types.h> +#include <grub/symbol.h> +#include <grub/multiboot.h> + +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 <grub/symbol.h> +#include <grub/machine/machine.h> #ifndef ASM_FILE #include <grub/types.h> #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/types.h> -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) {
_______________________________________________ Grub-devel mailing list Grub-devel@gnu.org http://lists.gnu.org/mailman/listinfo/grub-devel
