Merge branch 'master' into arm_coreboot

diff --cc grub-core/Makefile.core.def
index ba1178e6a742951d48e5d1d6870184bc30309bfc,411dca46bf28583c30e23d07932cb385fedbecf6..a8a64b076f817421e3b24ed30def009cab300bd8
--- 1/grub-core/Makefile.core.def
--- 2/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@@ -154,21 -154,10 +154,22 @@@ kernel = 
    uboot = term/uboot/console.c;
    arm_uboot = kern/arm/uboot/init.c;
    arm_uboot = kern/arm/uboot/uboot.S;
- <<<<<<< HEAD
  
- =======
- >>>>>>> master
 +  arm_coreboot = kern/arm/coreboot/init.c;
 +  arm_coreboot = kern/arm/coreboot/timer.c;
 +  arm_coreboot = kern/arm/coreboot/coreboot.S;
 +  arm_coreboot = lib/fdt.c;
 +  arm_coreboot = bus/fdt.c;
 +  arm_coreboot = term/ps2.c;
 +  arm_coreboot = term/arm/pl050.c;
 +  arm_coreboot = term/arm/cros.c;
 +  arm_coreboot = term/arm/cros_ec.c;
 +  arm_coreboot = commands/keylayouts.c;
 +  arm_coreboot = kern/arm/coreboot/dma.c;
++
+   arm_coreboot = kern/arm/coreboot/init.c;
+   arm_coreboot = kern/arm/coreboot/timer.c;
+   arm_coreboot = kern/arm/coreboot/coreboot.S;
  
    terminfoinkernel = term/terminfo.c;
    terminfoinkernel = term/tparm.c;
@@@ -882,8 -869,9 +886,9 @@@ module = 
    mips_qemu_mips = lib/mips/qemu_mips/reboot.c;
    xen = lib/xen/reboot.c;
    uboot = lib/uboot/reboot.c;
+   arm_coreboot = lib/dummy/reboot.c;
    common = commands/reboot.c;
 -};
 +};*/
  
  module = {
    name = hashsum;

diff --cc grub-core/kern/arm/coreboot/init.c
index 0c021697f091baa06b28c13c0202f22de130603b,51ecaceb005bbf1c7b6324a4f77ae80656274c98..f2fc589419ef085136165c261b183d8b18a69779
--- 1/grub-core/kern/arm/coreboot/init.c
--- 2/grub-core/kern/arm/coreboot/init.c
+++ b/grub-core/kern/arm/coreboot/init.c
@@@ -135,26 -112,7 +135,27 @@@ grub_machine_init (void
    grub_font_init ();
    grub_gfxterm_init ();
  
 +  FOR_MODULES (header)
 +    if (header->type == OBJ_TYPE_DTB)
 +      {
 +      char *dtb_orig_addr, *dtb_copy;
 +      dtb_orig_addr = (char *) header + sizeof (struct grub_module_header);
 +
 +      dtb_size = header->size - sizeof (struct grub_module_header);
 +      dtb = dtb_copy = grub_malloc (dtb_size);
 +      grub_memmove (dtb_copy, dtb_orig_addr, dtb_size);
 +      break;
 +      }
 +  if (!dtb)
 +    grub_linuxbios_table_iterate (iterate_linuxbios_table, 0);
 +  if (!dtb)
 +    grub_fatal ("No DTB found");
 +  grub_fdtbus_init (dtb, dtb_size);
 +
 +  grub_machine_timer_init ();
 +  grub_cros_init ();
 +  grub_pl050_init ();
+   grub_machine_timer_init ();
  }
  
  void

diff --cc grub-core/loader/arm/linux.c
Simple merge

diff --cc include/grub/coreboot/lbio.h
Simple merge

diff --cc util/mkimage.c
index 40678660c73825f918980c9d57954ac64f565f02,6aa77ed736753f32180014d7fa866fe6c55c62b1..ce64822ff00ae96ea5efbc15e2e0dc6a487397ec
--- 1/util/mkimage.c
--- 2/util/mkimage.c
+++ b/util/mkimage.c
@@@ -533,44 -533,45 +533,83 @@@ static const struct grub_install_image_
        .mod_align = GRUB_KERNEL_ARM_UBOOT_MOD_ALIGN,
        .link_align = 4
      },
