From 0b412211b3f485d4d3f65d89d51331c05d9e2114 Mon Sep 17 00:00:00 2001 From: marco_g Date: Tue, 4 Jan 2005 14:01:45 +0000 Subject: [PATCH] 2005-01-04 Hollis Blanchard * TODO: Add note about endianness in grub-mkimage. * boot/powerpc/ieee1275/crt0.S (note): Remove unused .note section. * conf/powerpc-ieee1275.rmk (bin_UTILITIES): Add grub-mkimage. (grub_mkimage_SOURCES): New target. * include/grub/kernel.h (grub_start_addr): Remove variable. (grub_end_addr): Likewise. (grub_total_module_size): Likewise. (grub_kernel_image_size): Likewise. (GRUB_MODULE_MAGIC): New constant. (grub_module_info): New structure. (grub_arch_modules_addr): New prototype. (grub_get_end_addr): Remove prototype. * include/grub/i386/pc/kernel.h (grub_end_addr): New prototype. * include/grub/powerpc/ieee1275/kernel.h: New file. * include/grub/util/misc.h (grub_util_get_fp_size): New prototype. (grub_util_read_at): Likewise. (grub_util_write_image_at): Likewise. * kern/main.c (grub_get_end_addr): Remove function. (grub_load_modules): Call grub_arch_modules_addr instead of using grub_end_addr. Look for a grub_module_info struct in memory. Use the grub_module_info fields instead of calling grub_get_end_addr as loop conditions. Move grub_add_unused_region code here. (grub_add_unused_region): Remove function. * kern/i386/pc/init.c: Include grub/cache.h. (grub_machine_init): Remove call to grub_get_end_addr. Remove one call to add_mem_region. (grub_arch_modules_addr): New function. * kern/powerpc/ieee1275/init.c (grub_end_addr): Remove variable. (grub_total_module_size): Likewise. Include grub/machine/kernel.h. (grub_arch_modules_addr): New function. * util/grub-emu.c (grub_end_addr): Remove variable. (grub_total_module_size): Likewise. (grub_arch_modules_addr): New function. * util/misc.c: Include unistd.h. (grub_util_get_fp_size): New function. (grub_util_read_at): Likewise. (grub_util_write_image_at): Likewise. (grub_util_read_image): Call grub_util_read_at. (grub_util_write_image): Call grub_util_write_image_at. * util/i386/pc/grub-mkimage.c (generate_image): Allocate additional memory in kernel_img for a struct grub_module_info. Fill in that grub_module_info. * util/powerpc/ieee1275/grub-mkimage.c: New file. --- ChangeLog | 49 ++++ TODO | 2 + boot/powerpc/ieee1275/crt0.S | 17 +- conf/powerpc-ieee1275.rmk | 6 +- include/grub/i386/pc/kernel.h | 3 + include/grub/kernel.h | 26 +-- include/grub/powerpc/ieee1275/kernel.h | 26 +++ include/grub/util/misc.h | 6 +- kern/i386/pc/init.c | 13 +- kern/main.c | 32 ++- kern/powerpc/ieee1275/init.c | 13 +- util/grub-emu.c | 10 +- util/i386/pc/grub-mkimage.c | 14 +- util/misc.c | 42 +++- util/powerpc/ieee1275/grub-mkimage.c | 299 +++++++++++++++++++++++++ 15 files changed, 488 insertions(+), 70 deletions(-) create mode 100644 include/grub/powerpc/ieee1275/kernel.h create mode 100644 util/powerpc/ieee1275/grub-mkimage.c diff --git a/ChangeLog b/ChangeLog index 856e4606b..9b74ad433 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,52 @@ +2005-01-04 Hollis Blanchard + + * TODO: Add note about endianness in grub-mkimage. + * boot/powerpc/ieee1275/crt0.S (note): Remove unused .note + section. + * conf/powerpc-ieee1275.rmk (bin_UTILITIES): Add grub-mkimage. + (grub_mkimage_SOURCES): New target. + * include/grub/kernel.h (grub_start_addr): Remove variable. + (grub_end_addr): Likewise. + (grub_total_module_size): Likewise. + (grub_kernel_image_size): Likewise. + (GRUB_MODULE_MAGIC): New constant. + (grub_module_info): New structure. + (grub_arch_modules_addr): New prototype. + (grub_get_end_addr): Remove prototype. + * include/grub/i386/pc/kernel.h (grub_end_addr): New prototype. + * include/grub/powerpc/ieee1275/kernel.h: New file. + * include/grub/util/misc.h (grub_util_get_fp_size): New + prototype. + (grub_util_read_at): Likewise. + (grub_util_write_image_at): Likewise. + * kern/main.c (grub_get_end_addr): Remove function. + (grub_load_modules): Call grub_arch_modules_addr instead of using + grub_end_addr. Look for a grub_module_info struct in memory. Use + the grub_module_info fields instead of calling grub_get_end_addr + as loop conditions. Move grub_add_unused_region code here. + (grub_add_unused_region): Remove function. + * kern/i386/pc/init.c: Include grub/cache.h. + (grub_machine_init): Remove call to grub_get_end_addr. Remove + one call to add_mem_region. + (grub_arch_modules_addr): New function. + * kern/powerpc/ieee1275/init.c (grub_end_addr): Remove variable. + (grub_total_module_size): Likewise. + Include grub/machine/kernel.h. + (grub_arch_modules_addr): New function. + * util/grub-emu.c (grub_end_addr): Remove variable. + (grub_total_module_size): Likewise. + (grub_arch_modules_addr): New function. + * util/misc.c: Include unistd.h. + (grub_util_get_fp_size): New function. + (grub_util_read_at): Likewise. + (grub_util_write_image_at): Likewise. + (grub_util_read_image): Call grub_util_read_at. + (grub_util_write_image): Call grub_util_write_image_at. + * util/i386/pc/grub-mkimage.c (generate_image): Allocate + additional memory in kernel_img for a struct grub_module_info. + Fill in that grub_module_info. + * util/powerpc/ieee1275/grub-mkimage.c: New file. + 2005-01-03 Hollis Blanchard * boot/powerpc/ieee1275/ieee1275.c (grub_ieee1275_milliseconds): diff --git a/TODO b/TODO index 9f344e315..a6658bd98 100644 --- a/TODO +++ b/TODO @@ -39,3 +39,5 @@ Priorities: * Add a fancy menu interface which utilizes the graphics mode extensively with many eye-candies. This is important to beat GRUB legacy. :) + +* Audit util/powerpc/ieee1275/grub-mkimage.c for endianness fixes. diff --git a/boot/powerpc/ieee1275/crt0.S b/boot/powerpc/ieee1275/crt0.S index 89da351cb..99d9bd596 100644 --- a/boot/powerpc/ieee1275/crt0.S +++ b/boot/powerpc/ieee1275/crt0.S @@ -1,7 +1,7 @@ /* crt0.S - Startup code for the PowerPC. */ /* * GRUB -- GRand Unified Bootloader - * Copyright (C) 2003, 2004 Free Software Foundation, Inc. + * Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,21 +18,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - .section ".note" - .align 2 -.note_section_header: - .long 8 - .long 24 - .long 0x1275 - .string "PowerPC" -.note_descriptor: - .long 0x0 /* real-mode */ - .long 0xffffffff /* real-base */ - .long 0xffffffff /* real-size */ - .long 0xffffffff /* virt-base */ - .long 0xffffffff /* virt-size */ - .long 0x00030000 /* load-base */ - .extern __bss_start .extern _end diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk index cc3acc7d3..4732c992f 100644 --- a/conf/powerpc-ieee1275.rmk +++ b/conf/powerpc-ieee1275.rmk @@ -24,9 +24,13 @@ kernel_syms.lst: $(addprefix include/grub/,$(grubof_HEADERS)) genkernsyms.sh pkgdata_PROGRAMS = grubof # Utilities. -bin_UTILITIES = grub-emu +bin_UTILITIES = grub-emu grub-mkimage noinst_UTILITIES = genmoddep +# For grub-mkimage. +grub_mkimage_SOURCES = util/powerpc/ieee1275/grub-mkimage.c util/misc.c \ + util/resolve.c + # For grub-emu grub_emu_SOURCES = kern/main.c kern/device.c \ kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \ diff --git a/include/grub/i386/pc/kernel.h b/include/grub/i386/pc/kernel.h index e5e30cdb3..24d1cc9f8 100644 --- a/include/grub/i386/pc/kernel.h +++ b/include/grub/i386/pc/kernel.h @@ -58,6 +58,9 @@ 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 */ diff --git a/include/grub/kernel.h b/include/grub/kernel.h index 8882d312c..d30019337 100644 --- a/include/grub/kernel.h +++ b/include/grub/kernel.h @@ -1,6 +1,6 @@ /* * GRUB -- GRand Unified Bootloader - * Copyright (C) 2002 Free Software Foundation, Inc. + * Copyright (C) 2002, 2005 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,17 +31,20 @@ struct grub_module_header grub_size_t size; }; -/* The start address of the kernel. */ -extern grub_addr_t grub_start_addr; +/* "gmim" (GRUB Module Info Magic). */ +#define GRUB_MODULE_MAGIC 0x676d696d -/* The end address of the kernel. */ -extern grub_addr_t grub_end_addr; +struct grub_module_info +{ + /* Magic number so we know we have modules present. */ + grub_uint32_t magic; + /* The offset of the modules. */ + grub_off_t offset; + /* The size of all modules plus this header. */ + grub_size_t size; +}; -/* The total size of modules including their headers. */ -extern grub_size_t grub_total_module_size; - -/* The size of the kernel image. */ -extern grub_size_t grub_kernel_image_size; +extern grub_addr_t grub_arch_modules_addr (void); /* The start point of the C code. */ void grub_main (void); @@ -49,9 +52,6 @@ void grub_main (void); /* The machine-specific initialization. This must initialize memory. */ void grub_machine_init (void); -/* Return the end address of the core image. */ -grub_addr_t grub_get_end_addr (void); - /* Register all the exported symbols. This is automatically generated. */ void grub_register_exported_symbols (void); diff --git a/include/grub/powerpc/ieee1275/kernel.h b/include/grub/powerpc/ieee1275/kernel.h new file mode 100644 index 000000000..f2414866a --- /dev/null +++ b/include/grub/powerpc/ieee1275/kernel.h @@ -0,0 +1,26 @@ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2005 Free Software Foundation, Inc. + * + * This program 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 2 of the License, or + * (at your option) any later version. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef GRUB_KERNEL_MACHINE_HEADER +#define GRUB_KERNEL_MACHINE_HEADER 1 + +/* Where grub-mkimage places the core modules in memory. */ +#define GRUB_IEEE1275_MODULE_BASE 0x0300000 + +#endif /* ! GRUB_KERNEL_MACHINE_HEADER */ diff --git a/include/grub/util/misc.h b/include/grub/util/misc.h index 148c99b36..63ec9f163 100644 --- a/include/grub/util/misc.h +++ b/include/grub/util/misc.h @@ -1,6 +1,6 @@ /* * GRUB -- GRand Unified Bootloader - * Copyright (C) 2002,2003 Free Software Foundation, Inc. + * Copyright (C) 2002,2003,2005 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 @@ -34,9 +34,13 @@ void *xrealloc (void *ptr, size_t size); char *xstrdup (const char *str); char *grub_util_get_path (const char *dir, const char *file); +size_t grub_util_get_fp_size (FILE *fp); size_t grub_util_get_image_size (const char *path); +void grub_util_read_at (void *img, size_t len, off_t offset, FILE *fp); char *grub_util_read_image (const char *path); void grub_util_load_image (const char *path, char *buf); void grub_util_write_image (const char *img, size_t size, FILE *out); +void grub_util_write_image_at (const void *img, size_t size, off_t offset, + FILE *out); #endif /* ! GRUB_UTIL_MISC_HEADER */ diff --git a/kern/i386/pc/init.c b/kern/i386/pc/init.c index 0e8c9cbf0..3a4c32ff6 100644 --- a/kern/i386/pc/init.c +++ b/kern/i386/pc/init.c @@ -1,6 +1,6 @@ /* * GRUB -- GRand Unified Bootloader - * Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + * Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,6 +30,7 @@ #include #include #include +#include struct mem_region { @@ -126,7 +127,6 @@ grub_machine_init (void) grub_uint32_t cont; struct grub_machine_mmap_entry *entry = (struct grub_machine_mmap_entry *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR; - grub_addr_t end_addr = grub_get_end_addr (); int i; /* Initialize the console as early as possible. */ @@ -148,8 +148,6 @@ grub_machine_init (void) add_mem_region (GRUB_MEMORY_MACHINE_RESERVED_END, grub_lower_mem - GRUB_MEMORY_MACHINE_RESERVED_END); - add_mem_region (end_addr, GRUB_MEMORY_MACHINE_RESERVED_START - end_addr); - /* Check if grub_get_mmap_entry works. */ cont = grub_get_mmap_entry (entry, 0); @@ -233,3 +231,10 @@ grub_machine_init (void) /* Initialize the prefix. */ grub_env_set ("prefix", make_install_device ()); } + +/* Return the end of the core image. */ +grub_addr_t +grub_arch_modules_addr (void) +{ + return grub_end_addr; +} diff --git a/kern/main.c b/kern/main.c index 1ea44282f..26f60fe86 100644 --- a/kern/main.c +++ b/kern/main.c @@ -1,7 +1,7 @@ /* main.c - the kernel main routine */ /* * GRUB -- GRand Unified Bootloader - * Copyright (C) 2002, 2003 Free Software Foundation, Inc. + * Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,35 +29,32 @@ #include #include -/* Return the end of the core image. */ -grub_addr_t -grub_get_end_addr (void) -{ - return grub_total_module_size + grub_end_addr; -} - /* Load all modules in core. */ static void grub_load_modules (void) { + struct grub_module_info *modinfo; struct grub_module_header *header; + grub_addr_t modbase; - for (header = (struct grub_module_header *) grub_end_addr; - header < (struct grub_module_header *) grub_get_end_addr (); + modbase = grub_arch_modules_addr (); + modinfo = (struct grub_module_info *) modbase; + + /* Check if there are any modules. */ + if ((modinfo == 0) || modinfo->magic != GRUB_MODULE_MAGIC) + return; + + for (header = (struct grub_module_header *) (modbase + modinfo->offset); + header < (struct grub_module_header *) (modbase + modinfo->size); header = (struct grub_module_header *) ((char *) header + header->size)) { if (! grub_dl_load_core ((char *) header + header->offset, (header->size - header->offset))) grub_fatal ("%s", grub_errmsg); } -} -/* Add the region where modules reside into dynamic memory. */ -static void -grub_add_unused_region (void) -{ - if (grub_total_module_size) - grub_mm_init_region ((void *) grub_end_addr, grub_total_module_size); + /* Add the region where modules reside into dynamic memory. */ + grub_mm_init_region ((void *) modinfo, modinfo->size); } /* Set the root device according to the dl prefix. */ @@ -111,7 +108,6 @@ grub_main (void) /* Load pre-loaded modules and free the space. */ grub_register_exported_symbols (); grub_load_modules (); - grub_add_unused_region (); /* Load the normal mode module. */ grub_load_normal_mode (); diff --git a/kern/powerpc/ieee1275/init.c b/kern/powerpc/ieee1275/init.c index ce342e157..233911362 100644 --- a/kern/powerpc/ieee1275/init.c +++ b/kern/powerpc/ieee1275/init.c @@ -1,7 +1,7 @@ /* init.c -- Initialize GRUB on the newworld mac (PPC). */ /* * GRUB -- GRand Unified Bootloader - * Copyright (C) 2003, 2004,2005 Free Software Foundation, Inc. + * Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,10 +31,7 @@ #include #include #include - -/* XXX: Modules are not yet supported. */ -grub_addr_t grub_end_addr = -1; -grub_addr_t grub_total_module_size = 0; +#include void abort (void) @@ -89,3 +86,9 @@ grub_get_rtc (void) return msecs; } + +grub_addr_t +grub_arch_modules_addr (void) +{ + return GRUB_IEEE1275_MODULE_BASE; +} diff --git a/util/grub-emu.c b/util/grub-emu.c index ec88764b8..ae2206bfb 100644 --- a/util/grub-emu.c +++ b/util/grub-emu.c @@ -1,6 +1,6 @@ /* * GRUB -- GRand Unified Bootloader - * Copyright (C) 2003 Free Software Foundation, Inc. + * Copyright (C) 2003, 2004, 2005 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 @@ -45,9 +45,11 @@ #define DEFAULT_DEVICE_MAP DEFAULT_DIRECTORY "/device.map" -/* XXX. */ -grub_addr_t grub_end_addr = -1; -grub_addr_t grub_total_module_size = 0; +grub_addr_t +grub_arch_modules_addr (void) +{ + return 0; +} int grub_arch_dl_check_header (void *ehdr, grub_size_t size) diff --git a/util/i386/pc/grub-mkimage.c b/util/i386/pc/grub-mkimage.c index 1b683b738..be915140c 100644 --- a/util/i386/pc/grub-mkimage.c +++ b/util/i386/pc/grub-mkimage.c @@ -1,7 +1,7 @@ /* grub-mkimage.c - make a bootable image */ /* * GRUB -- GRand Unified Bootloader - * Copyright (C) 2002,2003,2004 Free Software Foundation, Inc. + * Copyright (C) 2002,2003,2004,2005 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 @@ -79,13 +79,14 @@ generate_image (const char *dir, FILE *out, char *mods[]) unsigned num; size_t offset; struct grub_util_path_list *path_list, *p, *next; + struct grub_module_info *modinfo; path_list = grub_util_resolve_dependencies (dir, "moddep.lst", mods); kernel_path = grub_util_get_path (dir, "kernel.img"); kernel_size = grub_util_get_image_size (kernel_path); - total_module_size = 0; + total_module_size = sizeof (struct grub_module_info); for (p = path_list; p; p = p->next) total_module_size += (grub_util_get_image_size (p->name) + sizeof (struct grub_module_header)); @@ -94,7 +95,14 @@ generate_image (const char *dir, FILE *out, char *mods[]) kernel_img = xmalloc (kernel_size + total_module_size); grub_util_load_image (kernel_path, kernel_img); - offset = kernel_size; + + /* Fill in the grub_module_info structure. */ + modinfo = (struct grub_module_info *) (kernel_img + kernel_size); + modinfo->magic = GRUB_MODULE_MAGIC; + modinfo->offset = sizeof (struct grub_module_info); + modinfo->size = total_module_size; + + offset = kernel_size + sizeof (struct grub_module_info); for (p = path_list; p; p = p->next) { struct grub_module_header *header; diff --git a/util/misc.c b/util/misc.c index dc254c6ae..00044727e 100644 --- a/util/misc.c +++ b/util/misc.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -106,6 +107,20 @@ grub_util_get_path (const char *dir, const char *file) return path; } +size_t +grub_util_get_fp_size (FILE *fp) +{ + struct stat st; + + if (fflush (fp) == EOF) + grub_util_error ("fflush failed"); + + if (fstat (fileno (fp), &st) == -1) + grub_util_error ("fstat failed"); + + return st.st_size; +} + size_t grub_util_get_image_size (const char *path) { @@ -119,6 +134,16 @@ grub_util_get_image_size (const char *path) return st.st_size; } +void +grub_util_read_at (void *img, size_t size, off_t offset, FILE *fp) +{ + if (fseek (fp, offset, SEEK_SET) == -1) + grub_util_error ("fseek failed"); + + if (fread (img, 1, size, fp) != size) + grub_util_error ("read failed"); +} + char * grub_util_read_image (const char *path) { @@ -134,9 +159,8 @@ grub_util_read_image (const char *path) fp = fopen (path, "rb"); if (! fp) grub_util_error ("cannot open %s", path); - - if (fread (img, 1, size, fp) != size) - grub_util_error ("cannot read %s", path); + + grub_util_read_at (img, size, 0, fp); fclose (fp); @@ -164,13 +188,21 @@ grub_util_load_image (const char *path, char *buf) } void -grub_util_write_image (const char *img, size_t size, FILE *out) +grub_util_write_image_at (const void *img, size_t size, off_t offset, FILE *out) { - grub_util_info ("writing 0x%x bytes", size); + grub_util_info ("writing 0x%x bytes at offset 0x%x", size, offset); + if (fseek (out, offset, SEEK_SET) == -1) + grub_util_error ("seek failed"); if (fwrite (img, 1, size, out) != size) grub_util_error ("write failed"); } +void +grub_util_write_image (const char *img, size_t size, FILE *out) +{ + grub_util_write_image_at (img, size, 0, out); +} + void * grub_malloc (unsigned size) { diff --git a/util/powerpc/ieee1275/grub-mkimage.c b/util/powerpc/ieee1275/grub-mkimage.c new file mode 100644 index 000000000..bdf16fd2d --- /dev/null +++ b/util/powerpc/ieee1275/grub-mkimage.c @@ -0,0 +1,299 @@ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2004, 2005 Free Software Foundation, Inc. + * + * This program 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 2 of the License, or + * (at your option) any later version. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define ALIGN_UP(addr, align) ((long)((char *)addr + align - 1) & ~(align - 1)) + +static char *kernel_path = "grubof"; +static char *note_path = "note"; + + +void +load_note (Elf32_Phdr *phdr, const char *dir, FILE *out) +{ + char *note_img; + char *path; + int note_size; + + grub_util_info ("adding CHRP NOTE segment"); + + path = grub_util_get_path (dir, note_path); + note_size = grub_util_get_image_size (path); + note_img = xmalloc (note_size); + grub_util_load_image (path, note_img); + free (path); + + /* Write the note data to the new segment. */ + grub_util_write_image_at (note_img, note_size, phdr->p_offset, out); + + /* Fill in the rest of the segment header. */ + phdr->p_type = PT_NOTE; + phdr->p_flags = PF_R; + phdr->p_align = sizeof (long); + phdr->p_vaddr = 0; + phdr->p_paddr = 0; + phdr->p_filesz = note_size; + phdr->p_memsz = 0; +} + +void +load_modules (Elf32_Phdr *phdr, const char *dir, char *mods[], FILE *out) +{ + char *module_img; + struct grub_util_path_list *path_list; + struct grub_util_path_list *p; + struct grub_module_info *modinfo; + size_t offset; + size_t total_module_size; + + path_list = grub_util_resolve_dependencies (dir, "moddep.lst", mods); + + offset = sizeof (struct grub_module_info); + total_module_size = sizeof (struct grub_module_info); + for (p = path_list; p; p = p->next) + { + total_module_size += (grub_util_get_image_size (p->name) + + sizeof (struct grub_module_header)); + } + + grub_util_info ("the total module size is 0x%x", total_module_size); + + module_img = xmalloc (total_module_size); + modinfo = (struct grub_module_info *) module_img; + modinfo->magic = GRUB_MODULE_MAGIC; + modinfo->offset = sizeof (struct grub_module_info); + modinfo->size = total_module_size; + + /* Load all the modules, with headers, into module_img. */ + for (p = path_list; p; p = p->next) + { + struct grub_module_header *header; + size_t mod_size; + + grub_util_info ("adding module %s", p->name); + + mod_size = grub_util_get_image_size (p->name); + + header = (struct grub_module_header *) (module_img + offset); + header->offset = grub_cpu_to_be32 (sizeof (*header)); + header->size = grub_cpu_to_be32 (mod_size + sizeof (*header)); + + grub_util_load_image (p->name, module_img + offset + sizeof (*header)); + + offset += sizeof (*header) + mod_size; + } + + /* Write the module data to the new segment. */ + grub_util_write_image_at (module_img, total_module_size, phdr->p_offset, out); + + /* Fill in the rest of the segment header. */ + phdr->p_type = PT_LOAD; + phdr->p_flags = PF_R | PF_W | PF_X; + phdr->p_align = sizeof (long); + phdr->p_vaddr = MODULE_BASE; + phdr->p_paddr = MODULE_BASE; + phdr->p_filesz = total_module_size; + phdr->p_memsz = total_module_size; +} + +void +add_segments (char *dir, FILE *out, int chrp, char *mods[]) +{ + Elf32_Ehdr ehdr; + Elf32_Phdr *phdrs = NULL; + Elf32_Phdr *phdr; + FILE *in; + off_t phdroff; + int i; + + /* Read ELF header. */ + in = fopen (kernel_path, "rb"); + if (! in) + grub_util_error ("cannot open %s", kernel_path); + grub_util_read_at (&ehdr, sizeof (ehdr), 0, in); + + phdrs = xmalloc (ehdr.e_phentsize * (ehdr.e_phnum + 2)); + + /* Copy all existing segments. */ + for (i = 0; i < ehdr.e_phnum; i++) + { + char *segment_img; + + phdr = phdrs + i; + + /* Read segment header. */ + grub_util_read_at (phdr, sizeof (Elf32_Phdr), (ehdr.e_phoff + + (i * ehdr.e_phentsize)), + in); + grub_util_info ("copying segment %d, type %d", i, phdr->p_type); + + /* Read segment data and write it to new file. */ + segment_img = xmalloc (phdr->p_filesz); + grub_util_read_at (segment_img, phdr->p_filesz, phdr->p_offset, in); + grub_util_write_image_at (segment_img, phdr->p_filesz, phdr->p_offset, out); + + free (segment_img); + } + + if (mods[0] != NULL) + { + /* Construct new segment header for modules. */ + phdr = phdrs + ehdr.e_phnum; + ehdr.e_phnum++; + + /* Fill in p_offset so the callees know where to write. */ + phdr->p_offset = ALIGN_UP (grub_util_get_fp_size (out), sizeof (long)); + + load_modules (phdr, dir, mods, out); + } + + if (chrp) + { + /* Construct new segment header for the CHRP note. */ + phdr = phdrs + ehdr.e_phnum; + ehdr.e_phnum++; + + /* Fill in p_offset so the callees know where to write. */ + phdr->p_offset = ALIGN_UP (grub_util_get_fp_size (out), sizeof (long)); + + load_note (phdr, dir, out); + } + + /* Don't bother preserving the section headers. */ + ehdr.e_shoff = 0; + ehdr.e_shnum = 0; + ehdr.e_shstrndx = 0; + + /* Append entire segment table to the file. */ + phdroff = ALIGN_UP (grub_util_get_fp_size (out), sizeof (long)); + grub_util_write_image_at (phdrs, ehdr.e_phentsize * ehdr.e_phnum, phdroff, + out); + + /* Write ELF header. */ + ehdr.e_phoff = phdroff; + grub_util_write_image_at (&ehdr, sizeof (ehdr), 0, out); + + free (phdrs); +} + +static struct option options[] = + { + {"directory", required_argument, 0, 'd'}, + {"output", required_argument, 0, 'o'}, + {"help", no_argument, 0, 'h'}, + {"note", no_argument, 0, 'n'}, + {"version", no_argument, 0, 'V'}, + {"verbose", no_argument, 0, 'v'}, + { 0, 0, 0, 0 }, + }; + +static void +usage (int status) +{ + if (status) + fprintf (stderr, "Try ``grub-mkimage --help'' for more information.\n"); + else + printf ("\ +Usage: grub-mkimage -o FILE [OPTION]... [MODULES]\n\ +\n\ +Make a bootable image of GRUB.\n\ +\n\ +-d, --directory=DIR use images and modules under DIR [default=%s]\n\ +-o, --output=FILE output a generated image to FILE\n\ +-h, --help display this message and exit\n\ +-n, --note add NOTE segment for CHRP Open Firmware\n\ +-V, --version print version information and exit\n\ +-v, --verbose print verbose messages\n\ +\n\ +Report bugs to <%s>.\n\ +", GRUB_DATADIR, PACKAGE_BUGREPORT); + + exit (status); +} + +int +main (int argc, char *argv[]) +{ + FILE *fp; + char *output = NULL; + char *dir = NULL; + int chrp = 0; + + progname = "grub-mkimage"; + + while (1) + { + int c = getopt_long (argc, argv, "d:o:hVvn", options, 0); + if (c == -1) + break; + + switch (c) + { + case 'd': + if (dir) + free (dir); + dir = xstrdup (optarg); + break; + case 'h': + usage (0); + break; + case 'n': + chrp = 1; + break; + case 'o': + if (output) + free (output); + output = xstrdup (optarg); + break; + case 'V': + printf ("grub-mkimage (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION); + return 0; + case 'v': + verbosity++; + break; + default: + usage (1); + break; + } + } + + if (!output) + usage (1); + + fp = fopen (output, "wb"); + if (! fp) + grub_util_error ("cannot open %s", output); + + add_segments (dir ? : GRUB_DATADIR, fp, chrp, argv + optind); + + fclose (fp); + + return 0; +}