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.
117 lines
3.2 KiB
C
117 lines
3.2 KiB
C
/* memdisk.c - Access embedded memory disk. */
|
|
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 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/>.
|
|
*/
|
|
|
|
#include <grub/disk.h>
|
|
#include <grub/dl.h>
|
|
#include <grub/kernel.h>
|
|
#include <grub/misc.h>
|
|
#include <grub/mm.h>
|
|
#include <grub/types.h>
|
|
#include <grub/machine/kernel.h>
|
|
|
|
static char *memdisk_addr;
|
|
static grub_off_t memdisk_size = 0;
|
|
|
|
static int
|
|
grub_memdisk_iterate (int (*hook) (const char *name))
|
|
{
|
|
return hook ("memdisk");
|
|
}
|
|
|
|
static grub_err_t
|
|
grub_memdisk_open (const char *name, grub_disk_t disk)
|
|
{
|
|
if (grub_strcmp (name, "memdisk"))
|
|
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not a memdisk");
|
|
|
|
disk->total_sectors = memdisk_size / GRUB_DISK_SECTOR_SIZE;
|
|
disk->id = (unsigned long) "mdsk";
|
|
disk->has_partitions = 0;
|
|
|
|
return GRUB_ERR_NONE;
|
|
}
|
|
|
|
static void
|
|
grub_memdisk_close (grub_disk_t disk __attribute((unused)))
|
|
{
|
|
}
|
|
|
|
static grub_err_t
|
|
grub_memdisk_read (grub_disk_t disk __attribute((unused)), grub_disk_addr_t sector,
|
|
grub_size_t size, char *buf)
|
|
{
|
|
grub_memcpy (buf, memdisk_addr + (sector << GRUB_DISK_SECTOR_BITS), size << GRUB_DISK_SECTOR_BITS);
|
|
return 0;
|
|
}
|
|
|
|
static grub_err_t
|
|
grub_memdisk_write (grub_disk_t disk __attribute((unused)), grub_disk_addr_t sector,
|
|
grub_size_t size, const char *buf)
|
|
{
|
|
grub_memcpy (memdisk_addr + (sector << GRUB_DISK_SECTOR_BITS), buf, size << GRUB_DISK_SECTOR_BITS);
|
|
return 0;
|
|
}
|
|
|
|
static struct grub_disk_dev grub_memdisk_dev =
|
|
{
|
|
.name = "memdisk",
|
|
.id = GRUB_DISK_DEVICE_MEMDISK_ID,
|
|
.iterate = grub_memdisk_iterate,
|
|
.open = grub_memdisk_open,
|
|
.close = grub_memdisk_close,
|
|
.read = grub_memdisk_read,
|
|
.write = grub_memdisk_write,
|
|
.next = 0
|
|
};
|
|
|
|
GRUB_MOD_INIT(memdisk)
|
|
{
|
|
auto int hook (struct grub_module_header *);
|
|
int hook (struct grub_module_header *header)
|
|
{
|
|
if (header->type == OBJ_TYPE_MEMDISK)
|
|
{
|
|
char *memdisk_orig_addr;
|
|
memdisk_orig_addr = (char *) header + sizeof (struct grub_module_header);
|
|
|
|
grub_dprintf ("memdisk", "Found memdisk image at %p\n", memdisk_orig_addr);
|
|
|
|
memdisk_size = header->size - sizeof (struct grub_module_header);
|
|
memdisk_addr = grub_malloc (memdisk_size);
|
|
|
|
grub_dprintf ("memdisk", "Copying memdisk image to dynamic memory\n");
|
|
grub_memmove (memdisk_addr, memdisk_orig_addr, memdisk_size);
|
|
|
|
grub_disk_dev_register (&grub_memdisk_dev);
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
grub_module_iterate (hook);
|
|
}
|
|
|
|
GRUB_MOD_FINI(memdisk)
|
|
{
|
|
if (! memdisk_size)
|
|
return;
|
|
grub_free (memdisk_addr);
|
|
grub_disk_dev_unregister (&grub_memdisk_dev);
|
|
}
|