mirror of
https://github.com/freebsd/freebsd-src.git
synced 2024-11-29 19:43:41 +00:00
Merged from sys/boot/i386/loader/main.c revision 1.21.
This commit is contained in:
parent
7a6306f62f
commit
54bb2a24af
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=67136
@ -70,11 +70,6 @@ extern char bootprog_name[], bootprog_rev[], bootprog_date[], bootprog_maker[];
|
|||||||
/* XXX debugging */
|
/* XXX debugging */
|
||||||
extern char end[];
|
extern char end[];
|
||||||
|
|
||||||
/* XXX - I dont know why we have to do this, but it helps. */
|
|
||||||
#if defined(LOADER_NFS_SUPPORT) || defined(LOADER_TFTP_SUPPORT)
|
|
||||||
char Heap[200*1024];
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void
|
void
|
||||||
main(void)
|
main(void)
|
||||||
{
|
{
|
||||||
@ -91,12 +86,7 @@ main(void)
|
|||||||
*/
|
*/
|
||||||
bios_getmem();
|
bios_getmem();
|
||||||
|
|
||||||
/* XXX - I dont know why we have to do this, but it helps PXE. */
|
|
||||||
#if defined(LOADER_NFS_SUPPORT) || defined(LOADER_TFTP_SUPPORT)
|
|
||||||
setheap(Heap, Heap+sizeof(Heap));
|
|
||||||
#else
|
|
||||||
setheap((void *)end, (void *)bios_basemem);
|
setheap((void *)end, (void *)bios_basemem);
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* XXX Chicken-and-egg problem; we want to have console output early, but some
|
* XXX Chicken-and-egg problem; we want to have console output early, but some
|
||||||
|
Loading…
Reference in New Issue
Block a user