8231fb77c6
2009-06-27 Robert Millan <rmh.grub@aybabtu.com>
* include/grub/dl.h: Include grub/elf.h.
(struct grub_dl): Add symtab field.
* kern/dl.c [GRUB_MACHINE_QEMU]: Define
GRUB_MODULES_MACHINE_READONLY.
(grub_dl_resolve_symbols): Populate mod->symtab, making a copy
of the header for read-only modules.
(grub_dl_unload): Free mod->symtab for read-only modules.
* kern/i386/dl.c: Use mod->symtab.
* kern/powerpc/dl.c: Likewise.
* kern/sparc64/dl.c: Likewise.
* kern/x86_64/dl.c: Likewise.
* conf/i386-qemu.rmk: New file.
* kern/i386/qemu/startup.S: Likewise.
* kern/i386/qemu/mmap.c: Likewise.
* boot/i386/qemu/boot.S: Likewise.
* include/grub/i386/qemu/time.h: Likewise.
* include/grub/i386/qemu/serial.h: Likewise.
* include/grub/i386/qemu/kernel.h: Likewise.
* include/grub/i386/qemu/console.h: Likewise.
* include/grub/i386/qemu/boot.h: Likewise.
* include/grub/i386/qemu/init.h: Likewise.
* include/grub/i386/qemu/machine.h: Likewise.
* include/grub/i386/qemu/loader.h: Likewise.
* include/grub/i386/qemu/memory.h: Likewise.
* conf/i386-coreboot.rmk (GRUB_BOOT_MACHINE_LINK_ADDR)
(GRUB_KERNEL_MACHINE_LINK_ADDR): New variables.
[qemu] (pkglib_IMAGES): Add `boot.img'.
[qemu] (boot_img_SOURCES, boot_img_ASFLAGS, boot_img_LDFLAGS)
[qemu] (boot_img_FORMAT): New variables.
[qemu] (bin_UTILITIES): Add `grub-mkimage'.
[qemu] (grub_mkimage_SOURCES, grub_mkimage_CFLAGS): New variables.
[qemu] (kernel_img_SOURCES, kernel_img_HEADERS, kernel_img_CFLAGS)
[qemu] (kernel_img_ASFLAGS, kernel_img_LDFLAGS)
[qemu] (kernel_img_FORMAT): New variables.
* configure.ac: Recognise `i386-qemu'.
* util/i386/pc/grub-mkimage.c (compress_kernel): Add dummy variant
(for no compression).
[GRUB_MACHINE_QEMU] (generate_image): Misc adjustments to produce
a valid i386 ROM image. Make `GRUB_KERNEL_MACHINE_COMPRESSED_SIZE',
`GRUB_KERNEL_MACHINE_INSTALL_DOS_PART' and
`GRUB_KERNEL_MACHINE_INSTALL_BSD_PART' optional features (with
ifdefs).
74 lines
2.1 KiB
C
74 lines
2.1 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/>.
|
|
*/
|
|
|
|
#include <grub/machine/init.h>
|
|
#include <grub/machine/memory.h>
|
|
#include <grub/machine/boot.h>
|
|
#include <grub/types.h>
|
|
#include <grub/err.h>
|
|
#include <grub/misc.h>
|
|
#include <grub/i386/cmos.h>
|
|
|
|
#define QEMU_CMOS_MEMSIZE_HIGH 0x35
|
|
#define QEMU_CMOS_MEMSIZE_LOW 0x34
|
|
|
|
#define min(a,b) ((a) > (b) ? (b) : (a))
|
|
|
|
extern char _start[];
|
|
extern char _end[];
|
|
|
|
grub_size_t grub_lower_mem, grub_upper_mem;
|
|
grub_uint64_t mem_size;
|
|
|
|
void
|
|
grub_machine_mmap_init ()
|
|
{
|
|
mem_size = grub_cmos_read (QEMU_CMOS_MEMSIZE_HIGH) << 24 | grub_cmos_read (QEMU_CMOS_MEMSIZE_LOW) << 16;
|
|
|
|
/* Don't ask... */
|
|
mem_size += (16 * 1024 * 1024);
|
|
}
|
|
|
|
grub_err_t
|
|
grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t))
|
|
{
|
|
if (hook (0x0,
|
|
_start,
|
|
GRUB_MACHINE_MEMORY_AVAILABLE))
|
|
return 1;
|
|
|
|
if (hook (GRUB_MEMORY_MACHINE_UPPER,
|
|
0x100000 - GRUB_MEMORY_MACHINE_UPPER,
|
|
GRUB_MACHINE_MEMORY_RESERVED))
|
|
return 1;
|
|
|
|
/* Protect boot.img, which contains the gdt. It is mapped at the top of memory
|
|
(it is also mapped below 0x100000, but we already reserved that area). */
|
|
if (hook ((grub_uint32_t) -GRUB_BOOT_MACHINE_SIZE,
|
|
GRUB_BOOT_MACHINE_SIZE,
|
|
GRUB_MACHINE_MEMORY_RESERVED))
|
|
return 1;
|
|
|
|
/* Everything else is free. */
|
|
if (hook (0x100000,
|
|
min (mem_size, (grub_uint32_t) -GRUB_BOOT_MACHINE_SIZE) - 0x100000,
|
|
GRUB_MACHINE_MEMORY_AVAILABLE))
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|