]> git.proxmox.com Git - grub2.git/commitdiff
merge mainline into newreloc
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sat, 1 May 2010 13:10:44 +0000 (15:10 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sat, 1 May 2010 13:10:44 +0000 (15:10 +0200)
14 files changed:
1  2 
boot/i386/qemu/boot.S
conf/i386-coreboot.rmk
conf/tests.rmk
configure.ac
include/grub/efi/efi.h
include/grub/multiboot.h
kern/efi/mm.c
kern/i386/coreboot/init.c
kern/i386/coreboot/startup.S
loader/multiboot.c
loader/multiboot_mbi2.c
util/grub-mkimage.c
util/grub-mkrescue.in
util/sparc64/ieee1275/grub-setup.c

Simple merge
Simple merge
diff --cc conf/tests.rmk
Simple merge
diff --cc configure.ac
Simple merge
index a56b3f56b6fe33019557bd0dac3888736f3d2060,5852a476f033808a55e99657299bdf4695b9b79a..e9c57dd11d4279200eafa4354e154375642a2e66
@@@ -53,10 -53,8 +53,10 @@@ void EXPORT_FUNC(grub_efi_print_device_
  char *EXPORT_FUNC(grub_efi_get_filename) (grub_efi_device_path_t *dp);
  grub_efi_device_path_t *
  EXPORT_FUNC(grub_efi_get_device_path) (grub_efi_handle_t handle);
- grub_err_t EXPORT_FUNC (grub_efi_finish_boot_services) (grub_size_t *outbuf_size, void *outbuf,
 -int EXPORT_FUNC(grub_efi_exit_boot_services) (grub_efi_uintn_t map_key);
 -int EXPORT_FUNC (grub_efi_finish_boot_services) (void);
++grub_err_t EXPORT_FUNC (grub_efi_finish_boot_services) (grub_efi_uintn_t *outbuf_size, void *outbuf,
 +                                                      grub_efi_uintn_t *map_key,
 +                                                      grub_efi_uintn_t *efi_desc_size,
 +                                                      grub_efi_uint32_t *efi_desc_version);
  grub_err_t EXPORT_FUNC (grub_efi_set_virtual_address_map) (grub_efi_uintn_t memory_map_size,
                                                           grub_efi_uintn_t descriptor_size,
                                                           grub_efi_uint32_t descriptor_version,
Simple merge
diff --cc kern/efi/mm.c
index 4db0e7e928ef754f7d5c1276c47fc148cccd7493,ceb8fc9baf2f90e9646f7eafa4afaabfd8708cba..fbb92a38dcf8b5e982d17c870c8fc20660d16087
@@@ -146,51 -140,6 +146,51 @@@ grub_efi_free_pages (grub_efi_physical_
    efi_call_2 (b->free_pages, address, pages);
  }
  
- grub_efi_finish_boot_services (grub_size_t *outbuf_size, void *outbuf,
 +grub_err_t
++grub_efi_finish_boot_services (grub_efi_uintn_t *outbuf_size, void *outbuf,
 +                             grub_efi_uintn_t *map_key,
 +                             grub_efi_uintn_t *efi_desc_size,
 +                             grub_efi_uint32_t *efi_desc_version)
 +{
 +  grub_efi_boot_services_t *b;
 +  grub_efi_status_t status;
 +
 +  if (grub_efi_get_memory_map (&finish_mmap_size, finish_mmap_buf, &finish_key,
 +                             &finish_desc_size, &finish_desc_version) < 0)
 +    return grub_error (GRUB_ERR_IO, "couldn't retrieve memory map");
 +
 +  if (outbuf && *outbuf_size < finish_mmap_size)
 +    return grub_error (GRUB_ERR_IO, "memory map buffer is too small");
 +
 +  finish_mmap_buf = grub_malloc (finish_mmap_size);
 +  if (!finish_mmap_buf)
 +    return grub_errno;
 +
 +  if (grub_efi_get_memory_map (&finish_mmap_size, finish_mmap_buf, &finish_key,
 +                             &finish_desc_size, &finish_desc_version) <= 0)
 +    return grub_error (GRUB_ERR_IO, "couldn't retrieve memory map");
 +
 +  b = grub_efi_system_table->boot_services;
 +  status = efi_call_2 (b->exit_boot_services, grub_efi_image_handle,
 +                     finish_key);
 +  if (status != GRUB_EFI_SUCCESS)
 +    return grub_error (GRUB_ERR_IO, "couldn't terminate EFI services");
 +
 +  grub_efi_is_finished = 1;
 +  if (outbuf_size)
 +    *outbuf_size = finish_mmap_size;
 +  if (outbuf)
 +    grub_memcpy (outbuf, finish_mmap_buf, finish_mmap_size);
 +  if (map_key)
 +    *map_key = finish_key;
 +  if (efi_desc_size)
 +    *efi_desc_size = finish_desc_size;
 +  if (efi_desc_version)
 +    *efi_desc_version = finish_desc_version;
 +
 +  return GRUB_ERR_NONE;
 +}
 +
  /* Get the memory map as defined in the EFI spec. Return 1 if successful,
     return 0 if partial, or return -1 if an error occurs.  */
  int
Simple merge
Simple merge
index 6c6afcee9a5ad8ce10827e2121d45ee5f2c37462,592289c456f342d9cde15df97f32d206658dea93..878f42dac320b1d60e524ee3cb91456e071e0482
@@@ -50,9 -50,7 +50,9 @@@
  #include <grub/efi/efi.h>
  #endif
  
- #if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
 +struct grub_relocator *grub_multiboot_relocator = NULL;
 +grub_uint32_t grub_multiboot_payload_eip;
+ #if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_MULTIBOOT) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
  #define DEFAULT_VIDEO_MODE "text"
  #else
  #define DEFAULT_VIDEO_MODE "auto"
Simple merge
index cc4a225d4e597d07062bdf0457106ce3bfb0a852,0000000000000000000000000000000000000000..dcf7fc17d670d2d3164e2f90b3541ed3351f20b0
mode 100644,000000..100644
--- /dev/null
@@@ -1,1340 -1,0 +1,1362 @@@
 +/* grub-mkimage.c - make a bootable image */
 +/*
 + *  GRUB  --  GRand Unified Bootloader
 + *  Copyright (C) 2002,2003,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 <grub/types.h>
 +#include <grub/elf.h>
 +#include <grub/aout.h>
 +#include <grub/i18n.h>
 +#include <grub/kernel.h>
 +#include <grub/disk.h>
 +#include <grub/util/misc.h>
 +#include <grub/util/resolve.h>
 +#include <grub/misc.h>
 +#include <grub/offsets.h>
 +#include <time.h>
 +
 +#include <stdio.h>
 +#include <unistd.h>
 +#include <string.h>
 +#include <stdlib.h>
 +#include <assert.h>
 +#include <grub/efi/pe32.h>
 +
 +#define _GNU_SOURCE   1
 +#include <getopt.h>
 +
 +#include "progname.h"
 +
 +#define ALIGN_ADDR(x) (ALIGN_UP((x), image_target->voidp_sizeof))
 +
 +#define TARGET_NO_FIELD 0xffffffff
 +struct image_target_desc
 +{
 +  const char *name;
 +  grub_size_t voidp_sizeof;
 +  int bigendian;
 +  enum {
 +    IMAGE_I386_PC, IMAGE_EFI, IMAGE_COREBOOT,
 +    IMAGE_SPARC64_AOUT, IMAGE_SPARC64_RAW, IMAGE_I386_IEEE1275,
 +    IMAGE_YEELOONG_ELF, IMAGE_QEMU, IMAGE_PPC
 +  } id;
 +  enum
 +    {
 +      PLATFORM_FLAGS_NONE = 0,
 +      PLATFORM_FLAGS_LZMA = 1
 +    } flags;
 +  unsigned prefix;
 +  unsigned data_end;
 +  unsigned raw_size;
 +  unsigned total_module_size;
 +  unsigned kernel_image_size;
 +  unsigned compressed_size;
 +  unsigned link_align;
 +  grub_uint16_t elf_target;
 +  unsigned section_align;
 +  signed vaddr_offset;
 +  unsigned install_dos_part, install_bsd_part;
 +  grub_uint64_t link_addr;
 +  unsigned mod_gap, mod_align;
 +};
 +
 +struct image_target_desc image_targets[] =
 +  {
 +    {
 +      .name = "i386-coreboot",
 +      .voidp_sizeof = 4,
 +      .bigendian = 0,
 +      .id = IMAGE_COREBOOT,
 +      .flags = PLATFORM_FLAGS_NONE,
 +      .prefix = GRUB_KERNEL_I386_COREBOOT_PREFIX,
 +      .data_end = GRUB_KERNEL_I386_COREBOOT_DATA_END,
 +      .raw_size = 0,
 +      .total_module_size = TARGET_NO_FIELD,
 +      .kernel_image_size = TARGET_NO_FIELD,
 +      .compressed_size = TARGET_NO_FIELD,
 +      .section_align = 1,
 +      .vaddr_offset = 0,
 +      .install_dos_part = TARGET_NO_FIELD,
 +      .install_bsd_part = TARGET_NO_FIELD,
 +      .link_addr = GRUB_KERNEL_I386_COREBOOT_LINK_ADDR,
 +      .elf_target = EM_386,
 +      .link_align = 4,
 +      .mod_gap = GRUB_KERNEL_I386_COREBOOT_MOD_GAP,
 +      .mod_align = GRUB_KERNEL_I386_COREBOOT_MOD_ALIGN
 +    },
++    {
++      .name = "i386-multiboot",
++      .voidp_sizeof = 4,
++      .bigendian = 0,
++      .id = IMAGE_COREBOOT,
++      .flags = PLATFORM_FLAGS_NONE,
++      .prefix = GRUB_KERNEL_I386_COREBOOT_PREFIX,
++      .data_end = GRUB_KERNEL_I386_COREBOOT_DATA_END,
++      .raw_size = 0,
++      .total_module_size = TARGET_NO_FIELD,
++      .kernel_image_size = TARGET_NO_FIELD,
++      .compressed_size = TARGET_NO_FIELD,
++      .section_align = 1,
++      .vaddr_offset = 0,
++      .install_dos_part = TARGET_NO_FIELD,
++      .install_bsd_part = TARGET_NO_FIELD,
++      .link_addr = GRUB_KERNEL_I386_COREBOOT_LINK_ADDR,
++      .elf_target = EM_386,
++      .link_align = 4,
++      .mod_gap = GRUB_KERNEL_I386_COREBOOT_MOD_GAP,
++      .mod_align = GRUB_KERNEL_I386_COREBOOT_MOD_ALIGN
++    },
 +    {
 +      .name = "i386-pc",
 +      .voidp_sizeof = 4,
 +      .bigendian = 0,
 +      .id = IMAGE_I386_PC, 
 +      .flags = PLATFORM_FLAGS_LZMA,
 +      .prefix = GRUB_KERNEL_I386_PC_PREFIX,
 +      .data_end = GRUB_KERNEL_I386_PC_DATA_END,
 +      .raw_size = GRUB_KERNEL_I386_PC_RAW_SIZE,
 +      .total_module_size = GRUB_KERNEL_I386_PC_TOTAL_MODULE_SIZE,
 +      .kernel_image_size = GRUB_KERNEL_I386_PC_KERNEL_IMAGE_SIZE,
 +      .compressed_size = GRUB_KERNEL_I386_PC_COMPRESSED_SIZE,
 +      .section_align = 1,
 +      .vaddr_offset = 0,
 +      .install_dos_part = GRUB_KERNEL_I386_PC_INSTALL_DOS_PART,
 +      .install_bsd_part = GRUB_KERNEL_I386_PC_INSTALL_BSD_PART,
 +      .link_addr = GRUB_KERNEL_I386_PC_LINK_ADDR
 +    },
 +    {
 +      .name = "i386-efi",
 +      .voidp_sizeof = 4,
 +      .bigendian = 0,
 +      .id = IMAGE_EFI,
 +      .flags = PLATFORM_FLAGS_NONE,
 +      .prefix = GRUB_KERNEL_I386_EFI_PREFIX,
 +      .data_end = GRUB_KERNEL_I386_EFI_DATA_END,
 +      .raw_size = 0,
 +      .total_module_size = TARGET_NO_FIELD,
 +      .kernel_image_size = TARGET_NO_FIELD,
 +      .compressed_size = TARGET_NO_FIELD,
 +      .section_align = GRUB_PE32_SECTION_ALIGNMENT,
 +      .vaddr_offset = ALIGN_UP (GRUB_PE32_MSDOS_STUB_SIZE
 +                              + GRUB_PE32_SIGNATURE_SIZE
 +                              + sizeof (struct grub_pe32_coff_header)
 +                              + sizeof (struct grub_pe32_optional_header)
 +                              + 4 * sizeof (struct grub_pe32_section_table),
 +                              GRUB_PE32_SECTION_ALIGNMENT),
 +      .install_dos_part = TARGET_NO_FIELD,
 +      .install_bsd_part = TARGET_NO_FIELD,
 +    },
 +    {
 +      .name = "i386-ieee1275",
 +      .voidp_sizeof = 4,
 +      .bigendian = 0,
 +      .id = IMAGE_I386_IEEE1275, 
 +      .flags = PLATFORM_FLAGS_NONE,
 +      .prefix = GRUB_KERNEL_I386_IEEE1275_PREFIX,
 +      .data_end = GRUB_KERNEL_I386_IEEE1275_DATA_END,
 +      .raw_size = 0,
 +      .total_module_size = TARGET_NO_FIELD,
 +      .kernel_image_size = TARGET_NO_FIELD,
 +      .compressed_size = TARGET_NO_FIELD,
 +      .section_align = 1,
 +      .vaddr_offset = 0,
 +      .install_dos_part = TARGET_NO_FIELD,
 +      .install_bsd_part = TARGET_NO_FIELD,
 +      .link_addr = GRUB_KERNEL_I386_IEEE1275_LINK_ADDR,
 +      .elf_target = EM_386,
 +      .mod_gap = GRUB_KERNEL_I386_IEEE1275_MOD_GAP,
 +      .mod_align = GRUB_KERNEL_I386_IEEE1275_MOD_ALIGN,
 +      .link_align = 4,
 +    },
 +    {
 +      .name = "i386-qemu",
 +      .voidp_sizeof = 4,
 +      .bigendian = 0,
 +      .id = IMAGE_QEMU, 
 +      .flags = PLATFORM_FLAGS_NONE,
 +      .prefix = GRUB_KERNEL_I386_QEMU_PREFIX,
 +      .data_end = GRUB_KERNEL_I386_QEMU_DATA_END,
 +      .raw_size = 0,
 +      .total_module_size = TARGET_NO_FIELD,
 +      .compressed_size = TARGET_NO_FIELD,
 +      .kernel_image_size = GRUB_KERNEL_I386_QEMU_KERNEL_IMAGE_SIZE,
 +      .section_align = 1,
 +      .vaddr_offset = 0,
 +      .install_dos_part = TARGET_NO_FIELD,
 +      .install_bsd_part = TARGET_NO_FIELD,
 +      .link_addr = GRUB_KERNEL_I386_QEMU_LINK_ADDR
 +    },
 +    {
 +      .name = "x86_64-efi",
 +      .voidp_sizeof = 8,
 +      .bigendian = 0, 
 +      .id = IMAGE_EFI, 
 +      .flags = PLATFORM_FLAGS_NONE,
 +      .prefix = GRUB_KERNEL_X86_64_EFI_PREFIX,
 +      .data_end = GRUB_KERNEL_X86_64_EFI_DATA_END,
 +      .raw_size = 0,
 +      .total_module_size = TARGET_NO_FIELD,
 +      .kernel_image_size = TARGET_NO_FIELD,
 +      .compressed_size = TARGET_NO_FIELD,
 +      .section_align = GRUB_PE32_SECTION_ALIGNMENT,
 +      .vaddr_offset = ALIGN_UP (GRUB_PE32_MSDOS_STUB_SIZE
 +                              + GRUB_PE32_SIGNATURE_SIZE
 +                              + sizeof (struct grub_pe32_coff_header)
 +                              + sizeof (struct grub_pe64_optional_header)
 +                              + 4 * sizeof (struct grub_pe32_section_table),
 +                              GRUB_PE32_SECTION_ALIGNMENT),
 +      .install_dos_part = TARGET_NO_FIELD,
 +      .install_bsd_part = TARGET_NO_FIELD,
 +    },
 +    {
 +      .name = "mipsel-yeeloong-elf",
 +      .voidp_sizeof = 4,
 +      .bigendian = 0,
 +      .id = IMAGE_YEELOONG_ELF, 
 +      .flags = PLATFORM_FLAGS_NONE,
 +      .prefix = GRUB_KERNEL_MIPS_YEELOONG_PREFIX,
 +      .data_end = GRUB_KERNEL_MIPS_YEELOONG_DATA_END,
 +      .raw_size = GRUB_KERNEL_MIPS_YEELOONG_RAW_SIZE,
 +      .total_module_size = GRUB_KERNEL_MIPS_YEELOONG_TOTAL_MODULE_SIZE,
 +      .compressed_size = GRUB_KERNEL_MIPS_YEELOONG_COMPRESSED_SIZE,
 +      .kernel_image_size = GRUB_KERNEL_MIPS_YEELOONG_KERNEL_IMAGE_SIZE,
 +      .section_align = 1,
 +      .vaddr_offset = 0,
 +      .install_dos_part = TARGET_NO_FIELD,
 +      .install_bsd_part = TARGET_NO_FIELD,
 +      .link_addr = GRUB_KERNEL_MIPS_YEELOONG_LINK_ADDR,
 +      .elf_target = EM_MIPS,
 +      .link_align = GRUB_KERNEL_MIPS_YEELOONG_LINK_ALIGN
 +    },
 +    {
 +      .name = "powerpc-ieee1275",
 +      .voidp_sizeof = 4,
 +      .bigendian = 1,
 +      .id = IMAGE_PPC, 
 +      .flags = PLATFORM_FLAGS_NONE,
 +      .prefix = GRUB_KERNEL_POWERPC_IEEE1275_PREFIX,
 +      .data_end = GRUB_KERNEL_POWERPC_IEEE1275_DATA_END,
 +      .raw_size = 0,
 +      .total_module_size = TARGET_NO_FIELD,
 +      .kernel_image_size = TARGET_NO_FIELD,
 +      .compressed_size = TARGET_NO_FIELD,
 +      .section_align = 1,
 +      .vaddr_offset = 0,
 +      .install_dos_part = TARGET_NO_FIELD,
 +      .install_bsd_part = TARGET_NO_FIELD,
 +      .link_addr = GRUB_KERNEL_POWERPC_IEEE1275_LINK_ADDR,
 +      .elf_target = EM_PPC,
 +      .mod_gap = GRUB_KERNEL_POWERPC_IEEE1275_MOD_GAP,
 +      .mod_align = GRUB_KERNEL_POWERPC_IEEE1275_MOD_ALIGN,
 +      .link_align = 4
 +    },
 +    {
 +      .name = "sparc64-ieee1275-raw",
 +      .voidp_sizeof = 8,
 +      .bigendian = 1, 
 +      .id = IMAGE_SPARC64_RAW,
 +      .flags = PLATFORM_FLAGS_NONE,
 +      .prefix = GRUB_KERNEL_SPARC64_IEEE1275_PREFIX,
 +      .data_end = GRUB_KERNEL_SPARC64_IEEE1275_DATA_END,
 +      .raw_size = GRUB_KERNEL_SPARC64_IEEE1275_RAW_SIZE,
 +      .total_module_size = GRUB_KERNEL_SPARC64_IEEE1275_TOTAL_MODULE_SIZE,
 +      .kernel_image_size = GRUB_KERNEL_SPARC64_IEEE1275_KERNEL_IMAGE_SIZE,
 +      .compressed_size = GRUB_KERNEL_SPARC64_IEEE1275_COMPRESSED_SIZE,
 +      .section_align = 1,
 +      .vaddr_offset = 0,
 +      .install_dos_part = TARGET_NO_FIELD,
 +      .install_bsd_part = TARGET_NO_FIELD,
 +      .link_addr = GRUB_KERNEL_SPARC64_IEEE1275_LINK_ADDR
 +    },
 +    {
 +      .name = "sparc64-ieee1275-aout",
 +      .voidp_sizeof = 8,
 +      .bigendian = 1,
 +      .id = IMAGE_SPARC64_AOUT,
 +      .flags = PLATFORM_FLAGS_NONE,
 +      .prefix = GRUB_KERNEL_SPARC64_IEEE1275_PREFIX,
 +      .data_end = GRUB_KERNEL_SPARC64_IEEE1275_DATA_END,
 +      .raw_size = GRUB_KERNEL_SPARC64_IEEE1275_RAW_SIZE,
 +      .total_module_size = GRUB_KERNEL_SPARC64_IEEE1275_TOTAL_MODULE_SIZE,
 +      .kernel_image_size = GRUB_KERNEL_SPARC64_IEEE1275_KERNEL_IMAGE_SIZE,
 +      .compressed_size = GRUB_KERNEL_SPARC64_IEEE1275_COMPRESSED_SIZE,
 +      .section_align = 1,
 +      .vaddr_offset = 0,
 +      .install_dos_part = TARGET_NO_FIELD,
 +      .install_bsd_part = TARGET_NO_FIELD,
 +      .link_addr = GRUB_KERNEL_SPARC64_IEEE1275_LINK_ADDR
 +    },
 +  };
 +
 +#define grub_target_to_host32(x) (grub_target_to_host32_real (image_target, (x)))
 +#define grub_host_to_target32(x) (grub_host_to_target32_real (image_target, (x)))
 +#define grub_target_to_host64(x) (grub_target_to_host64_real (image_target, (x)))
 +#define grub_host_to_target64(x) (grub_host_to_target64_real (image_target, (x)))
 +#define grub_host_to_target_addr(x) (grub_host_to_target_addr_real (image_target, (x)))
 +#define grub_target_to_host16(x) (grub_target_to_host16_real (image_target, (x)))
 +#define grub_host_to_target16(x) (grub_host_to_target16_real (image_target, (x)))
 +
 +static inline grub_uint32_t
 +grub_target_to_host32_real (struct image_target_desc *image_target, grub_uint32_t in)
 +{
 +  if (image_target->bigendian)
 +    return grub_be_to_cpu32 (in);
 +  else
 +    return grub_le_to_cpu32 (in);
 +}
 +
 +static inline grub_uint64_t
 +grub_target_to_host64_real (struct image_target_desc *image_target, grub_uint64_t in)
 +{
 +  if (image_target->bigendian)
 +    return grub_be_to_cpu64 (in);
 +  else
 +    return grub_le_to_cpu64 (in);
 +}
 +
 +static inline grub_uint64_t
 +grub_host_to_target64_real (struct image_target_desc *image_target, grub_uint64_t in)
 +{
 +  if (image_target->bigendian)
 +    return grub_cpu_to_be64 (in);
 +  else
 +    return grub_cpu_to_le64 (in);
 +}
 +
 +static inline grub_uint32_t
 +grub_host_to_target32_real (struct image_target_desc *image_target, grub_uint32_t in)
 +{
 +  if (image_target->bigendian)
 +    return grub_cpu_to_be32 (in);
 +  else
 +    return grub_cpu_to_le32 (in);
 +}
 +
 +static inline grub_uint16_t
 +grub_target_to_host16_real (struct image_target_desc *image_target, grub_uint16_t in)
 +{
 +  if (image_target->bigendian)
 +    return grub_be_to_cpu16 (in);
 +  else
 +    return grub_le_to_cpu16 (in);
 +}
 +
 +static inline grub_uint16_t
 +grub_host_to_target16_real (struct image_target_desc *image_target, grub_uint16_t in)
 +{
 +  if (image_target->bigendian)
 +    return grub_cpu_to_be16 (in);
 +  else
 +    return grub_cpu_to_le16 (in);
 +}
 +
 +static inline grub_uint64_t
 +grub_host_to_target_addr_real (struct image_target_desc *image_target, grub_uint64_t in)
 +{
 +  if (image_target->voidp_sizeof == 8)
 +    return grub_host_to_target64_real (image_target, in);
 +  else
 +    return grub_host_to_target32_real (image_target, in);
 +}
 +
 +static inline grub_uint64_t
 +grub_target_to_host_real (struct image_target_desc *image_target, grub_uint64_t in)
 +{
 +  if (image_target->voidp_sizeof == 8)
 +    return grub_target_to_host64_real (image_target, in);
 +  else
 +    return grub_target_to_host32_real (image_target, in);
 +}
 +
 +#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;
 +};
 +
 +#define grub_target_to_host(val) grub_target_to_host_real(image_target, (val))
 +
 +#include <grub/lib/LzmaEnc.h>
 +
 +static void *SzAlloc(void *p, size_t size) { p = p; return xmalloc(size); }
 +static void SzFree(void *p, void *address) { p = p; free(address); }
 +static ISzAlloc g_Alloc = { SzAlloc, SzFree };
 +
 +static void
 +compress_kernel_lzma (char *kernel_img, size_t kernel_size,
 +                    char **core_img, size_t *core_size, size_t raw_size)
 +{
 +  CLzmaEncProps props;
 +  unsigned char out_props[5];
 +  size_t out_props_size = 5;
 +
 +  LzmaEncProps_Init(&props);
 +  props.dictSize = 1 << 16;
 +  props.lc = 3;
 +  props.lp = 0;
 +  props.pb = 2;
 +  props.numThreads = 1;
 +
 +  if (kernel_size < raw_size)
 +    grub_util_error (_("the core image is too small"));
 +
 +  *core_img = xmalloc (kernel_size);
 +  memcpy (*core_img, kernel_img, raw_size);
 +
 +  *core_size = kernel_size - raw_size;
 +  if (LzmaEncode ((unsigned char *) *core_img + raw_size, core_size,
 +                (unsigned char *) kernel_img + raw_size,
 +                kernel_size - raw_size,
 +                &props, out_props, &out_props_size,
 +                0, NULL, &g_Alloc, &g_Alloc) != SZ_OK)
 +    grub_util_error (_("cannot compress the kernel image"));
 +
 +  *core_size += raw_size;
 +}
 +
 +static void
 +compress_kernel (struct image_target_desc *image_target, char *kernel_img,
 +               size_t kernel_size, char **core_img, size_t *core_size)
 +{
 + if (image_target->flags & PLATFORM_FLAGS_LZMA)
 +   {
 +     compress_kernel_lzma (kernel_img, kernel_size, core_img,
 +                         core_size, image_target->raw_size);
 +     return;
 +   }
 +
 +  *core_img = xmalloc (kernel_size);
 +  memcpy (*core_img, kernel_img, kernel_size);
 +  *core_size = kernel_size;
 +}
 +
 +struct fixup_block_list
 +{
 +  struct fixup_block_list *next;
 +  int state;
 +  struct grub_pe32_fixup_block b;
 +};
 +
 +#define MKIMAGE_ELF32 1
 +#include "grub-mkimagexx.c"
 +#undef MKIMAGE_ELF32
 +
 +#define MKIMAGE_ELF64 1
 +#include "grub-mkimagexx.c"
 +#undef MKIMAGE_ELF64
 +
 +static void
 +generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 +              char *memdisk_path, char *font_path, char *config_path,
 +              struct image_target_desc *image_target, int note)
 +{
 +  char *kernel_img, *core_img;
 +  size_t kernel_size, total_module_size, core_size, exec_size;
 +  size_t memdisk_size = 0, font_size = 0, config_size = 0, config_size_pure = 0;
 +  char *kernel_path;
 +  size_t offset;
 +  struct grub_util_path_list *path_list, *p, *next;
 +  grub_size_t bss_size;
 +  grub_uint64_t start_address;
 +  void *rel_section;
 +  grub_size_t reloc_size, align;
 +  path_list = grub_util_resolve_dependencies (dir, "moddep.lst", mods);
 +
 +  kernel_path = grub_util_get_path (dir, "kernel.img");
 +
 +  if (image_target->voidp_sizeof == 8)
 +    total_module_size = sizeof (struct grub_module_info64);
 +  else
 +    total_module_size = sizeof (struct grub_module_info32);
 +
 +  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 (font_path)
 +    {
 +      font_size = ALIGN_ADDR (grub_util_get_image_size (font_path));
 +      total_module_size += font_size + sizeof (struct grub_module_header);
 +    }
 +
 +  if (config_path)
 +    {
 +      config_size_pure = grub_util_get_image_size (config_path) + 1;
 +      config_size = ALIGN_ADDR (config_size_pure);
 +      grub_util_info ("the size of config file 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 += (ALIGN_ADDR (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);
 +
 +  if (image_target->voidp_sizeof == 4)
 +    kernel_img = load_image32 (kernel_path, &exec_size, &kernel_size, &bss_size,
 +                             total_module_size, &start_address, &rel_section,
 +                             &reloc_size, &align, image_target);
 +  else
 +    kernel_img = load_image64 (kernel_path, &exec_size, &kernel_size, &bss_size,
 +                             total_module_size, &start_address, &rel_section,
 +                             &reloc_size, &align, image_target);
 +
 +  if (image_target->prefix + strlen (prefix) + 1 > image_target->data_end)
 +    grub_util_error (_("prefix is too long"));
 +  strcpy (kernel_img + image_target->prefix, prefix);
 +
 +  if (image_target->voidp_sizeof == 8)
 +    {
 +      /* Fill in the grub_module_info structure.  */
 +      struct grub_module_info64 *modinfo;
 +      modinfo = (struct grub_module_info64 *) (kernel_img + kernel_size);
 +      memset (modinfo, 0, sizeof (struct grub_module_info64));
 +      modinfo->magic = grub_host_to_target32 (GRUB_MODULE_MAGIC);
 +      modinfo->offset = grub_host_to_target_addr (sizeof (struct grub_module_info64));
 +      modinfo->size = grub_host_to_target_addr (total_module_size);
 +      offset = kernel_size + sizeof (struct grub_module_info64);
 +    }
 +  else
 +    {
 +      /* Fill in the grub_module_info structure.  */
 +      struct grub_module_info32 *modinfo;
 +      modinfo = (struct grub_module_info32 *) (kernel_img + kernel_size);
 +      memset (modinfo, 0, sizeof (struct grub_module_info32));
 +      modinfo->magic = grub_host_to_target32 (GRUB_MODULE_MAGIC);
 +      modinfo->offset = grub_host_to_target_addr (sizeof (struct grub_module_info32));
 +      modinfo->size = grub_host_to_target_addr (total_module_size);
 +      offset = kernel_size + sizeof (struct grub_module_info32);
 +    }
 +
 +  for (p = path_list; p; p = p->next)
 +    {
 +      struct grub_module_header *header;
 +      size_t mod_size, orig_size;
 +
 +      orig_size = grub_util_get_image_size (p->name);
 +      mod_size = ALIGN_ADDR (orig_size);
 +
 +      header = (struct grub_module_header *) (kernel_img + offset);
 +      memset (header, 0, sizeof (struct grub_module_header));
 +      header->type = grub_host_to_target32 (OBJ_TYPE_ELF);
 +      header->size = grub_host_to_target32 (mod_size + sizeof (*header));
 +      offset += sizeof (*header);
 +      memset (kernel_img + offset + orig_size, 0, mod_size - orig_size);
 +
 +      grub_util_load_image (p->name, kernel_img + offset);
 +      offset += mod_size;
 +    }
 +
 +  if (memdisk_path)
 +    {
 +      struct grub_module_header *header;
 +
 +      header = (struct grub_module_header *) (kernel_img + offset);
 +      memset (header, 0, sizeof (struct grub_module_header));
 +      header->type = grub_host_to_target32 (OBJ_TYPE_MEMDISK);
 +      header->size = grub_host_to_target32 (memdisk_size + sizeof (*header));
 +      offset += sizeof (*header);
 +
 +      grub_util_load_image (memdisk_path, kernel_img + offset);
 +      offset += memdisk_size;
 +    }
 +
 +  if (font_path)
 +    {
 +      struct grub_module_header *header;
 +
 +      header = (struct grub_module_header *) (kernel_img + offset);
 +      memset (header, 0, sizeof (struct grub_module_header));
 +      header->type = grub_host_to_target32 (OBJ_TYPE_FONT);
 +      header->size = grub_host_to_target32 (font_size + sizeof (*header));
 +      offset += sizeof (*header);
 +
 +      grub_util_load_image (font_path, kernel_img + offset);
 +      offset += font_size;
 +    }
 +
 +  if (config_path)
 +    {
 +      struct grub_module_header *header;
 +
 +      header = (struct grub_module_header *) (kernel_img + offset);
 +      memset (header, 0, sizeof (struct grub_module_header));
 +      header->type = grub_host_to_target32 (OBJ_TYPE_CONFIG);
 +      header->size = grub_host_to_target32 (config_size + sizeof (*header));
 +      offset += sizeof (*header);
 +
 +      grub_util_load_image (config_path, kernel_img + offset);
 +      *(kernel_img + offset + config_size_pure - 1) = 0;
 +      offset += config_size;
 +    }
 +
 +  grub_util_info ("kernel_img=%p, kernel_size=0x%x", kernel_img, kernel_size);
 +  compress_kernel (image_target, kernel_img, kernel_size + total_module_size,
 +                 &core_img, &core_size);
 +
 +  grub_util_info ("the core size is 0x%x", core_size);
 +
 +  if (image_target->total_module_size != TARGET_NO_FIELD)
 +    *((grub_uint32_t *) (core_img + image_target->total_module_size))
 +      = grub_host_to_target32 (total_module_size);
 +  if (image_target->kernel_image_size != TARGET_NO_FIELD)
 +    *((grub_uint32_t *) (core_img + image_target->kernel_image_size))
 +      = grub_host_to_target32 (kernel_size);
 +  if (image_target->compressed_size != TARGET_NO_FIELD)
 +    *((grub_uint32_t *) (core_img + image_target->compressed_size))
 +      = grub_host_to_target32 (core_size - image_target->raw_size);
 +
 +  /* If we included a drive in our prefix, let GRUB know it doesn't have to
 +     prepend the drive told by BIOS.  */
 +  if (image_target->install_dos_part != TARGET_NO_FIELD
 +      && image_target->install_bsd_part != TARGET_NO_FIELD && prefix[0] == '(')
 +    {
 +      *((grub_int32_t *) (core_img + image_target->install_dos_part))
 +      = grub_host_to_target32 (-2);
 +      *((grub_int32_t *) (core_img + image_target->install_bsd_part))
 +      = grub_host_to_target32 (-2);
 +    }
 +
 +  switch (image_target->id)
 +    {
 +    case IMAGE_I386_PC:
 +      {
 +      unsigned num;
 +      char *boot_path, *boot_img;
 +      size_t boot_size;
 +
 +      if (GRUB_KERNEL_I386_PC_LINK_ADDR + core_size > GRUB_MEMORY_I386_PC_UPPER)
 +        grub_util_error (_("core image is too big (%p > %p)"),
 +                         GRUB_KERNEL_I386_PC_LINK_ADDR + core_size,
 +                         GRUB_MEMORY_I386_PC_UPPER);
 +
 +      num = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
 +      if (num > 0xffff)
 +        grub_util_error (_("the core image is too big"));
 +
 +      boot_path = grub_util_get_path (dir, "diskboot.img");
 +      boot_size = grub_util_get_image_size (boot_path);
 +      if (boot_size != GRUB_DISK_SECTOR_SIZE)
 +        grub_util_error (_("diskboot.img size must be %u bytes"),
 +                         GRUB_DISK_SECTOR_SIZE);
 +
 +      boot_img = grub_util_read_image (boot_path);
 +
 +      {
 +        struct grub_pc_bios_boot_blocklist *block;
 +        block = (struct grub_pc_bios_boot_blocklist *) (boot_img
 +                                                        + GRUB_DISK_SECTOR_SIZE
 +                                                        - sizeof (*block));
 +        block->len = grub_host_to_target16 (num);
 +
 +        /* This is filled elsewhere.  Verify it just in case.  */
 +        assert (block->segment
 +                == grub_host_to_target16 (GRUB_BOOT_I386_PC_KERNEL_SEG
 +                                          + (GRUB_DISK_SECTOR_SIZE >> 4)));
 +      }
 +
 +      grub_util_write_image (boot_img, boot_size, out);
 +      free (boot_img);
 +      free (boot_path);
 +      }
 +      break;
 +    case IMAGE_EFI:
 +      {
 +      void *pe_img;
 +      grub_uint8_t *header;
 +      void *sections;
 +      size_t pe_size;
 +      struct grub_pe32_coff_header *c;
 +      struct grub_pe32_section_table *text_section, *data_section;
 +      struct grub_pe32_section_table *mods_section, *reloc_section;
 +      static const grub_uint8_t stub[] = GRUB_PE32_MSDOS_STUB;
 +      int header_size;
 +      int reloc_addr;
 +
 +      if (image_target->voidp_sizeof == 4)
 +        header_size = ALIGN_UP (GRUB_PE32_MSDOS_STUB_SIZE
 +                                + GRUB_PE32_SIGNATURE_SIZE
 +                                + sizeof (struct grub_pe32_coff_header)
 +                                + sizeof (struct grub_pe32_optional_header)
 +                                + 4 * sizeof (struct grub_pe32_section_table),
 +                                GRUB_PE32_SECTION_ALIGNMENT);
 +      else
 +        header_size = ALIGN_UP (GRUB_PE32_MSDOS_STUB_SIZE
 +                                + GRUB_PE32_SIGNATURE_SIZE
 +                                + sizeof (struct grub_pe32_coff_header)
 +                                + sizeof (struct grub_pe64_optional_header)
 +                                + 4 * sizeof (struct grub_pe32_section_table),
 +                                GRUB_PE32_SECTION_ALIGNMENT);
 +
 +      reloc_addr = ALIGN_UP (header_size + core_size,
 +                             image_target->section_align);
 +
 +      pe_size = ALIGN_UP (reloc_addr + reloc_size,
 +                          image_target->section_align);
 +      pe_img = xmalloc (reloc_addr + reloc_size);
 +      memset (pe_img, 0, header_size);
 +      memcpy (pe_img + header_size, core_img, core_size);
 +      memcpy (pe_img + reloc_addr, rel_section, reloc_size);
 +      header = pe_img;
 +
 +      /* The magic.  */
 +      memcpy (header, stub, GRUB_PE32_MSDOS_STUB_SIZE);
 +      memcpy (header + GRUB_PE32_MSDOS_STUB_SIZE, "PE\0\0",
 +              GRUB_PE32_SIGNATURE_SIZE);
 +
 +      /* The COFF file header.  */
 +      c = (struct grub_pe32_coff_header *) (header + GRUB_PE32_MSDOS_STUB_SIZE
 +                                            + GRUB_PE32_SIGNATURE_SIZE);
 +      if (image_target->voidp_sizeof == 4)
 +        c->machine = grub_host_to_target16 (GRUB_PE32_MACHINE_I386);
 +      else
 +        c->machine = grub_host_to_target16 (GRUB_PE32_MACHINE_X86_64);
 +
 +      c->num_sections = grub_host_to_target16 (4);
 +      c->time = grub_host_to_target32 (time (0));
 +      c->characteristics = grub_host_to_target16 (GRUB_PE32_EXECUTABLE_IMAGE
 +                                                  | GRUB_PE32_LINE_NUMS_STRIPPED
 +                                                  | ((image_target->voidp_sizeof == 4)
 +                                                     ? GRUB_PE32_32BIT_MACHINE
 +                                                     : 0)
 +                                                  | GRUB_PE32_LOCAL_SYMS_STRIPPED
 +                                                  | GRUB_PE32_DEBUG_STRIPPED);
 +
 +      /* The PE Optional header.  */
 +      if (image_target->voidp_sizeof == 4)
 +        {
 +          struct grub_pe32_optional_header *o;
 +
 +          c->optional_header_size = grub_host_to_target16 (sizeof (struct grub_pe32_optional_header));
 +
 +          o = (struct grub_pe32_optional_header *)
 +            (header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE
 +             + sizeof (struct grub_pe32_coff_header));
 +          o->magic = grub_host_to_target16 (GRUB_PE32_PE32_MAGIC);
 +          o->code_size = grub_host_to_target32 (exec_size);
 +          o->data_size = grub_cpu_to_le32 (reloc_addr - exec_size
 +                                           - header_size);
 +          o->bss_size = grub_cpu_to_le32 (bss_size);
 +          o->entry_addr = grub_cpu_to_le32 (start_address);
 +          o->code_base = grub_cpu_to_le32 (header_size);
 +
 +          o->data_base = grub_host_to_target32 (header_size + exec_size);
 +
 +          o->image_base = 0;
 +          o->section_alignment = grub_host_to_target32 (image_target->section_align);
 +          o->file_alignment = grub_host_to_target32 (image_target->section_align);
 +          o->image_size = grub_host_to_target32 (pe_size);
 +          o->header_size = grub_host_to_target32 (header_size);
 +          o->subsystem = grub_host_to_target16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION);
 +
 +          /* Do these really matter? */
 +          o->stack_reserve_size = grub_host_to_target32 (0x10000);
 +          o->stack_commit_size = grub_host_to_target32 (0x10000);
 +          o->heap_reserve_size = grub_host_to_target32 (0x10000);
 +          o->heap_commit_size = grub_host_to_target32 (0x10000);
 +    
 +          o->num_data_directories = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES);
 +
 +          o->base_relocation_table.rva = grub_host_to_target32 (reloc_addr);
 +          o->base_relocation_table.size = grub_host_to_target32 (reloc_size);
 +          sections = o + 1;
 +        }
 +      else
 +        {
 +          struct grub_pe64_optional_header *o;
 +
 +          c->optional_header_size = grub_host_to_target16 (sizeof (struct grub_pe64_optional_header));
 +
 +          o = (struct grub_pe64_optional_header *) 
 +            (header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE
 +             + sizeof (struct grub_pe32_coff_header));
 +          o->magic = grub_host_to_target16 (GRUB_PE32_PE64_MAGIC);
 +          o->code_size = grub_host_to_target32 (exec_size);
 +          o->data_size = grub_cpu_to_le32 (reloc_addr - exec_size
 +                                           - header_size);
 +          o->bss_size = grub_cpu_to_le32 (bss_size);
 +          o->entry_addr = grub_cpu_to_le32 (start_address);
 +          o->code_base = grub_cpu_to_le32 (header_size);
 +          o->image_base = 0;
 +          o->section_alignment = grub_host_to_target32 (image_target->section_align);
 +          o->file_alignment = grub_host_to_target32 (image_target->section_align);
 +          o->image_size = grub_host_to_target32 (pe_size);
 +          o->header_size = grub_host_to_target32 (header_size);
 +          o->subsystem = grub_host_to_target16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION);
 +
 +          /* Do these really matter? */
 +          o->stack_reserve_size = grub_host_to_target32 (0x10000);
 +          o->stack_commit_size = grub_host_to_target32 (0x10000);
 +          o->heap_reserve_size = grub_host_to_target32 (0x10000);
 +          o->heap_commit_size = grub_host_to_target32 (0x10000);
 +    
 +          o->num_data_directories
 +            = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES);
 +
 +          o->base_relocation_table.rva = grub_host_to_target32 (reloc_addr);
 +          o->base_relocation_table.size = grub_host_to_target32 (reloc_size);
 +          sections = o + 1;
 +        }
 +      /* The sections.  */
 +      text_section = sections;
 +      strcpy (text_section->name, ".text");
 +      text_section->virtual_size = grub_cpu_to_le32 (exec_size);
 +      text_section->virtual_address = grub_cpu_to_le32 (header_size);
 +      text_section->raw_data_size = grub_cpu_to_le32 (exec_size);
 +      text_section->raw_data_offset = grub_cpu_to_le32 (header_size);
 +      text_section->characteristics = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_CODE
 +                                                        | GRUB_PE32_SCN_MEM_EXECUTE
 +                                                        | GRUB_PE32_SCN_MEM_READ);
 +
 +      data_section = text_section + 1;
 +      strcpy (data_section->name, ".data");
 +      data_section->virtual_size = grub_cpu_to_le32 (kernel_size - exec_size);
 +      data_section->virtual_address = grub_cpu_to_le32 (header_size + exec_size);
 +      data_section->raw_data_size = grub_cpu_to_le32 (kernel_size - exec_size);
 +      data_section->raw_data_offset = grub_cpu_to_le32 (header_size + exec_size);
 +      data_section->characteristics
 +        = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_INITIALIZED_DATA
 +                            | GRUB_PE32_SCN_MEM_READ
 +                            | GRUB_PE32_SCN_MEM_WRITE);
 +
 +#if 0
 +      bss_section = data_section + 1;
 +      strcpy (bss_section->name, ".bss");
 +      bss_section->virtual_size = grub_cpu_to_le32 (bss_size);
 +      bss_section->virtual_address = grub_cpu_to_le32 (header_size + kernel_size);
 +      bss_section->raw_data_size = 0;
 +      bss_section->raw_data_offset = 0;
 +      bss_section->characteristics
 +        = grub_cpu_to_le32 (GRUB_PE32_SCN_MEM_READ
 +                            | GRUB_PE32_SCN_MEM_WRITE
 +                            | GRUB_PE32_SCN_ALIGN_64BYTES
 +                            | GRUB_PE32_SCN_CNT_INITIALIZED_DATA
 +                            | 0x80);
 +#endif
 +    
 +      mods_section = data_section + 1;
 +      strcpy (mods_section->name, "mods");
 +      mods_section->virtual_size = grub_cpu_to_le32 (reloc_addr - kernel_size - header_size);
 +      mods_section->virtual_address = grub_cpu_to_le32 (header_size + kernel_size + bss_size);
 +      mods_section->raw_data_size = grub_cpu_to_le32 (reloc_addr - kernel_size - header_size);
 +      mods_section->raw_data_offset = grub_cpu_to_le32 (header_size + kernel_size);
 +      mods_section->characteristics
 +        = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_INITIALIZED_DATA
 +                            | GRUB_PE32_SCN_MEM_READ
 +                            | GRUB_PE32_SCN_MEM_WRITE);
 +
 +      reloc_section = mods_section + 1;
 +      strcpy (reloc_section->name, ".reloc");
 +      reloc_section->virtual_size = grub_cpu_to_le32 (reloc_size);
 +      reloc_section->virtual_address = grub_cpu_to_le32 (reloc_addr + bss_size);
 +      reloc_section->raw_data_size = grub_cpu_to_le32 (reloc_size);
 +      reloc_section->raw_data_offset = grub_cpu_to_le32 (reloc_addr);
 +      reloc_section->characteristics
 +        = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_INITIALIZED_DATA
 +                            | GRUB_PE32_SCN_MEM_DISCARDABLE
 +                            | GRUB_PE32_SCN_MEM_READ);
 +      free (core_img);
 +      core_img = pe_img;
 +      core_size = pe_size;
 +      }
 +      break;
 +    case IMAGE_QEMU:
 +      {
 +      char *rom_img;
 +      size_t rom_size;
 +      char *boot_path, *boot_img;
 +      size_t boot_size;
 +
 +      boot_path = grub_util_get_path (dir, "boot.img");
 +      boot_size = grub_util_get_image_size (boot_path);
 +      boot_img = grub_util_read_image (boot_path);
 +
 +      /* Rom sizes must be 64k-aligned.  */
 +      rom_size = ALIGN_UP (core_size + boot_size, 64 * 1024);
 +
 +      rom_img = xmalloc (rom_size);
 +      memset (rom_img, 0, rom_size);
 +
 +      *((grub_int32_t *) (core_img + GRUB_KERNEL_I386_QEMU_CORE_ENTRY_ADDR))
 +        = grub_host_to_target32 ((grub_uint32_t) -rom_size);
 +
 +      memcpy (rom_img, core_img, core_size);
 +
 +      *((grub_int32_t *) (boot_img + GRUB_BOOT_I386_QEMU_CORE_ENTRY_ADDR))
 +        = grub_host_to_target32 ((grub_uint32_t) -rom_size);
 +
 +      memcpy (rom_img + rom_size - boot_size, boot_img, boot_size);
 +
 +      free (core_img);
 +      core_img = rom_img;
 +      core_size = rom_size;
 +
 +      free (boot_img);
 +      free (boot_path);
 +      }
 +      break;
 +    case IMAGE_SPARC64_AOUT:
 +      {
 +      void *aout_img;
 +      size_t aout_size;
 +      struct grub_aout32_header *aout_head;
 +
 +      aout_size = core_size + sizeof (*aout_head);
 +      aout_img = xmalloc (aout_size);
 +      aout_head = aout_img;
 +      aout_head->a_midmag = grub_host_to_target32 ((AOUT_MID_SUN << 16)
 +                                                   | AOUT32_OMAGIC);
 +      aout_head->a_text = grub_host_to_target32 (core_size);
 +      aout_head->a_entry
 +        = grub_host_to_target32 (GRUB_BOOT_SPARC64_IEEE1275_IMAGE_ADDRESS);
 +      memcpy (aout_img + sizeof (*aout_head), core_img, core_size);
 +
 +      free (core_img);
 +      core_img = aout_img;
 +      core_size = aout_size;
 +      }
 +      break;
 +    case IMAGE_SPARC64_RAW:
 +      {
 +      unsigned int num;
 +      char *boot_path, *boot_img;
 +      size_t boot_size;
 +
 +      num = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
 +      num <<= GRUB_DISK_SECTOR_BITS;
 +
 +      boot_path = grub_util_get_path (dir, "diskboot.img");
 +      boot_size = grub_util_get_image_size (boot_path);
 +      if (boot_size != GRUB_DISK_SECTOR_SIZE)
 +        grub_util_error ("diskboot.img is not one sector size");
 +
 +      boot_img = grub_util_read_image (boot_path);
 +
 +      *((grub_uint32_t *) (boot_img + GRUB_DISK_SECTOR_SIZE
 +                           - GRUB_BOOT_SPARC64_IEEE1275_LIST_SIZE + 8))
 +        = grub_host_to_target32 (num);
 +
 +      grub_util_write_image (boot_img, boot_size, out);
 +      free (boot_img);
 +      free (boot_path);
 +      }
 +      break;
 +    case IMAGE_YEELOONG_ELF:
 +    case IMAGE_PPC:
 +    case IMAGE_COREBOOT:
 +    case IMAGE_I386_IEEE1275:
 +      {
 +      char *elf_img;
 +      size_t program_size;
 +      Elf32_Ehdr *ehdr;
 +      Elf32_Phdr *phdr;
 +      grub_uint32_t target_addr;
 +      int header_size, footer_size = 0;
 +      int phnum = 1;
 +      
 +      if (image_target->id != IMAGE_YEELOONG_ELF)
 +        phnum += 2;
 +
 +      if (note)
 +        {
 +          phnum++;
 +          footer_size += sizeof (struct grub_ieee1275_note);
 +        }
 +      header_size = ALIGN_ADDR (sizeof (*ehdr) + phnum * sizeof (*phdr));
 +
 +      program_size = ALIGN_ADDR (core_size);
 +
 +      elf_img = xmalloc (program_size + header_size + footer_size);
 +      memset (elf_img, 0, program_size + header_size);
 +      memcpy (elf_img  + header_size, core_img, core_size);
 +      ehdr = (void *) elf_img;
 +      phdr = (void *) (elf_img + sizeof (*ehdr));
 +      memcpy (ehdr->e_ident, ELFMAG, SELFMAG);
 +      ehdr->e_ident[EI_CLASS] = ELFCLASS32;
 +      if (!image_target->bigendian)
 +        ehdr->e_ident[EI_DATA] = ELFDATA2LSB;
 +      else
 +        ehdr->e_ident[EI_DATA] = ELFDATA2MSB;
 +      ehdr->e_ident[EI_VERSION] = EV_CURRENT;
 +      ehdr->e_ident[EI_OSABI] = ELFOSABI_NONE;
 +      ehdr->e_type = grub_host_to_target16 (ET_EXEC);
 +      ehdr->e_machine = grub_host_to_target16 (image_target->elf_target);
 +      ehdr->e_version = grub_host_to_target32 (EV_CURRENT);
 +
 +      ehdr->e_phoff = grub_host_to_target32 ((char *) phdr - (char *) ehdr);
 +      ehdr->e_phentsize = grub_host_to_target16 (sizeof (*phdr));
 +      ehdr->e_phnum = grub_host_to_target16 (phnum);
 +
 +      /* No section headers.  */
 +      ehdr->e_shoff = grub_host_to_target32 (0);
 +      if (image_target->id == IMAGE_YEELOONG_ELF)
 +        ehdr->e_shentsize = grub_host_to_target16 (0);
 +      else
 +        ehdr->e_shentsize = grub_host_to_target16 (sizeof (Elf32_Shdr));
 +      ehdr->e_shnum = grub_host_to_target16 (0);
 +      ehdr->e_shstrndx = grub_host_to_target16 (0);
 +
 +      ehdr->e_ehsize = grub_host_to_target16 (sizeof (*ehdr));
 +
 +      phdr->p_type = grub_host_to_target32 (PT_LOAD);
 +      phdr->p_offset = grub_host_to_target32 (header_size);
 +      phdr->p_flags = grub_host_to_target32 (PF_R | PF_W | PF_X);
 +
 +      if (image_target->id == IMAGE_YEELOONG_ELF)
 +        target_addr = ALIGN_UP (image_target->link_addr
 +                                + kernel_size + total_module_size, 32);
 +      else
 +        target_addr = image_target->link_addr;
 +      ehdr->e_entry = grub_host_to_target32 (target_addr);
 +      phdr->p_vaddr = grub_host_to_target32 (target_addr);
 +      phdr->p_paddr = grub_host_to_target32 (target_addr);
 +      phdr->p_align = grub_host_to_target32 (align > image_target->link_align ? align : image_target->link_align);
 +      if (image_target->id == IMAGE_YEELOONG_ELF)
 +        ehdr->e_flags = grub_host_to_target32 (0x1000 | EF_MIPS_NOREORDER 
 +                                               | EF_MIPS_PIC | EF_MIPS_CPIC);
 +      else
 +        ehdr->e_flags = 0;
 +      if (image_target->id == IMAGE_YEELOONG_ELF)
 +        {
 +          phdr->p_filesz = grub_host_to_target32 (core_size);
 +          phdr->p_memsz = grub_host_to_target32 (core_size);
 +        }
 +      else
 +        {
 +          grub_uint32_t target_addr_mods;
 +          phdr->p_filesz = grub_host_to_target32 (kernel_size);
 +          phdr->p_memsz = grub_host_to_target32 (kernel_size + bss_size);
 +
 +          phdr++;
 +          phdr->p_type = grub_host_to_target32 (PT_GNU_STACK);
 +          phdr->p_offset = grub_host_to_target32 (header_size + kernel_size);
 +          phdr->p_paddr = phdr->p_vaddr = phdr->p_filesz = phdr->p_memsz = 0;
 +          phdr->p_flags = grub_host_to_target32 (PF_R | PF_W | PF_X);
 +          phdr->p_align = grub_host_to_target32 (image_target->link_align);
 +
 +          phdr++;
 +          phdr->p_type = grub_host_to_target32 (PT_LOAD);
 +          phdr->p_offset = grub_host_to_target32 (header_size + kernel_size);
 +          phdr->p_flags = grub_host_to_target32 (PF_R | PF_W | PF_X);
 +          phdr->p_filesz = phdr->p_memsz
 +            = grub_host_to_target32 (core_size - kernel_size);
 +
 +          target_addr_mods = ALIGN_UP (target_addr + kernel_size + bss_size
 +                                       + image_target->mod_gap,
 +                                       image_target->mod_align);
 +          phdr->p_vaddr = grub_host_to_target32 (target_addr_mods);
 +          phdr->p_paddr = grub_host_to_target32 (target_addr_mods);
 +          phdr->p_align = grub_host_to_target32 (image_target->link_align);
 +        }
 +
 +      if (note)
 +        {
 +          int note_size = sizeof (struct grub_ieee1275_note);
 +          struct grub_ieee1275_note *note = (struct grub_ieee1275_note *) 
 +            (elf_img + program_size + header_size);
 +
 +          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);
 +
 +          phdr++;
 +          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 (image_target->voidp_sizeof);
 +          phdr->p_vaddr = 0;
 +          phdr->p_paddr = 0;
 +          phdr->p_filesz = grub_host_to_target32 (note_size);
 +          phdr->p_memsz = 0;
 +          phdr->p_offset = grub_host_to_target32 (header_size + program_size);
 +        }
 +
 +      free (core_img);
 +      core_img = elf_img;
 +      core_size = program_size + header_size + footer_size;
 +      }
 +      break;
 +    }
 +
 +  grub_util_write_image (core_img, core_size, out);
 +  free (kernel_img);
 +  free (core_img);
 +  free (kernel_path);
 +
 +  while (path_list)
 +    {
 +      next = path_list->next;
 +      free ((void *) path_list->name);
 +      free (path_list);
 +      path_list = next;
 +    }
 +}
 +
 +\f
 +
 +static struct option options[] =
 +  {
 +    {"directory", required_argument, 0, 'd'},
 +    {"prefix", required_argument, 0, 'p'},
 +    {"memdisk", required_argument, 0, 'm'},
 +    {"font", required_argument, 0, 'f'},
 +    {"config", required_argument, 0, 'c'},
 +    {"output", required_argument, 0, 'o'},
 +    {"note", no_argument, 0, 'n'},
 +    {"format", required_argument, 0, 'O'},
 +    {"help", no_argument, 0, 'h'},
 +    {"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
 +    {
 +      int format_len = 0;
 +      char *formats;
 +      char *ptr;
 +      unsigned i;
 +      for (i = 0; i < ARRAY_SIZE (image_targets); i++)
 +      format_len += strlen (image_targets[i].name) + 2;
 +      ptr = formats = xmalloc (format_len);
 +      for (i = 0; i < ARRAY_SIZE (image_targets); i++)
 +      {
 +        strcpy (ptr, image_targets[i].name);
 +        ptr += strlen (image_targets[i].name);
 +        *ptr++ = ',';
 +        *ptr++ = ' ';
 +      }
 +      ptr[-2] = 0;
 +
 +      printf (_("\
 +Usage: %s [OPTION]... [MODULES]\n\
 +\n\
 +Make a bootable image of GRUB.\n\
 +\n\
 +  -d, --directory=DIR     use images and modules under DIR [default=%s/@platform@]\n\
 +  -p, --prefix=DIR        set grub_prefix directory [default=%s]\n\
 +  -m, --memdisk=FILE      embed FILE as a memdisk image\n\
 +  -f, --font=FILE         embed FILE as a boot font\n\
 +  -c, --config=FILE       embed FILE as boot config\n\
 +  -n, --note              add NOTE segment for CHRP Open Firmware\n\
 +  -o, --output=FILE       output a generated image to FILE [default=stdout]\n\
 +  -O, --format=FORMAT     generate an image in format\n\
 +                          available formats: %s\n\
 +  -h, --help              display this message and exit\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, DEFAULT_DIRECTORY,
 +            formats,
 +            PACKAGE_BUGREPORT);
 +      free (formats);
 +    }
 +  exit (status);
 +}
 +
 +int
 +main (int argc, char *argv[])
 +{
 +  char *output = NULL;
 +  char *dir = NULL;
 +  char *prefix = NULL;
 +  char *memdisk = NULL;
 +  char *font = NULL;
 +  char *config = NULL;
 +  FILE *fp = stdout;
 +  int note = 0;
 +  struct image_target_desc *image_target = NULL;
 +
 +  set_program_name (argv[0]);
 +
 +  grub_util_init_nls ();
 +
 +  while (1)
 +    {
 +      int c = getopt_long (argc, argv, "d:p:m:c:o:O:f:hVvn", options, 0);
 +
 +      if (c == -1)
 +      break;
 +      else
 +      switch (c)
 +        {
 +        case 'o':
 +          if (output)
 +            free (output);
 +
 +          output = xstrdup (optarg);
 +          break;
 +
 +        case 'O':
 +          {
 +            unsigned i;
 +            for (i = 0; i < ARRAY_SIZE (image_targets); i++)
 +              if (strcmp (optarg, image_targets[i].name) == 0)
 +                image_target = &image_targets[i];
 +            if (!image_target)
 +              {
 +                printf ("unknown target %s\n", optarg);
 +                usage (1);
 +              }
 +            break;
 +          }
 +        case 'd':
 +          if (dir)
 +            free (dir);
 +
 +          dir = xstrdup (optarg);
 +          break;
 +
 +        case 'n':
 +          note = 1;
 +          break;
 +
 +        case 'm':
 +          if (memdisk)
 +            free (memdisk);
 +
 +          memdisk = xstrdup (optarg);
 +
 +          if (prefix)
 +            free (prefix);
 +
 +          prefix = xstrdup ("(memdisk)/boot/grub");
 +          break;
 +
 +        case 'f':
 +          if (font)
 +            free (font);
 +
 +          font = xstrdup (optarg);
 +          break;
 +
 +        case 'c':
 +          if (config)
 +            free (config);
 +
 +          config = xstrdup (optarg);
 +          break;
 +
 +        case 'h':
 +          usage (0);
 +          break;
 +
 +        case 'p':
 +          if (prefix)
 +            free (prefix);
 +
 +          prefix = 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 (!image_target)
 +    {
 +      printf ("Target not specified.\n");
 +      usage (1);
 +    }
 +
 +  if (output)
 +    {
 +      fp = fopen (output, "wb");
 +      if (! fp)
 +      grub_util_error (_("cannot open %s"), output);
 +      free (output);
 +    }
 +
 +  if (!dir)
 +    {
 +      const char *last;
 +      last = strchr (image_target->name, '-');
 +      if (last)
 +      last = strchr (last + 1, '-');
 +      if (!last)
 +      last = image_target->name + strlen (image_target->name);
 +      dir = xmalloc (sizeof (GRUB_LIBDIR) + (last - image_target->name));
 +      memcpy (dir, GRUB_LIBDIR, sizeof (GRUB_LIBDIR) - 1);
 +      memcpy (dir + sizeof (GRUB_LIBDIR) - 1, image_target->name,
 +            last - image_target->name);
 +      *(dir + sizeof (GRUB_LIBDIR) - 1 +  (last - image_target->name)) = 0;
 +    }
 +
 +  generate_image (dir ? : GRUB_LIBDIR, prefix ? : DEFAULT_DIRECTORY, fp,
 +                argv + optind, memdisk, font, config,
 +                image_target, note);
 +
 +  fclose (fp);
 +
 +  if (dir)
 +    free (dir);
 +
 +  return 0;
 +}
index 2ef9aa8bd812b699a30011ffeaf3715544790882,44e80b106fcd7794ca46e4e4c648413bb7c03ab3..365c48f291f75c6a6967dafac0bd4a8cb4f5857d
@@@ -30,10 -30,8 +30,10 @@@ target_cpu=@target_cpu
  native_platform=@platform@
  pkglib_DATA="@pkglib_DATA@"
  
coreboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-coreboot
multiboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-multiboot
  pc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-pc
 +efi32_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-efi
 +efi64_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/x86_64-efi
  
  # Usage: usage
  # Print the usage.
@@@ -130,42 -128,29 +130,42 @@@ if [ "${override_dir}" = "" ] ; the
      if test -e "${pc_dir}" ; then
          process_input_dir ${pc_dir} pc
      fi
 +    if test -e "${efi32_dir}" ; then
 +        process_input_dir ${efi32_dir} efi32
 +    fi
 +    if test -e "${efi64_dir}" ; then
 +        process_input_dir ${efi64_dir} efi64
 +    fi
  else
      process_input_dir ${override_dir} ${native_platform}
-     coreboot_dir=
+     multiboot_dir=
      pc_dir=
-     case "${target_cpu}-${native_platform}" in
-         i386-coreboot) coreboot_dir=${override_dir} ;;
 +    efi32_dir=
 +    efi64_dir=
 -        multiboot) multiboot_dir=${override_dir} ;;
 -        pc) pc_dir=${override_dir} ;;
+     case "${native_platform}" in
++        i386-multiboot) multiboot_dir=${override_dir} ;;
 +        i386-pc) pc_dir=${override_dir} ;;
 +      i386-efi) efi32_dir=${override_dir} ;;
 +      x86_64-efi) efi64_dir=${override_dir} ;;
      esac
  fi
  
