4 files changed, 138 insertions, 2 deletions
diff --git a/src/arch/i386/boot/Config.lb b/src/arch/i386/boot/Config.lb
index 4f8a8680ec..bacd1b0181 100644
--- a/src/arch/i386/boot/Config.lb
+++ b/src/arch/i386/boot/Config.lb
@@ -1,8 +1,12 @@
 uses HAVE_PIRQ_TABLE
 uses HAVE_ACPI_TABLES
+uses CONFIG_MULTIBOOT
 
 object boot.o
 object coreboot_table.o
+if CONFIG_MULTIBOOT
+object multiboot.o
+end
 object tables.o
 if HAVE_PIRQ_TABLE
 object pirq_routing.o 
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 <boot/elf.h>
 #include <boot/elf_boot.h>
 #include <string.h>
+#include <cpu/x86/multiboot.h>
 
 
 #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
 		);
 }
 
diff --git a/src/arch/i386/boot/multiboot.c b/src/arch/i386/boot/multiboot.c
new file mode 100644
index 0000000000..af9b625877
--- /dev/null
+++ b/src/arch/i386/boot/multiboot.c
@@ -0,0 +1,117 @@
+/*
+ * support for Multiboot payloads
+ *
+ * Copyright (C) 2008 Robert Millan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <cpu/x86/multiboot.h>
+#include <string.h>
+#include <device/resource.h>
+#include <console/console.h>
+
+typedef unsigned long long u64;
+
+static struct multiboot_mmap_entry *mb_mem;
+struct multiboot_info *mbi;
+
+static struct {
+	u64 addr;
+	u64 len;
+} reserved_mem[2];
+
+static void build_mb_mem_range_nooverlap(u64 addr, u64 len)
+{
+	int i;
+	for (i = 0; i < sizeof(reserved_mem) / sizeof(reserved_mem[0]); i++) {
+		/* free region fully contained in reserved region, abort */
+		if (addr >= reserved_mem[i].addr && addr + len <= reserved_mem[i].addr + reserved_mem[i].len)
+			return;
+		/* reserved region splits free region */
+		if (addr < reserved_mem[i].addr && addr + len > reserved_mem[i].addr + reserved_mem[i].len) {
+			build_mb_mem_range_nooverlap(addr, reserved_mem[i].addr - addr);
+			build_mb_mem_range_nooverlap(reserved_mem[i].addr + reserved_mem[i].len, (addr + len) - (reserved_mem[i].addr + reserved_mem[i].len));
+			return;
+		}
+		/* left overlap */
+		if (addr < reserved_mem[i].addr + reserved_mem[i].len && addr + len > reserved_mem[i].addr + reserved_mem[i].len) {
+			len += addr;
+			addr = reserved_mem[i].addr + reserved_mem[i].len;
+			len -= addr;
+			/* len += addr - old_addr */
+			continue;
+		}
+		/* right overlap */
+		if (addr < reserved_mem[i].addr && addr + len > reserved_mem[i].addr) {
+			len = reserved_mem[i].addr - addr;
+			continue;
+		}
+		/* none of the above, just add it */
+	}
+
+	mb_mem->addr = addr;
+	mb_mem->len = len;
+	mb_mem->type = 1;
+	mb_mem->size = sizeof(*mb_mem) - sizeof(mb_mem->size);
+	mb_mem++;
+}
+
+static void build_mb_mem_range(void *gp, struct device *dev, struct resource *res)
+{
+	build_mb_mem_range_nooverlap(res->base, res->size);
+}
+
+#define ROUND(_r,_a) ((_r) + (((_a) - 1)) & ~((_a) - 1))
+
+unsigned long write_multiboot_info(
+	unsigned long low_table_start, unsigned long low_table_end,
+	unsigned long rom_table_start, unsigned long rom_table_end)
+{
+	struct multiboot_info *mbi;
+	int i;
+
+	mbi = rom_table_end;
+	memset(mbi, 0, sizeof(*mbi));
+	rom_table_end += sizeof(*mbi);
+
+	mbi->mmap_addr = (u32) rom_table_end;
+	mb_mem = rom_table_end;
+
+	/* reserved regions */
+	reserved_mem[0].addr = low_table_start;
+	reserved_mem[0].len = ROUND(low_table_end - low_table_start, 4096);
+	reserved_mem[1].addr = rom_table_start;
+	reserved_mem[1].len = ROUND(rom_table_end - rom_table_start, 4096);
+
+	for (i = 0; i < sizeof(reserved_mem) / sizeof(reserved_mem[0]); i++) {
+		mb_mem->addr = reserved_mem[i].addr;
+		mb_mem->len = reserved_mem[i].len;
+		mb_mem->type = 2;
+		mb_mem->size = sizeof(*mb_mem) - sizeof(mb_mem->size);
+		mb_mem++;
+	}
+
+	/* free regions */
+	search_global_resources( IORESOURCE_MEM | IORESOURCE_CACHEABLE,
+		IORESOURCE_MEM | IORESOURCE_CACHEABLE, build_mb_mem_range, NULL);
+
+	mbi->mmap_length = ((u32) mb_mem) - mbi->mmap_addr;
+	mbi->flags |= MB_INFO_MEM_MAP;
+
+	printk_info("Multiboot Information structure has been written.\n");
+
+	return mb_mem;
+}
diff --git a/src/arch/i386/boot/tables.c b/src/arch/i386/boot/tables.c
index 373a0f9bfc..5201010f01 100644
--- a/src/arch/i386/boot/tables.c
+++ b/src/arch/i386/boot/tables.c
@@ -9,6 +9,7 @@
 #include <arch/smp/mpspec.h>
 #include <arch/acpi.h>
 #include <string.h>
+#include <cpu/x86/multiboot.h>
 #include "coreboot_table.h"
 
 // Global Descriptor Table, defined in c_start.S
@@ -106,6 +107,14 @@ struct lb_memory *write_tables(void)
 	move_gdt(low_table_end);
 	low_table_end += &gdt_end - &gdt;
 
+#if CONFIG_MULTIBOOT
+	/* The Multiboot information structure */
+	mbi = rom_table_end;
+	rom_table_end = write_multiboot_info(
+				low_table_start, low_table_end,
+				rom_table_start, rom_table_end);
+#endif
+
 	/* The coreboot table must be in 0-4K or 960K-1M */
 	write_coreboot_table(low_table_start, low_table_end,
 			      rom_table_start, rom_table_end);