vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2008-01-23 Robert Millan <rmh@aybabtu.com>

Browse source 
* 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_MACHINE_IEEE1275] (grub_lower_mem, grub_upper_mem): Disable.

        * kern/i386/ieee1275/init.c (grub_os_area_addr)
        (grub_os_area_size, grub_lower_mem, grub_upper_mem): Remove variables.
This commit is contained in:
robertmh 2008-01-23 19:21:19 +00:00
parent 305338fdf5
commit 15c80c098c
4 changed files with 45 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2008-01-23 Robert Millan <rmh@aybabtu.com>
* 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_MACHINE_IEEE1275] (grub_lower_mem, grub_upper_mem): Disable.
* kern/i386/ieee1275/init.c (grub_os_area_addr)
(grub_os_area_size, grub_lower_mem, grub_upper_mem): Remove variables.
2008-01-23 Robert Millan <rmh@aybabtu.com>
* kern/mm.c (grub_mm_init_region): Replace grub_dprintf() call with

31
include/grub/i386/ieee1275/loader.h
View file

@ -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 */

3
include/grub/i386/pc/memory.h
View file

@ -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 */

4
kern/i386/ieee1275/init.c
View file

@ -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)
{