From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Mon, 8 May 2017 19:08:02 +0000 (+0200)
Subject: fix mismerge
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=642ff2676fa380ac030ac131ddee284a0a2a42e1;p=thirdparty%2Fgrub.git

fix mismerge
---

diff --git a/util/mkimage.c b/util/mkimage.c
index ce64822ff..2d9d8c333 100644
--- a/util/mkimage.c
+++ b/util/mkimage.c
@@ -533,29 +533,9 @@ static const struct grub_install_image_target_desc image_targets[] =
       .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 },
+      .dirname = "arm-coreboot",
+      .names = { "arm-coreboot", NULL },
       .voidp_sizeof = 4,
       .bigendian = 0,
       .id = IMAGE_COREBOOT,
@@ -570,11 +550,11 @@ static const struct grub_install_image_target_desc image_targets[] =
       .mod_gap = GRUB_KERNEL_ARM_COREBOOT_MOD_GAP,
       .mod_align = GRUB_KERNEL_ARM_COREBOOT_MOD_ALIGN,
       .link_align = 4,
-      .link_addr = 0x43000000,
     },
+    /* For coreboot versions that don't support self-relocating images. */
     {
-      .dirname = "arm-coreboot",
-      .names = { "arm-coreboot", NULL },
+      .dirname = "arm-coreboot-vexpress",
+      .names = { "arm-coreboot-vexpress", NULL },
       .voidp_sizeof = 4,
       .bigendian = 0,
       .id = IMAGE_COREBOOT,
@@ -589,8 +569,8 @@ static const struct grub_install_image_target_desc image_targets[] =
       .mod_gap = GRUB_KERNEL_ARM_COREBOOT_MOD_GAP,
       .mod_align = GRUB_KERNEL_ARM_COREBOOT_MOD_ALIGN,
       .link_align = 4,
+      .link_addr = 0x62000000,
     },
-    /* For coreboot versions that don't support self-relocating images. */
     {
       .dirname = "arm-coreboot-veyron",
       .names = { "arm-coreboot-veyron", NULL },