fix REALBASEMEM/REALEXTMEM and defopt them while we're at it. from jason.
This commit is contained in:
parent
59e8a7a9a3
commit
2ff77ab154
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: files.i386,v 1.180 2001/01/17 00:07:25 fvdl Exp $
|
||||
# $NetBSD: files.i386,v 1.181 2001/02/11 19:03:47 chs Exp $
|
||||
#
|
||||
# new style config file for i386 architecture
|
||||
#
|
||||
|
@ -37,6 +37,9 @@ defopt PERFCTRS
|
|||
# X server support in console drivers
|
||||
defopt opt_xserver.h XSERVER XSERVER_DDB
|
||||
|
||||
# The REAL{BASE,EXT}MEM options
|
||||
defopt opt_realmem.h REALBASEMEM REALEXTMEM
|
||||
|
||||
# understand boot device passed by pre-1.3 bootblocks
|
||||
defopt COMPAT_OLDBOOT
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: locore.s,v 1.232 2000/12/12 20:22:49 mycroft Exp $ */
|
||||
/* $NetBSD: locore.s,v 1.233 2001/02/11 19:03:49 chs Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
|
||||
|
@ -83,6 +83,7 @@
|
|||
#include "opt_compat_oldboot.h"
|
||||
#include "opt_multiprocessor.h"
|
||||
#include "opt_lockdebug.h"
|
||||
#include "opt_realmem.h"
|
||||
|
||||
#include "npx.h"
|
||||
#include "assym.h"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.428 2001/01/17 00:07:26 fvdl Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.429 2001/02/11 19:03:50 chs Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
|
||||
|
@ -83,6 +83,7 @@
|
|||
#include "opt_compat_netbsd.h"
|
||||
#include "opt_cpureset_delay.h"
|
||||
#include "opt_compat_svr4.h"
|
||||
#include "opt_realmem.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
@ -1794,7 +1795,9 @@ init386(first_avail)
|
|||
{
|
||||
extern void consinit __P((void));
|
||||
extern struct extent *iomem_ex;
|
||||
#if !defined(REALBASEMEM) && !defined(REALEXTMEM)
|
||||
struct btinfo_memmap *bim;
|
||||
#endif
|
||||
struct region_descriptor region;
|
||||
int x, first16q;
|
||||
u_int64_t seg_start, seg_end;
|
||||
|
@ -1832,6 +1835,7 @@ init386(first_avail)
|
|||
*/
|
||||
pmap_bootstrap((vaddr_t)atdevbase + IOM_SIZE);
|
||||
|
||||
#if !defined(REALBASEMEM) && !defined(REALEXTMEM)
|
||||
/*
|
||||
* Check to see if we have a memory map from the BIOS (passed
|
||||
* to us by the boot program.
|
||||
|
@ -1933,6 +1937,7 @@ init386(first_avail)
|
|||
mem_cluster_cnt++;
|
||||
}
|
||||
}
|
||||
#endif /* ! REALBASEMEM && ! REALEXTMEM */
|
||||
|
||||
/*
|
||||
* If the loop above didn't find any valid segment, fall back to
|
||||
|
|
Loading…
Reference in New Issue