summaryrefslogtreecommitdiffstats
path: root/src/arch
diff options
context:
space:
mode:
authorMichael Brown2007-01-12 09:10:35 +0100
committerMichael Brown2007-01-12 09:10:35 +0100
commit6fdc6c81a6a089074d17f46b0ab930e6e1445e8b (patch)
tree500fcc1b50f4090c11ce6964371adfd666a80497 /src/arch
parentfetch() now knows nothing about struct image; it simply loads a file and (diff)
downloadipxe-6fdc6c81a6a089074d17f46b0ab930e6e1445e8b.tar.gz
ipxe-6fdc6c81a6a089074d17f46b0ab930e6e1445e8b.tar.xz
ipxe-6fdc6c81a6a089074d17f46b0ab930e6e1445e8b.zip
Force probing of multiboot before ELF.
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/i386/image/multiboot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/i386/image/multiboot.c b/src/arch/i386/image/multiboot.c
index cdf81e6eb..746b8a57c 100644
--- a/src/arch/i386/image/multiboot.c
+++ b/src/arch/i386/image/multiboot.c
@@ -33,7 +33,7 @@
#include <gpxe/memmap.h>
#include <gpxe/elf.h>
-struct image_type multiboot_image_type __image_type;
+struct image_type multiboot_image_type __image_type ( PROBE_MULTIBOOT );
/** Multiboot flags that we support */
#define MB_SUPPORTED_FLAGS ( MB_FLAG_PGALIGN | MB_FLAG_MEMMAP | \
@@ -320,7 +320,7 @@ int multiboot_load ( struct image *image ) {
}
/** Multiboot image type */
-struct image_type multiboot_image_type __image_type = {
+struct image_type multiboot_image_type __image_type ( PROBE_MULTIBOOT ) = {
.name = "Multiboot",
.load = multiboot_load,
.exec = multiboot_exec,