fix multiboot compilation

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 62c08928ad8052b60a3639f6079825deb1253a8f..0917e749c4ef5bfa48b09fdf8cd8990553903bd3 100644 (file)
--- 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 ae0b2557e8c6b47c111b03ca49f7648db5527dbe..7763e488c5802827ab8949603e9823e8efa83279 100644 (file)
--- 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 c46f0700fd79a5bcdba0ff4c32a5078f31b3a142..38c530b91714e2c105b852bb06461bdda341a46a 100644 (file)
--- 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,