f84b481b35
2009-11-23 Robert Millan <rmh.grub@aybabtu.com>
* configure.ac: Detect all `emu' platforms. Define
GRUB_MACHINE_* macros in TARGET_CFLAGS. Remove
--enable-grub-emu logic. Disable include/grub/machine
symlink on `emu' platforms.
* genkernsyms.sh.in: Use @TARGET_CFLAGS@ during symbol generation.
* gensymlist.sh.in: Likewise.
* include/grub/i386/coreboot/machine.h: Remove file.
* include/grub/i386/efi/machine.h: Likewise.
* include/grub/i386/ieee1275/machine.h: Likewise.
* include/grub/i386/pc/machine.h: Likewise.
* include/grub/i386/qemu/machine.h: Likewise.
* include/grub/powerpc/ieee1275/machine.h: Likewise.
* include/grub/sparc64/ieee1275/machine.h: Likewise.
* include/grub/x86_64/efi/machine.h: Likewise.
* commands/acpi.c: Remove `<grub/machine/machine.h>'.
* commands/halt.c: Likewise.
* commands/reboot.c: Likewise.
* include/grub/autoefi.h: Likewise.
* include/grub/i386/at_keyboard.h: Likewise.
* include/grub/i386/kernel.h: Likewise.
* include/grub/i386/loader.h: Likewise.
* include/grub/i386/pc/memory.h: Likewise.
* kern/dl.c: Likewise.
* kern/i386/coreboot/init.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/linux.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/usb_keyboard.c: Likewise.
* include/grub/time.h [!GRUB_MACHINE_EMU]: Remove
`<grub/machine/machine.h>'
[!GRUB_MACHINE_EMU] (GRUB_TICKS_PER_SECOND): New macro.
* util/misc.c: Remove `<grub/machine/machine.h>' and
`<grub/machine/time.h>'.
* Makefile.in (enable_grub_emu): Remove variable.
Include $(srcdir)/conf/any-emu.mk for the `emu' platform.
* conf/any-emu.rmk: New file.
* conf/common.rmk (grub_emu_init.lst, grub_emu_init.h)
(grub_emu_init.c): Move from here ...
* conf/any-emu.rmk: ... to here.
* conf/i386-coreboot.rmk (sbin_UTILITIES): Remove `grub-emu'.
(grub_emu_SOURCES, grub_emu_LDFLAGS): Move from here ...
* conf/any-emu.rmk: ... to here.
74 lines
3 KiB
C
74 lines
3 KiB
C
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 2009 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/>.
|
|
*/
|
|
/* This file provides some abstractions so that the same code compiles with
|
|
both efi and efiemu
|
|
*/
|
|
#ifndef GRUB_AUTOEFI_HEADER
|
|
#define GRUB_AUTOEFI_HEADER 1
|
|
|
|
|
|
#ifdef GRUB_MACHINE_EFI
|
|
# include <grub/efi/efi.h>
|
|
# define grub_autoefi_get_memory_map grub_efi_get_memory_map
|
|
# define grub_autoefi_finish_boot_services grub_efi_finish_boot_services
|
|
# define grub_autoefi_system_table grub_efi_system_table
|
|
# define grub_autoefi_mmap_iterate grub_machine_mmap_iterate
|
|
static inline grub_err_t grub_autoefi_prepare (void)
|
|
{
|
|
return GRUB_ERR_NONE;
|
|
};
|
|
# define GRUB_AUTOEFI_MEMORY_AVAILABLE GRUB_MACHINE_MEMORY_AVAILABLE
|
|
# define GRUB_AUTOEFI_MEMORY_RESERVED GRUB_MACHINE_MEMORY_RESERVED
|
|
# ifdef GRUB_MACHINE_MEMORY_ACPI
|
|
# define GRUB_AUTOEFI_MEMORY_ACPI GRUB_MACHINE_MEMORY_ACPI
|
|
# endif
|
|
# ifdef GRUB_MACHINE_MEMORY_NVS
|
|
# define GRUB_AUTOEFI_MEMORY_NVS GRUB_MACHINE_MEMORY_NVS
|
|
# endif
|
|
# ifdef GRUB_MACHINE_MEMORY_CODE
|
|
# define GRUB_AUTOEFI_MEMORY_CODE GRUB_MACHINE_MEMORY_CODE
|
|
# endif
|
|
# define SYSTEM_TABLE_SIZEOF(x) (sizeof(grub_efi_system_table->x))
|
|
# define SYSTEM_TABLE_VAR(x) ((void *)&(grub_efi_system_table->x))
|
|
# define SYSTEM_TABLE_PTR(x) ((void *)(grub_efi_system_table->x))
|
|
# define SIZEOF_OF_UINTN sizeof (grub_efi_uintn_t)
|
|
# define SYSTEM_TABLE(x) (grub_efi_system_table->x)
|
|
# define EFI_PRESENT 1
|
|
#else
|
|
# include <grub/efiemu/efiemu.h>
|
|
# define grub_autoefi_get_memory_map grub_efiemu_get_memory_map
|
|
# define grub_autoefi_finish_boot_services grub_efiemu_finish_boot_services
|
|
# define grub_autoefi_system_table grub_efiemu_system_table
|
|
# define grub_autoefi_mmap_iterate grub_efiemu_mmap_iterate
|
|
# define grub_autoefi_prepare grub_efiemu_prepare
|
|
# define GRUB_AUTOEFI_MEMORY_AVAILABLE GRUB_EFIEMU_MEMORY_AVAILABLE
|
|
# define GRUB_AUTOEFI_MEMORY_RESERVED GRUB_EFIEMU_MEMORY_RESERVED
|
|
# define GRUB_AUTOEFI_MEMORY_ACPI GRUB_EFIEMU_MEMORY_ACPI
|
|
# define GRUB_AUTOEFI_MEMORY_NVS GRUB_EFIEMU_MEMORY_NVS
|
|
# define GRUB_AUTOEFI_MEMORY_CODE GRUB_EFIEMU_MEMORY_CODE
|
|
# define SYSTEM_TABLE_SIZEOF GRUB_EFIEMU_SYSTEM_TABLE_SIZEOF
|
|
# define SYSTEM_TABLE_VAR GRUB_EFIEMU_SYSTEM_TABLE_VAR
|
|
# define SYSTEM_TABLE_PTR GRUB_EFIEMU_SYSTEM_TABLE_PTR
|
|
# define SIZEOF_OF_UINTN GRUB_EFIEMU_SIZEOF_OF_UINTN
|
|
# define SYSTEM_TABLE GRUB_EFIEMU_SYSTEM_TABLE
|
|
# define grub_efi_allocate_pages(x,y) (x)
|
|
# define grub_efi_free_pages(x,y) GRUB_EFI_SUCCESS
|
|
# define EFI_PRESENT 1
|
|
#endif
|
|
|
|
#endif
|