From 81af3d4a0077f354029e92aea71eb737d20f6a3e Mon Sep 17 00:00:00 2001 From: Robert Millan Date: Tue, 11 Nov 2008 20:20:54 +0000 Subject: [PATCH] coreboot-v2: Add multiboot support Signed-off-by: Robert Millan Acked-by: Jordan Crouse Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3745 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/arch/i386/boot/boot.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/arch/i386/boot/boot.c') diff --git a/src/arch/i386/boot/boot.c b/src/arch/i386/boot/boot.c index edba2d1c3d..c1cdf594a4 100644 --- a/src/arch/i386/boot/boot.c +++ b/src/arch/i386/boot/boot.c @@ -3,6 +3,7 @@ #include #include #include +#include #ifndef CMD_LINE @@ -139,7 +140,7 @@ void jmp_to_elf_entry(void *entry, unsigned long buffer) " rep movsl\n\t" /* Now jump to the loaded image */ - " movl $0x0E1FB007, %%eax\n\t" + " movl %5, %%eax\n\t" " movl 0(%%esp), %%ebx\n\t" " call *4(%%esp)\n\t" @@ -175,7 +176,12 @@ void jmp_to_elf_entry(void *entry, unsigned long buffer) :: "g" (lb_start), "g" (buffer), "g" (lb_size), - "g" (entry), "g"(adjusted_boot_notes) + "g" (entry), +#if CONFIG_MULTIBOOT + "g"(mbi), "g" (MB_MAGIC2) +#else + "g"(adjusted_boot_notes), "g" (0x0E1FB007) +#endif ); } -- cgit v1.2.3