Updated to match the changes in the boot loader.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7291 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -18,6 +18,7 @@ ObjectsDefines
|
|||||||
elf.cpp
|
elf.cpp
|
||||||
menu.cpp
|
menu.cpp
|
||||||
loader.cpp
|
loader.cpp
|
||||||
|
kernel_args.cpp
|
||||||
|
|
||||||
# partitions
|
# partitions
|
||||||
amiga_rdb.cpp
|
amiga_rdb.cpp
|
||||||
@@ -49,7 +50,7 @@ ObjectsDefines
|
|||||||
# SubDirC++Flags -include /usr/include/stdio.h ;
|
# SubDirC++Flags -include /usr/include/stdio.h ;
|
||||||
} else {
|
} else {
|
||||||
# SubDirC++Flags -include /boot/develop/headers/posix/stdio.h ;
|
# SubDirC++Flags -include /boot/develop/headers/posix/stdio.h ;
|
||||||
SubDirC++Flags $(defines) -DHAVE_READ_POS=1 ; # -fcheck-memory-usage -D_NO_INLINE_ASM ;
|
SubDirC++Flags $(defines) -DHAVE_READ_POS=1 -fcheck-memory-usage -D_NO_INLINE_ASM ;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -71,6 +72,7 @@ SimpleTest BootLoaderTest :
|
|||||||
elf.cpp
|
elf.cpp
|
||||||
menu.cpp
|
menu.cpp
|
||||||
loader.cpp
|
loader.cpp
|
||||||
|
kernel_args.cpp
|
||||||
|
|
||||||
# partitioning systems
|
# partitioning systems
|
||||||
amiga_rdb.cpp
|
amiga_rdb.cpp
|
||||||
@@ -97,6 +99,7 @@ SEARCH on [ FGristFiles
|
|||||||
main.cpp vfs.cpp partitions.cpp
|
main.cpp vfs.cpp partitions.cpp
|
||||||
heap.cpp RootFileSystem.cpp
|
heap.cpp RootFileSystem.cpp
|
||||||
elf.cpp menu.cpp loader.cpp
|
elf.cpp menu.cpp loader.cpp
|
||||||
|
kernel_args.cpp
|
||||||
] = [ FDirName $(OBOS_TOP) src kernel boot loader ] ;
|
] = [ FDirName $(OBOS_TOP) src kernel boot loader ] ;
|
||||||
|
|
||||||
# partitioning system modules
|
# partitioning system modules
|
||||||
|
|||||||
@@ -91,8 +91,8 @@ platform_get_boot_device(struct stage2_args *args, Node **_device)
|
|||||||
|
|
||||||
|
|
||||||
status_t
|
status_t
|
||||||
platform_get_boot_partition(struct stage2_args *args, NodeList *list,
|
platform_get_boot_partition(struct stage2_args *args, Node *device,
|
||||||
boot::Partition **_partition)
|
NodeList *list, boot::Partition **_partition)
|
||||||
{
|
{
|
||||||
NodeIterator iterator = list->Iterator();
|
NodeIterator iterator = list->Iterator();
|
||||||
boot::Partition *partition = NULL;
|
boot::Partition *partition = NULL;
|
||||||
|
|||||||
@@ -1,13 +1,23 @@
|
|||||||
/*
|
/*
|
||||||
** Copyright 2003, Axel Dörfler, [email protected]. All rights reserved.
|
** Copyright 2003-2004, Axel Dörfler, [email protected]. All rights reserved.
|
||||||
** Distributed under the terms of the OpenBeOS License.
|
** Distributed under the terms of the OpenBeOS License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include <boot/platform.h>
|
#include <boot/platform.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
|
|
||||||
extern "C" int boot_main(struct stage2_args *args);
|
extern "C" int boot_main(struct stage2_args *args);
|
||||||
|
extern addr_t gKernelEntry;
|
||||||
|
|
||||||
|
|
||||||
|
void
|
||||||
|
platform_start_kernel(void)
|
||||||
|
{
|
||||||
|
printf("*** jump to kernel at %p ***\n*** program exits.\n", (void *)gKernelEntry);
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
|
|||||||
Reference in New Issue
Block a user