mirror of
https://git.proxmox.com/git/grub2
synced 2025-05-21 18:10:11 +00:00
3bd0a12aca
* disk/memdisk.c (memdisk_size): Don't initialize.
(GRUB_MOD_INIT(memdisk)): Find memdisk using grub_module_iterate().
* include/grub/i386/pc/kernel.h
(GRUB_KERNEL_MACHINE_MEMDISK_IMAGE_SIZE): Remove macro.
(GRUB_KERNEL_MACHINE_PREFIX, GRUB_KERNEL_MACHINE_DATA_END): Shift.
(grub_memdisk_image_size, grub_arch_memdisk_addr)
(grub_arch_memdisk_size): Remove.
* include/grub/kernel.h (struct grub_module_header): Remove `offset'
field (was only used to transfer a constant). Add `type' field to
support multiple module types.
(grub_module_iterate): New function.
* kern/device.c (grub_device_open): Do not hide error messages
when grub_disk_open() fails. Use grub_print_error() instead.
* kern/i386/pc/init.c (grub_arch_modules_addr)
(grub_arch_memdisk_size): Remove functions.
(grub_arch_modules_addr): Return the module address in high memory
(now that it isn't copied anymore).
* kern/i386/pc/startup.S (grub_memdisk_image_size): Remove variable.
(codestart): Don't add grub_memdisk_image_size to %ecx in LZMA
decompression routine (grub_total_module_size already includes that
now). Don't copy modules back to low memory.
* kern/main.c: Include `<grub/mm.h>'.
(grub_load_modules): Split out (and use) ...
(grub_module_iterate): ... this function, which iterates through
module objects and runs a hook.
Comment out grub_mm_init_region() call, as it would cause non-ELF
modules to be overwritten.
* util/i386/pc/grub-mkimage.c (generate_image): Instead of appending
the memdisk image in its own region, make it part of the module list.
* util/elf/grub-mkimage.c (options): Add "memdisk"|'m' option.
(main): Parse --memdisk|-m option, and pass user-provided path as
parameter to generate_image().
(add_segments): Pass `memdisk_path' down to load_modules().
(load_modules): Embed memdisk image in module section when requested.
* util/i386/efi/grub-mkimage.c (make_mods_section): Initialize
`header.type' instead of `header.offset'.
* conf/powerpc-ieee1275.rmk (pkglib_MODULES): Add `memdisk.mod'.
(memdisk_mod_SOURCES, memdisk_mod_CFLAGS)
(memdisk_mod_LDFLAGS): New variables.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
83 lines
2.5 KiB
C
83 lines
2.5 KiB
C
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 2002,2003,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 KERNEL_MACHINE_HEADER
|
|
#define KERNEL_MACHINE_HEADER 1
|
|
|
|
/* The offset of GRUB_TOTAL_MODULE_SIZE. */
|
|
#define GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE 0x8
|
|
|
|
/* The offset of GRUB_KERNEL_IMAGE_SIZE. */
|
|
#define GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE 0xc
|
|
|
|
/* The offset of GRUB_COMPRESSED_SIZE. */
|
|
#define GRUB_KERNEL_MACHINE_COMPRESSED_SIZE 0x10
|
|
|
|
/* The offset of GRUB_INSTALL_DOS_PART. */
|
|
#define GRUB_KERNEL_MACHINE_INSTALL_DOS_PART 0x14
|
|
|
|
/* The offset of GRUB_INSTALL_BSD_PART. */
|
|
#define GRUB_KERNEL_MACHINE_INSTALL_BSD_PART 0x18
|
|
|
|
/* The offset of GRUB_PREFIX. */
|
|
#define GRUB_KERNEL_MACHINE_PREFIX 0x1c
|
|
|
|
/* End of the data section. */
|
|
#define GRUB_KERNEL_MACHINE_DATA_END 0x5c
|
|
|
|
/* The size of the first region which won't be compressed. */
|
|
#if defined(ENABLE_LZO)
|
|
#define GRUB_KERNEL_MACHINE_RAW_SIZE (GRUB_KERNEL_MACHINE_DATA_END + 0x450)
|
|
#elif defined(ENABLE_LZMA)
|
|
#define GRUB_KERNEL_MACHINE_RAW_SIZE (GRUB_KERNEL_MACHINE_DATA_END + 0x5F0)
|
|
#endif
|
|
|
|
#ifndef ASM_FILE
|
|
|
|
#include <grub/symbol.h>
|
|
#include <grub/types.h>
|
|
|
|
/* The size of kernel image. */
|
|
extern grub_int32_t grub_kernel_image_size;
|
|
|
|
/* The total size of module images following the kernel. */
|
|
extern grub_int32_t grub_total_module_size;
|
|
|
|
/* The DOS partition number of the installed partition. */
|
|
extern grub_int32_t grub_install_dos_part;
|
|
|
|
/* The BSD partition number of the installed partition. */
|
|
extern grub_int32_t grub_install_bsd_part;
|
|
|
|
/* The prefix which points to the directory where GRUB modules and its
|
|
configuration file are located. */
|
|
extern char grub_prefix[];
|
|
|
|
/* The boot BIOS drive number. */
|
|
extern grub_int32_t EXPORT_VAR(grub_boot_drive);
|
|
|
|
/* The root BIOS drive number. */
|
|
extern grub_int32_t grub_root_drive;
|
|
|
|
/* The end address of the kernel. */
|
|
extern grub_addr_t grub_end_addr;
|
|
|
|
#endif /* ! ASM_FILE */
|
|
|
|
#endif /* ! KERNEL_MACHINE_HEADER */
|