diff options
| author | Robert Millan <rmh@aybabtu.com> | 2008-11-11 20:20:54 +0000 |
|---|---|---|
| committer | Jordan Crouse <jordan.crouse@amd.com> | 2008-11-11 20:20:54 +0000 |
| commit | 81af3d4a0077f354029e92aea71eb737d20f6a3e (patch) | |
| tree | a6ff46fe806d5ad57f23a3b398e3ae6772eef477 /src/arch/i386/boot/tables.c | |
| parent | 5cb4d9d663d2ed5b8225dbbb00507637016d3fc4 (diff) | |
[PATCH] coreboot-v2: Add multiboot support
Signed-off-by: Robert Millan <rmh@aybabtu.com>
Acked-by: Jordan Crouse <jordan@cosmicpneguin.net>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3745 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/arch/i386/boot/tables.c')
| -rw-r--r-- | src/arch/i386/boot/tables.c | 9 |
1 files changed, 9 insertions, 0 deletions
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); |