From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 22:46:36 +0000 (+0200)
Subject: fix multiboot compilation
X-Git-Tag: 1.99~629^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0b05761f49596a276794f8c3082a75b7510821d;p=thirdparty%2Fgrub.git

fix multiboot compilation
---

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 62c08928a..0917e749c 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -361,6 +361,7 @@ module = {
   enable = x86_efi;
   enable = i386_ieee1275;
   enable = i386_coreboot;
+  enable = i386_multiboot;
   emu_condition = COND_GRUB_EMU_PCI;
 };
 
diff --git a/include/grub/offsets.h b/include/grub/offsets.h
index ae0b2557e..7763e488c 100644
--- a/include/grub/offsets.h
+++ b/include/grub/offsets.h
@@ -123,12 +123,16 @@
 #define GRUB_KERNEL_I386_COREBOOT_DATA_END	0x42
 #define GRUB_KERNEL_I386_COREBOOT_LINK_ADDR	0x8200
 
+#define GRUB_KERNEL_I386_MULTIBOOT_PREFIX	GRUB_KERNEL_I386_COREBOOT_PREFIX
+#define GRUB_KERNEL_I386_MULTIBOOT_DATA_END	GRUB_KERNEL_I386_COREBOOT_DATA_END
+
 #define GRUB_KERNEL_I386_IEEE1275_PREFIX	0x2
 #define GRUB_KERNEL_I386_IEEE1275_DATA_END	0x42
 #define GRUB_KERNEL_I386_IEEE1275_LINK_ADDR	0x10000
 
 #define GRUB_KERNEL_I386_IEEE1275_MOD_ALIGN	0x1000
 #define GRUB_KERNEL_I386_COREBOOT_MOD_ALIGN	0x1
+#define GRUB_KERNEL_I386_MULTIBOOT_MOD_ALIGN	GRUB_KERNEL_I386_COREBOOT_MOD_ALIGN
 
 /* Non-zero value is only needed for PowerMacs.  */
 #define GRUB_KERNEL_I386_IEEE1275_MOD_GAP 0x0
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index c46f0700f..38c530b91 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -106,8 +106,8 @@ struct image_target_desc image_targets[] =
       .bigendian = 0,
       .id = IMAGE_COREBOOT,
       .flags = PLATFORM_FLAGS_NONE,
-      .prefix = GRUB_KERNEL_I386_COREBOOT_PREFIX,
-      .data_end = GRUB_KERNEL_I386_COREBOOT_DATA_END,
+      .prefix = GRUB_KERNEL_I386_MULTIBOOT_PREFIX,
+      .data_end = GRUB_KERNEL_I386_MULTIBOOT_DATA_END,
       .raw_size = 0,
       .total_module_size = TARGET_NO_FIELD,
       .kernel_image_size = TARGET_NO_FIELD,