diff --git a/sys/i386/boot/Makefile b/sys/i386/boot/Makefile index 4f7915d74c9..5f5ce82c3b4 100644 --- a/sys/i386/boot/Makefile +++ b/sys/i386/boot/Makefile @@ -20,7 +20,7 @@ # the rights to redistribute these changes. # # from: Mach, Revision 2.2 92/04/04 11:33:46 rpd -# $Id: Makefile,v 1.4 1993/11/16 02:02:05 ache Exp $ +# $Id: Makefile,v 1.5 1993/12/11 20:35:15 ats Exp $ # wd0: @@ -32,7 +32,7 @@ wd0: NOPROG= noprog NOMAN= noman -CFLAGS = -O -DDO_BAD144 -I${.CURDIR} +CFLAGS = -O2 -DDO_BAD144 -I${.CURDIR} LIBS= -lc INC= -I${.CURDIR}/../.. diff --git a/sys/i386/boot/biosboot/Makefile b/sys/i386/boot/biosboot/Makefile index 4f7915d74c9..5f5ce82c3b4 100644 --- a/sys/i386/boot/biosboot/Makefile +++ b/sys/i386/boot/biosboot/Makefile @@ -20,7 +20,7 @@ # the rights to redistribute these changes. # # from: Mach, Revision 2.2 92/04/04 11:33:46 rpd -# $Id: Makefile,v 1.4 1993/11/16 02:02:05 ache Exp $ +# $Id: Makefile,v 1.5 1993/12/11 20:35:15 ats Exp $ # wd0: @@ -32,7 +32,7 @@ wd0: NOPROG= noprog NOMAN= noman -CFLAGS = -O -DDO_BAD144 -I${.CURDIR} +CFLAGS = -O2 -DDO_BAD144 -I${.CURDIR} LIBS= -lc INC= -I${.CURDIR}/../.. diff --git a/sys/i386/boot/biosboot/boot.c b/sys/i386/boot/biosboot/boot.c index 50f39dfe710..b77986b1312 100644 --- a/sys/i386/boot/biosboot/boot.c +++ b/sys/i386/boot/biosboot/boot.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, [92/04/03 16:51:14 rvb] - * $Id: boot.c,v 1.10 1994/04/20 22:06:24 phk Exp $ + * $Id: boot.c,v 1.11 1994/05/01 03:53:29 martin Exp $ */ @@ -60,8 +60,7 @@ struct exec head; int argv[10], esym; char *name; char *names[] = { - "/386bsd", "/o386bsd", "/386bsd.old", - "/vmunix", "/ovmunix", "/vmunix.old" + "/386bsd", "/o386bsd", "/386bsd.old" }; #define NUMNAMES (sizeof(names)/sizeof(char *)) @@ -76,7 +75,7 @@ int drive; ouraddr, argv[7] = memsize(0), argv[8] = memsize(1), - "$Revision: 1.10 $"); + "$Revision: 1.11 $"); printf("use hd(1,a)/386bsd to boot sd0 when wd0 is also installed\n"); gateA20(); loadstart: @@ -143,8 +142,8 @@ loadprog(howto) } if((addr + head.a_text + head.a_data + head.a_bss) > 0xa0000) { - printf("kernel too big, won't fit in 640K with bss\n"); - printf("Only hope is to link the kernel for > 1MB\n"); + printf("kernel won't fit in 640K with bss\n"); + printf("only hope is to link it for > 1MB\n"); return; } } diff --git a/sys/i386/boot/boot.c b/sys/i386/boot/boot.c index 50f39dfe710..b77986b1312 100644 --- a/sys/i386/boot/boot.c +++ b/sys/i386/boot/boot.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, [92/04/03 16:51:14 rvb] - * $Id: boot.c,v 1.10 1994/04/20 22:06:24 phk Exp $ + * $Id: boot.c,v 1.11 1994/05/01 03:53:29 martin Exp $ */ @@ -60,8 +60,7 @@ struct exec head; int argv[10], esym; char *name; char *names[] = { - "/386bsd", "/o386bsd", "/386bsd.old", - "/vmunix", "/ovmunix", "/vmunix.old" + "/386bsd", "/o386bsd", "/386bsd.old" }; #define NUMNAMES (sizeof(names)/sizeof(char *)) @@ -76,7 +75,7 @@ int drive; ouraddr, argv[7] = memsize(0), argv[8] = memsize(1), - "$Revision: 1.10 $"); + "$Revision: 1.11 $"); printf("use hd(1,a)/386bsd to boot sd0 when wd0 is also installed\n"); gateA20(); loadstart: @@ -143,8 +142,8 @@ loadprog(howto) } if((addr + head.a_text + head.a_data + head.a_bss) > 0xa0000) { - printf("kernel too big, won't fit in 640K with bss\n"); - printf("Only hope is to link the kernel for > 1MB\n"); + printf("kernel won't fit in 640K with bss\n"); + printf("only hope is to link it for > 1MB\n"); return; } }