vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix multiboot compilation

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-08-29 00:46:36 +02:00
parent 5dc598851f
commit f0b05761f4
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
grub-core/Makefile.core.def
View file

@ -361,6 +361,7 @@ module = {
enable = x86_efi; enable = x86_efi;
enable = i386_ieee1275; enable = i386_ieee1275;
enable = i386_coreboot; enable = i386_coreboot;
enable = i386_multiboot;
emu_condition = COND_GRUB_EMU_PCI; emu_condition = COND_GRUB_EMU_PCI;
}; };

4
include/grub/offsets.h
View file

@ -123,12 +123,16 @@
#define GRUB_KERNEL_I386_COREBOOT_DATA_END 0x42 #define GRUB_KERNEL_I386_COREBOOT_DATA_END 0x42
#define GRUB_KERNEL_I386_COREBOOT_LINK_ADDR 0x8200 #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_PREFIX 0x2
#define GRUB_KERNEL_I386_IEEE1275_DATA_END 0x42 #define GRUB_KERNEL_I386_IEEE1275_DATA_END 0x42
#define GRUB_KERNEL_I386_IEEE1275_LINK_ADDR 0x10000 #define GRUB_KERNEL_I386_IEEE1275_LINK_ADDR 0x10000
#define GRUB_KERNEL_I386_IEEE1275_MOD_ALIGN 0x1000 #define GRUB_KERNEL_I386_IEEE1275_MOD_ALIGN 0x1000
#define GRUB_KERNEL_I386_COREBOOT_MOD_ALIGN 0x1 #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. */ /* Non-zero value is only needed for PowerMacs. */
#define GRUB_KERNEL_I386_IEEE1275_MOD_GAP 0x0 #define GRUB_KERNEL_I386_IEEE1275_MOD_GAP 0x0

4
util/grub-mkimage.c
View file

@ -106,8 +106,8 @@ struct image_target_desc image_targets[] =
.bigendian = 0, .bigendian = 0,
.id = IMAGE_COREBOOT, .id = IMAGE_COREBOOT,
.flags = PLATFORM_FLAGS_NONE, .flags = PLATFORM_FLAGS_NONE,
.prefix = GRUB_KERNEL_I386_COREBOOT_PREFIX, .prefix = GRUB_KERNEL_I386_MULTIBOOT_PREFIX,
.data_end = GRUB_KERNEL_I386_COREBOOT_DATA_END, .data_end = GRUB_KERNEL_I386_MULTIBOOT_DATA_END,
.raw_size = 0, .raw_size = 0,
.total_module_size = TARGET_NO_FIELD, .total_module_size = TARGET_NO_FIELD,
.kernel_image_size = TARGET_NO_FIELD, .kernel_image_size = TARGET_NO_FIELD,