+     /* For coreboot versions that don't support self-relocating images. */
+     {
+       .dirname = "arm-coreboot-vexpress",
+       .names = { "arm-coreboot-vexpress", NULL },
+       .voidp_sizeof = 4,
+       .bigendian = 0,
+       .id = IMAGE_COREBOOT,
+       .flags = PLATFORM_FLAGS_NONE,
+       .total_module_size = GRUB_KERNEL_ARM_COREBOOT_TOTAL_MODULE_SIZE,
+       .decompressor_compressed_size = TARGET_NO_FIELD,
+       .decompressor_uncompressed_size = TARGET_NO_FIELD,
+       .decompressor_uncompressed_addr = TARGET_NO_FIELD,
+       .section_align = GRUB_KERNEL_ARM_COREBOOT_MOD_ALIGN,
+       .vaddr_offset = 0,
+       .elf_target = EM_ARM,
+       .mod_gap = GRUB_KERNEL_ARM_COREBOOT_MOD_GAP,
+       .mod_align = GRUB_KERNEL_ARM_COREBOOT_MOD_ALIGN,
+       .link_align = 4,
+       .link_addr = 0x62000000,
+     },
+     {
+       .dirname = "arm-coreboot-veyron",
+       .names = { "arm-coreboot-veyron", NULL },
+       .voidp_sizeof = 4,
+       .bigendian = 0,
+       .id = IMAGE_COREBOOT,
+       .flags = PLATFORM_FLAGS_NONE,
+       .total_module_size = GRUB_KERNEL_ARM_COREBOOT_TOTAL_MODULE_SIZE,
+       .decompressor_compressed_size = TARGET_NO_FIELD,
+       .decompressor_uncompressed_size = TARGET_NO_FIELD,
+       .decompressor_uncompressed_addr = TARGET_NO_FIELD,
+       .section_align = GRUB_KERNEL_ARM_COREBOOT_MOD_ALIGN,
+       .vaddr_offset = 0,
+       .elf_target = EM_ARM,
+       .mod_gap = GRUB_KERNEL_ARM_COREBOOT_MOD_GAP,
+       .mod_align = GRUB_KERNEL_ARM_COREBOOT_MOD_ALIGN,
+       .link_align = 4,
+       .link_addr = 0x43000000,
+     },
 +    {
 +      .dirname = "arm-coreboot",
 +      .names = { "arm-coreboot", NULL },
 +      .voidp_sizeof = 4,
 +      .bigendian = 0,
 +      .id = IMAGE_COREBOOT,
 +      .flags = PLATFORM_FLAGS_NONE,
 +      .total_module_size = GRUB_KERNEL_ARM_COREBOOT_TOTAL_MODULE_SIZE,
 +      .decompressor_compressed_size = TARGET_NO_FIELD,
 +      .decompressor_uncompressed_size = TARGET_NO_FIELD,
 +      .decompressor_uncompressed_addr = TARGET_NO_FIELD,
 +      .section_align = GRUB_KERNEL_ARM_COREBOOT_MOD_ALIGN,
 +      .vaddr_offset = 0,
 +      .elf_target = EM_ARM,
 +      .mod_gap = GRUB_KERNEL_ARM_COREBOOT_MOD_GAP,
 +      .mod_align = GRUB_KERNEL_ARM_COREBOOT_MOD_ALIGN,
 +      .link_align = 4,
 +    },
 +    /* For coreboot versions that don't support self-relocating images. */
 +    {
 +      .dirname = "arm-coreboot-veyron",
 +      .names = { "arm-coreboot-veyron", NULL },
 +      .voidp_sizeof = 4,
 +      .bigendian = 0,
 +      .id = IMAGE_COREBOOT,
 +      .flags = PLATFORM_FLAGS_NONE,
 +      .total_module_size = GRUB_KERNEL_ARM_COREBOOT_TOTAL_MODULE_SIZE,
 +      .decompressor_compressed_size = TARGET_NO_FIELD,
 +      .decompressor_uncompressed_size = TARGET_NO_FIELD,
 +      .decompressor_uncompressed_addr = TARGET_NO_FIELD,
 +      .section_align = GRUB_KERNEL_ARM_COREBOOT_MOD_ALIGN,
 +      .vaddr_offset = 0,
 +      .elf_target = EM_ARM,
 +      .mod_gap = GRUB_KERNEL_ARM_COREBOOT_MOD_GAP,
 +      .mod_align = GRUB_KERNEL_ARM_COREBOOT_MOD_ALIGN,
 +      .link_align = 4,
 +      .link_addr = 0x43000000,
 +    },
      {
        .dirname = "arm-efi",
        .names = { "arm-efi", NULL },