- # build coreboot core.img
- if test -e "${coreboot_dir}" ; then
-     echo "Enabling coreboot support ..."
 +# obtain date-based UUID
 +iso_uuid=$(date -u +%Y-%m-%d-%H-%M-%S-00)
 +grub_mkisofs_arguments="${grub_mkisofs_arguments} --modification-date=$(echo ${iso_uuid} | sed -e s/-//g)"
 +
+ # build multiboot core.img
+ if test -e "${multiboot_dir}" ; then
+     echo "Enabling multiboot support ..."
      memdisk_img=`mktemp "$MKTEMP_TEMPLATE"`
      memdisk_dir=`mktemp -d "$MKTEMP_TEMPLATE"`
      mkdir -p ${memdisk_dir}/boot/grub
 -    # obtain date-based UUID
 -    iso_uuid=$(date -u +%Y-%m-%d-%H-%M-%S-00)
  
-     modules="$(cat ${coreboot_dir}/partmap.lst) ${modules}"
+     modules="$(cat ${multiboot_dir}/partmap.lst) ${modules}"
      cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg
  search --fs-uuid --set ${iso_uuid}
- set prefix=(\${root})/boot/grub/${target_cpu}-coreboot
+ set prefix=(\${root})/boot/grub/${target_cpu}-multiboot
 +source \$prefix/grub.cfg
  EOF
      (for i in ${modules} ; do
          echo "insmod $i"
  
      tar -C ${memdisk_dir} -cf ${memdisk_img} boot
      rm -rf ${memdisk_dir}
-     grub-mkimage -O i386-coreboot -d ${coreboot_dir}/ -m ${memdisk_img} -o ${iso9660_dir}/boot/multiboot.img \
 -    grub-mkelfimage -d ${multiboot_dir}/ -m ${memdisk_img} -o ${iso9660_dir}/boot/multiboot.img \
++    grub-mkimage -O i386-multiboot -d ${multiboot_dir}/ -m ${memdisk_img} -o ${iso9660_dir}/boot/multiboot.img \
          memdisk tar search iso9660 configfile sh \
          ata at_keyboard
      rm -f ${memdisk_img}
Simple merge