55a581dc06
* conf/i386-pc.rmk (kernel_img_HEADERS): Add `machine/kernel.h'.
(pkglib_MODULES): Add `memdisk.mod'.
(memdisk_mod_SOURCES): New variable.
(memdisk_mod_CFLAGS): Likewise.
(memdisk_mod_LDFLAGS): Likewise.
* disk/memdisk.c: New file.
* include/grub/disk.h (grub_disk_dev_id): Add
`GRUB_DISK_DEVICE_MEMDISK_ID'.
* include/grub/i386/pc/kernel.h
(GRUB_KERNEL_MACHINE_MEMDISK_IMAGE_SIZE): New macro.
(GRUB_KERNEL_MACHINE_PREFIX): Increment by 4.
(grub_kernel_image_size): New variable declaration.
(grub_total_module_size): Likewise.
(grub_memdisk_image_size): Likewise.
* include/grub/i386/pc/memory.h
(GRUB_MEMORY_MACHINE_DECOMPRESSION_ADDR): New macro.
* include/grub/kernel.h: Include `<grub/symbol.h>'.
(grub_arch_memdisk_addr): New variable declaration.
(grub_arch_memdisk_size): Likewise.
* kern/i386/pc/init.c (grub_arch_memdisk_addr): New function.
(grub_arch_memdisk_size): Likewise.
* kern/i386/pc/startup.S (grub_memdisk_image_size): New variable.
(codestart): Replace hardcoded `0x100000' with
`GRUB_MEMORY_MACHINE_DECOMPRESSION_ADDR' macro.
* util/i386/pc/grub-mkimage.c: Include `<grub/misc.h>'.
(generate_image): Add `memdisk_path' parameter. When `memdisk_path' is
not NULL, append the contents of the file it refers to, at the end of
the compressed kernel image. Initialize `grub_memdisk_image_size'
variable (at `GRUB_KERNEL_MACHINE_MEMDISK_IMAGE_SIZE' offset).
(options): Add "memdisk"|'m' option.
(main): Parse --memdisk|-m option, and pass user-provided path as
parameter to generate_image().
80 lines
2.5 KiB
C
80 lines
2.5 KiB
C
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 2002,2003,2007 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_MEMDISK_IMAGE_SIZE. */
|
|
#define GRUB_KERNEL_MACHINE_MEMDISK_IMAGE_SIZE 0x1c
|
|
|
|
/* The offset of GRUB_PREFIX. */
|
|
#define GRUB_KERNEL_MACHINE_PREFIX 0x20
|
|
|
|
/* End of the data section. */
|
|
#define GRUB_KERNEL_MACHINE_DATA_END 0x50
|
|
|
|
/* The size of the first region which won't be compressed. */
|
|
#define GRUB_KERNEL_MACHINE_RAW_SIZE 0x4A0
|
|
|
|
#ifndef ASM_FILE
|
|
|
|
#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 size of memory disk image, if present. */
|
|
extern grub_int32_t grub_memdisk_image_size;
|
|
|
|
/* 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 grub_boot_drive;
|
|
|
|
/* The end address of the kernel. */
|
|
extern grub_addr_t grub_end_addr;
|
|
|
|
#endif /* ! ASM_FILE */
|
|
|
|
#endif /* ! KERNEL_MACHINE_HEADER */
|