From 2807c5413f4832cd3fe26968bc81087f0fcb564e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Wed, 12 Aug 2009 20:30:03 +0000
Subject: [PATCH] fix PXE build with multiboot. GRUB supports netboot btw,
 could be interesting to explore... but the pxe shell doesn't check for the
 info yet.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32289 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/system/boot/platform/bios_ia32/start.c     | 4 ++--
 src/system/boot/platform/pxe_ia32/Jamfile      | 1 +
 src/system/boot/platform/pxe_ia32/pxe_stage2.S | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/system/boot/platform/bios_ia32/start.c b/src/system/boot/platform/bios_ia32/start.c
index 896cd9a093..947f138e62 100644
--- a/src/system/boot/platform/bios_ia32/start.c
+++ b/src/system/boot/platform/bios_ia32/start.c
@@ -127,7 +127,7 @@ _start(void)
 	console_init();
 	cpu_init();
 	mmu_init();
-	//parse_multiboot_commandline(&args);
+	parse_multiboot_commandline(&args);
 
 	// wait a bit to give the user the opportunity to press a key
 	spin(750000);
@@ -142,7 +142,7 @@ _start(void)
 	acpi_init();
 	smp_init();
 	//hpet_init(); // TODO: Not yet
-	//dump_multiboot_info();
+	dump_multiboot_info();
 	main(&args);
 }
 
diff --git a/src/system/boot/platform/pxe_ia32/Jamfile b/src/system/boot/platform/pxe_ia32/Jamfile
index c9c2e8a9b1..397d03bf31 100644
--- a/src/system/boot/platform/pxe_ia32/Jamfile
+++ b/src/system/boot/platform/pxe_ia32/Jamfile
@@ -26,6 +26,7 @@ local bios_ia32_src =
 	keyboard.cpp
 	menu.cpp
 	mmu.cpp
+	multiboot.cpp
 	cpu.cpp
 	acpi.cpp
 	smp.cpp
diff --git a/src/system/boot/platform/pxe_ia32/pxe_stage2.S b/src/system/boot/platform/pxe_ia32/pxe_stage2.S
index bdeaefbf24..cda8fc4ea7 100644
--- a/src/system/boot/platform/pxe_ia32/pxe_stage2.S
+++ b/src/system/boot/platform/pxe_ia32/pxe_stage2.S
@@ -200,6 +200,9 @@ pm_gdt_descriptor:
 /* global data table */
 .balign 8
 
+GLOBAL(gMultiBootInfo):
+	.long	0
+
 GLOBAL(gBootPartitionOffset):
 	.long	0xffffffff