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
This commit is contained in:
@@ -127,7 +127,7 @@ _start(void)
|
|||||||
console_init();
|
console_init();
|
||||||
cpu_init();
|
cpu_init();
|
||||||
mmu_init();
|
mmu_init();
|
||||||
//parse_multiboot_commandline(&args);
|
parse_multiboot_commandline(&args);
|
||||||
|
|
||||||
// wait a bit to give the user the opportunity to press a key
|
// wait a bit to give the user the opportunity to press a key
|
||||||
spin(750000);
|
spin(750000);
|
||||||
@@ -142,7 +142,7 @@ _start(void)
|
|||||||
acpi_init();
|
acpi_init();
|
||||||
smp_init();
|
smp_init();
|
||||||
//hpet_init(); // TODO: Not yet
|
//hpet_init(); // TODO: Not yet
|
||||||
//dump_multiboot_info();
|
dump_multiboot_info();
|
||||||
main(&args);
|
main(&args);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ local bios_ia32_src =
|
|||||||
keyboard.cpp
|
keyboard.cpp
|
||||||
menu.cpp
|
menu.cpp
|
||||||
mmu.cpp
|
mmu.cpp
|
||||||
|
multiboot.cpp
|
||||||
cpu.cpp
|
cpu.cpp
|
||||||
acpi.cpp
|
acpi.cpp
|
||||||
smp.cpp
|
smp.cpp
|
||||||
|
|||||||
@@ -200,6 +200,9 @@ pm_gdt_descriptor:
|
|||||||
/* global data table */
|
/* global data table */
|
||||||
.balign 8
|
.balign 8
|
||||||
|
|
||||||
|
GLOBAL(gMultiBootInfo):
|
||||||
|
.long 0
|
||||||
|
|
||||||
GLOBAL(gBootPartitionOffset):
|
GLOBAL(gBootPartitionOffset):
|
||||||
.long 0xffffffff
|
.long 0xffffffff
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user