list.h handler.h command.h i18n.h env_private.h libgcc.h
ifneq ($(platform), emu)
-kernel_img_HEADERS += machine/memory.h machine/loader.h machine/kernel.h
+kernel_img_HEADERS += machine/memory.h machine/loader.h
endif
symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
term/i386/pc/console.c term/i386/vga_common.c \
symlist.c
kernel_img_HEADERS += machine/biosdisk.h machine/vga.h machine/vbe.h \
- machine/pxe.h i386/pit.h
+ machine/pxe.h i386/pit.h machine/kernel.h
kernel_img_CFLAGS = $(COMMON_CFLAGS) $(TARGET_IMG_CFLAGS)
kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
kernel_img_LDFLAGS += $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x8200 $(COMMON_CFLAGS)
+++ /dev/null
-/*
- * GRUB -- GRand Unified Bootloader
- * Copyright (C) 2005,2006,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 GRUB_KERNEL_MACHINE_HEADER
-#define GRUB_KERNEL_MACHINE_HEADER 1
-
-#include <grub/symbol.h>
-
-#ifndef ASM_FILE
-extern char grub_prefix[];
-#endif
-
-#endif /* ! GRUB_KERNEL_MACHINE_HEADER */
+++ /dev/null
-/*
- * 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 GRUB_MACHINE_KERNEL_HEADER
-#define GRUB_MACHINE_KERNEL_HEADER 1
-
-/* The prefix which points to the directory where GRUB modules and its
- configuration file are located. */
-extern char grub_prefix[];
-
-#endif /* ! GRUB_MACHINE_KERNEL_HEADER */
-
+++ /dev/null
-#include <grub/powerpc/ieee1275/kernel.h>
+++ /dev/null
-/*
- * GRUB -- GRand Unified Bootloader
- * Copyright (C) 2005,2006,2007,2008,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/>.
- */
-
-#ifndef GRUB_KERNEL_CPU_HEADER
-#define GRUB_KERNEL_CPU_HEADER 1
-
-#endif
/* 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_uint8_t EXPORT_VAR(grub_boot_drive);
/* The total size of module images following the kernel. */
extern grub_int32_t grub_total_module_size;
-/* The prefix which points to the directory where GRUB modules and its
- configuration file are located. */
-extern char grub_prefix[];
-
#endif /* ! ASM_FILE */
#endif /* ! GRUB_KERNEL_MACHINE_HEADER */
/* Register all the exported symbols. This is automatically generated. */
void grub_register_exported_symbols (void);
+#if ! defined (ASM_FILE) && !defined (GRUB_MACHINE_EMU)
+extern char grub_prefix[];
+#endif
+
#endif /* ! GRUB_KERNEL_HEADER */
+++ /dev/null
-/*
- * GRUB -- GRand Unified Bootloader
- * Copyright (C) 2005,2006,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 GRUB_KERNEL_CPU_HEADER
-#define GRUB_KERNEL_CPU_HEADER 1
-
-#define GRUB_MOD_ALIGN 0x1
-/* Non-zero value is only needed for PowerMacs. */
-#define GRUB_MOD_GAP 0x0
-
-#ifndef ASM_FILE
-
-/* The prefix which points to the directory where GRUB modules and its
- configuration file are located. */
-extern char grub_prefix[];
-
-#endif
-
-#endif
void EXPORT_FUNC (grub_reboot) (void);
void EXPORT_FUNC (grub_halt) (void);
-/* The prefix which points to the directory where GRUB modules and its
- configuration file are located. */
-extern char grub_prefix[];
-
#endif
#endif /* ! GRUB_KERNEL_MACHINE_HEADER */
#define GRUB_KERNEL_MACHINE_HEADER 1
#include <grub/symbol.h>
-#include <grub/cpu/kernel.h>
#ifndef ASM_FILE
#define GRUB_KERNEL_POWERPC_IEEE1275_MOD_ALIGN 0x1000
+#define GRUB_KERNEL_MIPS_YEELOONG_MOD_ALIGN 0x1
+
/* Minimal gap between _end and the start of the modules. It's a hack
for PowerMac to prevent "CLAIM failed" error. The real fix is to
rewrite grub-mkimage to generate valid ELF files. */
+++ /dev/null
-/*
- * GRUB -- GRand Unified Bootloader
- * Copyright (C) 2005,2006,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 GRUB_KERNEL_MACHINE_HEADER
-#define GRUB_KERNEL_MACHINE_HEADER 1
-
-#include <grub/symbol.h>
-#include <grub/offsets.h>
-
-#define GRUB_KERNEL_MACHINE_LINK_ADDR 0x200000
-
-#ifndef ASM_FILE
-
-/* The prefix which points to the directory where GRUB modules and its
- configuration file are located. */
-extern char grub_prefix[];
-
-#endif
-
-#endif /* ! GRUB_KERNEL_MACHINE_HEADER */
#ifndef GRUB_KERNEL_MACHINE_HEADER
#define GRUB_KERNEL_MACHINE_HEADER 1
-#define GRUB_MOD_ALIGN 0x2000
-
-/* Non-zero value is only needed for PowerMacs. */
-#define GRUB_MOD_GAP 0x0
-
#define GRUB_KERNEL_MACHINE_STACK_SIZE 0x40000
#ifndef ASM_FILE
/* The total size of module images following the kernel. */
extern grub_int32_t grub_total_module_size;
-/* The prefix which points to the directory where GRUB modules and its
- configuration file are located. */
-extern char grub_prefix[];
-
#endif /* ! ASM_FILE */
#endif /* ! GRUB_KERNEL_MACHINE_HEADER */
+++ /dev/null
-/*
- * GRUB -- GRand Unified Bootloader
- * Copyright (C) 2005,2006,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 GRUB_KERNEL_CPU_HEADER
-#define GRUB_KERNEL_CPU_HEADER 1
-
-#define GRUB_MOD_ALIGN 0x2000
-
-/* Non-zero value is only needed for PowerMacs. */
-#define GRUB_MOD_GAP 0x0
-
-#define GRUB_KERNEL_CPU_PREFIX 0x2
-#define GRUB_KERNEL_CPU_DATA_END 0x42
-
-#endif
# define grub_be_to_cpu16(x) ((grub_uint16_t) (x))
# define grub_be_to_cpu32(x) ((grub_uint32_t) (x))
# define grub_be_to_cpu64(x) ((grub_uint64_t) (x))
-# ifdef GRUB_TARGET_WORDS_BIGENDIAN
-# define grub_target_to_host16(x) ((grub_uint16_t) (x))
-# define grub_target_to_host32(x) ((grub_uint32_t) (x))
-# define grub_target_to_host64(x) ((grub_uint64_t) (x))
-# define grub_host_to_target16(x) ((grub_uint16_t) (x))
-# define grub_host_to_target32(x) ((grub_uint32_t) (x))
-# define grub_host_to_target64(x) ((grub_uint64_t) (x))
-# else /* ! GRUB_TARGET_WORDS_BIGENDIAN */
-# define grub_target_to_host16(x) grub_swap_bytes16(x)
-# define grub_target_to_host32(x) grub_swap_bytes32(x)
-# define grub_target_to_host64(x) grub_swap_bytes64(x)
-# define grub_host_to_target16(x) grub_swap_bytes16(x)
-# define grub_host_to_target32(x) grub_swap_bytes32(x)
-# define grub_host_to_target64(x) grub_swap_bytes64(x)
-# endif
#else /* ! WORDS_BIGENDIAN */
# define grub_cpu_to_le16(x) ((grub_uint16_t) (x))
# define grub_cpu_to_le32(x) ((grub_uint32_t) (x))
# define grub_be_to_cpu16(x) grub_swap_bytes16(x)
# define grub_be_to_cpu32(x) grub_swap_bytes32(x)
# define grub_be_to_cpu64(x) grub_swap_bytes64(x)
-# ifdef GRUB_TARGET_WORDS_BIGENDIAN
-# define grub_target_to_host16(x) grub_swap_bytes16(x)
-# define grub_target_to_host32(x) grub_swap_bytes32(x)
-# define grub_target_to_host64(x) grub_swap_bytes64(x)
-# define grub_host_to_target16(x) grub_swap_bytes16(x)
-# define grub_host_to_target32(x) grub_swap_bytes32(x)
-# define grub_host_to_target64(x) grub_swap_bytes64(x)
-# else /* ! GRUB_TARGET_WORDS_BIGENDIAN */
-# define grub_target_to_host16(x) ((grub_uint16_t) (x))
-# define grub_target_to_host32(x) ((grub_uint32_t) (x))
-# define grub_target_to_host64(x) ((grub_uint64_t) (x))
-# define grub_host_to_target16(x) ((grub_uint16_t) (x))
-# define grub_host_to_target32(x) ((grub_uint32_t) (x))
-# define grub_host_to_target64(x) ((grub_uint64_t) (x))
-# endif
#endif /* ! WORDS_BIGENDIAN */
-#if GRUB_TARGET_SIZEOF_VOID_P == 8
-# define grub_host_to_target_addr(x) grub_host_to_target64(x)
-#else
-# define grub_host_to_target_addr(x) grub_host_to_target32(x)
-#endif
-
#endif /* ! GRUB_TYPES_HEADER */
+++ /dev/null
-/*
- * 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 GRUB_MACHINE_KERNEL_HEADER
-#define GRUB_MACHINE_KERNEL_HEADER 1
-
-/* The prefix which points to the directory where GRUB modules and its
- configuration file are located. */
-extern char grub_prefix[];
-
-#endif /* ! GRUB_MACHINE_KERNEL_HEADER */
-
+++ /dev/null
-#include <grub/i386/kernel.h>
#include <grub/misc.h>
#include <grub/env.h>
#include <grub/mm.h>
-#include <grub/machine/kernel.h>
void
grub_efi_init (void)
#include <grub/machine/init.h>
#include <grub/machine/memory.h>
#include <grub/machine/console.h>
-#include <grub/machine/kernel.h>
#include <grub/types.h>
#include <grub/err.h>
#include <grub/dl.h>
#include <grub/time.h>
#include <grub/symbol.h>
#include <grub/cpu/io.h>
-#include <grub/cpu/kernel.h>
#include <grub/cpu/tsc.h>
+#ifdef GRUB_MACHINE_QEMU
+#include <grub/machine/kernel.h>
+#endif
#define GRUB_FLOPPY_REG_DIGITAL_OUTPUT 0x3f2
#include <grub/symbol.h>
#include <grub/machine/memory.h>
#include <grub/cpu/linux.h>
-#include <grub/cpu/kernel.h>
+#include <grub/offsets.h>
#include <multiboot.h>
#include <multiboot2.h>
#include <grub/symbol.h>
#include <grub/machine/memory.h>
#include <grub/cpu/linux.h>
-#include <grub/cpu/kernel.h>
#include <multiboot.h>
#include <multiboot2.h>
#include <grub/kernel.h>
#include <grub/misc.h>
#include <grub/types.h>
-#include <grub/machine/kernel.h>
#include <grub/ieee1275/ieee1275.h>
int (*grub_ieee1275_entry_fn) (void *);
#include <grub/misc.h>
#include <grub/time.h>
#include <grub/machine/console.h>
-#include <grub/machine/kernel.h>
-#include <grub/cpu/kernel.h>
#include <grub/ieee1275/ofdisk.h>
#include <grub/ieee1275/ieee1275.h>
+#include <grub/offsets.h>
/* The minimal heap size we can live with. */
#define HEAP_MIN_SIZE (unsigned long) (2 * 1024 * 1024)
#include <grub/err.h>
#include <grub/misc.h>
#include <grub/mm.h>
-#include <grub/machine/kernel.h>
#include <grub/ieee1275/ieee1275.h>
enum grub_ieee1275_parse_type
#include <grub/kernel.h>
#include <grub/env.h>
-#include <grub/mips/kernel.h>
void
grub_machine_set_prefix (void)
#include <grub/symbol.h>
#include <grub/offsets.h>
#include <grub/machine/memory.h>
-#include <grub/machine/kernel.h>
+#include <grub/offsets.h>
#define BASE_ADDR 8
lui $t1, %hi(_end)
addiu $t1, %lo(_end)
- addiu $t1, (GRUB_MOD_ALIGN-1)
- li $t3, (GRUB_MOD_ALIGN-1)
+ addiu $t1, (GRUB_KERNEL_MACHINE_MOD_ALIGN-1)
+ li $t3, (GRUB_KERNEL_MACHINE_MOD_ALIGN-1)
nor $t3, $t3, $0
and $t1, $t1, $t3
#include <grub/time.h>
#include <grub/machine/kernel.h>
#include <grub/machine/memory.h>
-#include <grub/cpu/kernel.h>
extern void grub_video_sm712_init (void);
extern void grub_video_init (void);
*/
#include <grub/symbol.h>
-#include <grub/machine/kernel.h>
+#include <grub/offsets.h>
.extern __bss_start
.extern _end
+++ /dev/null
-/*
- * GRUB -- GRand Unified Bootloader
- * Copyright (C) 2004,2005,2006,2007,2008,2009,2010 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 <config.h>
-
-#include <stdio.h>
-#include <stdint.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <getopt.h>
-#include <stdlib.h>
-#include <string.h>
-#include <grub/elf.h>
-#include <grub/misc.h>
-#include <grub/util/misc.h>
-#include <grub/util/resolve.h>
-#include <grub/kernel.h>
-#include <grub/cpu/kernel.h>
-#include <grub/machine/kernel.h>
-#include <grub/i18n.h>
-
-#include "progname.h"
-
-#define GRUB_IEEE1275_NOTE_NAME "PowerPC"
-#define GRUB_IEEE1275_NOTE_TYPE 0x1275
-
-/* These structures are defined according to the CHRP binding to IEEE1275,
- "Client Program Format" section. */
-
-struct grub_ieee1275_note_hdr
-{
- grub_uint32_t namesz;
- grub_uint32_t descsz;
- grub_uint32_t type;
- char name[sizeof (GRUB_IEEE1275_NOTE_NAME)];
-};
-
-struct grub_ieee1275_note_desc
-{
- grub_uint32_t real_mode;
- grub_uint32_t real_base;
- grub_uint32_t real_size;
- grub_uint32_t virt_base;
- grub_uint32_t virt_size;
- grub_uint32_t load_base;
-};
-
-struct grub_ieee1275_note
-{
- struct grub_ieee1275_note_hdr header;
- struct grub_ieee1275_note_desc descriptor;
-};
-
-void
-load_note (Elf32_Phdr *phdr, FILE *out)
-{
- struct grub_ieee1275_note note;
- int note_size = sizeof (struct grub_ieee1275_note);
-
- grub_util_info ("adding CHRP NOTE segment");
-
- note.header.namesz = grub_host_to_target32 (sizeof (GRUB_IEEE1275_NOTE_NAME));
- note.header.descsz = grub_host_to_target32 (note_size);
- note.header.type = grub_host_to_target32 (GRUB_IEEE1275_NOTE_TYPE);
- strcpy (note.header.name, GRUB_IEEE1275_NOTE_NAME);
- note.descriptor.real_mode = grub_host_to_target32 (0xffffffff);
- note.descriptor.real_base = grub_host_to_target32 (0x00c00000);
- note.descriptor.real_size = grub_host_to_target32 (0xffffffff);
- note.descriptor.virt_base = grub_host_to_target32 (0xffffffff);
- note.descriptor.virt_size = grub_host_to_target32 (0xffffffff);
- note.descriptor.load_base = grub_host_to_target32 (0x00004000);
-
- /* Write the note data to the new segment. */
- grub_util_write_image_at (¬e, note_size,
- grub_target_to_host32 (phdr->p_offset), out);
-
- /* Fill in the rest of the segment header. */
- phdr->p_type = grub_host_to_target32 (PT_NOTE);
- phdr->p_flags = grub_host_to_target32 (PF_R);
- phdr->p_align = grub_host_to_target32 (GRUB_TARGET_SIZEOF_LONG);
- phdr->p_vaddr = 0;
- phdr->p_paddr = 0;
- phdr->p_filesz = grub_host_to_target32 (note_size);
- phdr->p_memsz = 0;
-}
-
-void
-load_modules (grub_addr_t modbase, Elf32_Phdr *phdr, const char *dir,
- char *mods[], FILE *out, char *memdisk_path, char *config_path)
-{
- 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;
- size_t memdisk_size = 0;
- size_t config_size = 0;
-
- path_list = grub_util_resolve_dependencies (dir, "moddep.lst", mods);
-
- offset = sizeof (struct grub_module_info);
- total_module_size = sizeof (struct grub_module_info);
-
- if (memdisk_path)
- {
- memdisk_size = ALIGN_UP(grub_util_get_image_size (memdisk_path), 512);
- grub_util_info ("the size of memory disk is 0x%x", memdisk_size);
- total_module_size += memdisk_size + sizeof (struct grub_module_header);
- }
-
- if (config_path)
- {
- config_size = ALIGN_UP(grub_util_get_image_size (config_path), 512);
- grub_util_info ("the size of memory disk is 0x%x", config_size);
- total_module_size += config_size + sizeof (struct grub_module_header);
- }
-
- 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_host_to_target32 (GRUB_MODULE_MAGIC);
- modinfo->offset = grub_host_to_target32 (sizeof (struct grub_module_info));
- modinfo->size = grub_host_to_target32 (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->type = OBJ_TYPE_ELF;
- header->size = grub_host_to_target32 (mod_size + sizeof (*header));
-
- grub_util_load_image (p->name, module_img + offset + sizeof (*header));
-
- offset += sizeof (*header) + mod_size;
- }
-
- if (memdisk_path)
- {
- struct grub_module_header *header;
-
- header = (struct grub_module_header *) (module_img + offset);
- header->type = OBJ_TYPE_MEMDISK;
- header->size = grub_host_to_target32 (memdisk_size + sizeof (*header));
- offset += sizeof (*header);
-
- grub_util_load_image (memdisk_path, module_img + offset);
- offset += memdisk_size;
- }
-
- if (config_path)
- {
- struct grub_module_header *header;
-
- header = (struct grub_module_header *) (module_img + offset);
- header->type = OBJ_TYPE_CONFIG;
- header->size = grub_host_to_target32 (config_size + sizeof (*header));
- offset += sizeof (*header);
-
- grub_util_load_image (config_path, module_img + offset);
- offset += config_size;
- }
-
-
- /* Write the module data to the new segment. */
- grub_util_write_image_at (module_img, total_module_size,
- grub_host_to_target32 (phdr->p_offset), out);
-
- /* Fill in the rest of the segment header. */
- phdr->p_type = grub_host_to_target32 (PT_LOAD);
- phdr->p_flags = grub_host_to_target32 (PF_R | PF_W | PF_X);
- phdr->p_align = grub_host_to_target32 (GRUB_TARGET_SIZEOF_LONG);
- phdr->p_vaddr = grub_host_to_target32 (modbase);
- phdr->p_paddr = grub_host_to_target32 (modbase);
- phdr->p_filesz = grub_host_to_target32 (total_module_size);
- phdr->p_memsz = grub_host_to_target32 (total_module_size);
-}
-
-void
-add_segments (char *dir, char *prefix, FILE *out, int chrp, char *mods[], char *memdisk_path, char *config_path)
-{
- Elf32_Ehdr ehdr;
- Elf32_Phdr *phdrs = NULL;
- Elf32_Phdr *phdr;
- FILE *in;
- char *kernel_path;
- grub_addr_t grub_end = 0;
- off_t offset, first_segment;
- int i, phdr_size;
-
- /* Read ELF header. */
- kernel_path = grub_util_get_path (dir, "kernel.img");
- in = fopen (kernel_path, "rb");
- if (! in)
- grub_util_error ("cannot open %s", kernel_path);
-
- grub_util_read_at (&ehdr, sizeof (ehdr), 0, in);
-
- offset = ALIGN_UP (sizeof (ehdr), GRUB_TARGET_SIZEOF_LONG);
- ehdr.e_phoff = grub_host_to_target32 (offset);
-
- phdr_size = (grub_target_to_host16 (ehdr.e_phentsize) *
- grub_target_to_host16 (ehdr.e_phnum));
-
- if (mods[0] != NULL)
- phdr_size += grub_target_to_host16 (ehdr.e_phentsize);
-
- if (chrp)
- phdr_size += grub_target_to_host16 (ehdr.e_phentsize);
-
- phdrs = xmalloc (phdr_size);
- offset += ALIGN_UP (phdr_size, GRUB_TARGET_SIZEOF_LONG);
-
- first_segment = offset;
-
- /* Copy all existing segments. */
- for (i = 0; i < grub_target_to_host16 (ehdr.e_phnum); i++)
- {
- char *segment_img;
- grub_size_t segment_end;
-
- phdr = phdrs + i;
-
- /* Read segment header. */
- grub_util_read_at (phdr, sizeof (Elf32_Phdr),
- (grub_target_to_host32 (ehdr.e_phoff)
- + (i * grub_target_to_host16 (ehdr.e_phentsize))),
- in);
- grub_util_info ("copying segment %d, type %d", i,
- grub_target_to_host32 (phdr->p_type));
-
- /* Locate _end. */
- segment_end = grub_target_to_host32 (phdr->p_paddr)
- + grub_target_to_host32 (phdr->p_memsz);
- grub_util_info ("segment %u end 0x%lx", i, segment_end);
- if (segment_end > grub_end)
- grub_end = segment_end;
-
- /* Read segment data and write it to new file. */
- segment_img = xmalloc (grub_target_to_host32 (phdr->p_filesz));
-
- grub_util_read_at (segment_img, grub_target_to_host32 (phdr->p_filesz),
- grub_target_to_host32 (phdr->p_offset), in);
-
- phdr->p_offset = grub_host_to_target32 (offset);
- grub_util_write_image_at (segment_img, grub_target_to_host32 (phdr->p_filesz),
- offset, out);
- offset += ALIGN_UP (grub_target_to_host32 (phdr->p_filesz),
- GRUB_TARGET_SIZEOF_LONG);
-
- free (segment_img);
- }
-
- if (mods[0] != NULL)
- {
- grub_addr_t modbase;
-
- /* Place modules just after grub segment. */
- modbase = ALIGN_UP(grub_end + GRUB_MOD_GAP, GRUB_MOD_ALIGN);
-
- /* Construct new segment header for modules. */
- phdr = phdrs + grub_target_to_host16 (ehdr.e_phnum);
- ehdr.e_phnum = grub_host_to_target16 (grub_target_to_host16 (ehdr.e_phnum) + 1);
-
- /* Fill in p_offset so the callees know where to write. */
- phdr->p_offset = grub_host_to_target32 (ALIGN_UP (grub_util_get_fp_size (out),
- GRUB_TARGET_SIZEOF_LONG));
-
- load_modules (modbase, phdr, dir, mods, out, memdisk_path, config_path);
- }
-
- if (chrp)
- {
- /* Construct new segment header for the CHRP note. */
- phdr = phdrs + grub_target_to_host16 (ehdr.e_phnum);
- ehdr.e_phnum = grub_host_to_target16 (grub_target_to_host16 (ehdr.e_phnum) + 1);
-
- /* Fill in p_offset so the callees know where to write. */
- phdr->p_offset = grub_host_to_target32 (ALIGN_UP (grub_util_get_fp_size (out),
- GRUB_TARGET_SIZEOF_LONG));
-
- load_note (phdr, out);
- }
-
- /* Don't bother preserving the section headers. */
- ehdr.e_shoff = 0;
- ehdr.e_shnum = 0;
- ehdr.e_shstrndx = 0;
-
- /* Write entire segment table to the file. */
- grub_util_write_image_at (phdrs, phdr_size, grub_target_to_host32 (ehdr.e_phoff), out);
-
- /* Write ELF header. */
- grub_util_write_image_at (&ehdr, sizeof (ehdr), 0, out);
-
- if (prefix)
- {
- if (GRUB_KERNEL_MACHINE_PREFIX + strlen (prefix) + 1 > GRUB_KERNEL_MACHINE_DATA_END)
- grub_util_error ("prefix too long");
- grub_util_write_image_at (prefix, strlen (prefix) + 1, first_segment + GRUB_KERNEL_MACHINE_PREFIX, out);
- }
-
- free (phdrs);
- free (kernel_path);
-}
-
-static struct option options[] =
- {
- {"directory", required_argument, 0, 'd'},
- {"prefix", required_argument, 0, 'p'},
- {"memdisk", required_argument, 0, 'm'},
- {"config", required_argument, 0, 'c'},
- {"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 `%s --help' for more information.\n", program_name);
- else
- printf ("\
-Usage: %s -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\
- -p, --prefix=DIR set grub_prefix directory\n\
- -m, --memdisk=FILE embed FILE as a memdisk image\n\
- -c, --config=FILE embed FILE as boot config\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\
-", program_name, GRUB_LIBDIR, PACKAGE_BUGREPORT);
-
- exit (status);
-}
-
-int
-main (int argc, char *argv[])
-{
- FILE *fp;
- char *output = NULL;
- char *dir = NULL;
- char *prefix = NULL;
- char *memdisk = NULL;
- char *config = NULL;
- int chrp = 0;
-
- set_program_name (argv[0]);
-
- grub_util_init_nls ();
-
- while (1)
- {
- int c = getopt_long (argc, argv, "d:p:m:c:o:hVvn", options, 0);
- if (c == -1)
- break;
-
- switch (c)
- {
- case 'd':
- if (dir)
- free (dir);
- dir = xstrdup (optarg);
- break;
- case 'p':
- if (prefix)
- free (prefix);
- prefix = xstrdup (optarg);
- break;
- case 'm':
- if (memdisk)
- free (memdisk);
- memdisk = xstrdup (optarg);
-
- if (prefix)
- free (prefix);
- prefix = xstrdup ("(memdisk)/boot/grub");
-
- break;
- case 'c':
- if (config)
- free (config);
- config = 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_LIBDIR, prefix, fp, chrp, argv + optind, memdisk,
- config);
-
- fclose (fp);
-
- return 0;
-}
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
+#undef ELF_R_SYM
+#undef ELF_R_TYPE
+
#if defined(MKIMAGE_ELF32)
# define SUFFIX(x) x ## 32
# define ELFCLASSXX ELFCLASS32
#define DEFAULT_BOOT_FILE "boot.img"
#define DEFAULT_CORE_FILE "core.img"
+#define grub_target_to_host16(x) grub_le_to_cpu16(x)
+#define grub_target_to_host32(x) grub_le_to_cpu32(x)
+#define grub_target_to_host64(x) grub_le_to_cpu64(x)
+#define grub_host_to_target16(x) grub_cpu_to_le16(x)
+#define grub_host_to_target32(x) grub_cpu_to_le32(x)
+#define grub_host_to_target64(x) grub_cpu_to_le64(x)
+
void
grub_putchar (int c)
{
#define DEFAULT_BOOT_FILE "boot.img"
#define DEFAULT_CORE_FILE "core.img"
+#define grub_target_to_host16(x) grub_be_to_cpu16(x)
+#define grub_target_to_host32(x) grub_be_to_cpu32(x)
+#define grub_target_to_host64(x) grub_be_to_cpu64(x)
+#define grub_host_to_target16(x) grub_cpu_to_be16(x)
+#define grub_host_to_target32(x) grub_cpu_to_be32(x)
+#define grub_host_to_target64(x) grub_cpu_to_be64(x)
+
/* This is the blocklist used in the diskboot image. */
struct boot_blocklist
{
projects / thirdparty / grub.git / commitdiff
