diff options
author | msmith <msmith@FreeBSD.org> | 1998-10-22 20:23:58 +0000 |
---|---|---|
committer | msmith <msmith@FreeBSD.org> | 1998-10-22 20:23:58 +0000 |
commit | 2cb346f288aa56a722f70761a0d1f0257710d4b7 (patch) | |
tree | d507435263c3a59aa5ad39ea5d106ae90359c303 /sys/boot | |
parent | 0d28177be834e6f3e60f0006759debb1a2606896 (diff) | |
download | FreeBSD-src-2cb346f288aa56a722f70761a0d1f0257710d4b7.zip FreeBSD-src-2cb346f288aa56a722f70761a0d1f0257710d4b7.tar.gz |
Add a dependancy on the BTX crt0 object
Add the biospnp handler to the pnp handler array
Drop some old debugging code
Diffstat (limited to 'sys/boot')
-rw-r--r-- | sys/boot/i386/loader/Makefile | 4 | ||||
-rw-r--r-- | sys/boot/i386/loader/conf.c | 4 | ||||
-rw-r--r-- | sys/boot/i386/loader/main.c | 6 |
3 files changed, 6 insertions, 8 deletions
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile index 6f85541..6acba9a 100644 --- a/sys/boot/i386/loader/Makefile +++ b/sys/boot/i386/loader/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.12 1998/10/14 07:08:16 peter Exp $ +# $Id: Makefile,v 1.13 1998/10/21 20:10:33 msmith Exp $ BASE= loader PROG= ${BASE} @@ -59,7 +59,7 @@ vers.o: sh ${.CURDIR}/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} ${CC} -c vers.c -${BASE}: ${BASE}.bin ${BTXLDR} ${BTXKERN} +${BASE}: ${BASE}.bin ${BTXLDR} ${BTXKERN} ${BTXCRT} btxld -v -f aout -e 0x100000 -o ${.TARGET} -l ${BTXLDR} -b ${BTXKERN} \ ${BASE}.bin diff --git a/sys/boot/i386/loader/conf.c b/sys/boot/i386/loader/conf.c index b17a308..d017f64 100644 --- a/sys/boot/i386/loader/conf.c +++ b/sys/boot/i386/loader/conf.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: conf.c,v 1.7 1998/10/07 02:39:32 msmith Exp $ + * $Id: conf.c,v 1.8 1998/10/21 20:10:33 msmith Exp $ */ #include <stand.h> @@ -85,9 +85,11 @@ struct console *consoles[] = { }; extern struct pnphandler isapnphandler; +extern struct pnphandler biospnphandler; /* extern struct pnphandler pcipnphandler;*/ struct pnphandler *pnphandlers[] = { + &biospnphandler, /* should go first, as it may set isapnp_readport */ &isapnphandler, /* &pcipnphandler, */ NULL diff --git a/sys/boot/i386/loader/main.c b/sys/boot/i386/loader/main.c index 4847a6c..2e0ed80 100644 --- a/sys/boot/i386/loader/main.c +++ b/sys/boot/i386/loader/main.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: main.c,v 1.11 1998/10/04 09:12:54 msmith Exp $ + * $Id: main.c,v 1.12 1998/10/21 20:10:33 msmith Exp $ */ /* @@ -107,10 +107,6 @@ main(void) printf("\n"); printf("%s, Revision %s %d/%dkB\n", bootprog_name, bootprog_rev, getbasemem(), getextmem()); printf("(%s, %s)\n", bootprog_maker, bootprog_date); -#if 0 - printf("recovered args howto = 0x%x bootdev = 0x%x bootinfo = %p\n", - initial_howto, initial_bootdev, initial_bootinfo); -#endif extract_currdev(); /* set $currdev and $loaddev */ setenv("LINES", "24", 1); /* optional */ |