Remove the -b boot option. It is no longer necessary now that the VESA

BIOS support is optionally available for syscons.
This commit is contained in:
Kazutaka YOKOTA 1998-09-23 06:50:45 +00:00
parent 51a6b2cbda
commit 3cd3a6936b
3 changed files with 3 additions and 42 deletions

View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.64 1998/05/27 12:13:18 jkoshy Exp $
# $Id: Makefile,v 1.65 1998/09/15 09:59:57 gibbs Exp $
#
PROG= boot
@ -13,7 +13,6 @@ CFLAGS= -O2 -malign-functions=0 -malign-jumps=0 -malign-loops=0 \
-DBOOTWAIT=${BOOTWAIT} -DTIMEOUT=${TIMEOUT}
CFLAGS+= -DBOOTSEG=${BOOTSEG} -DBOOTSTACK=${BOOTSTACK}
CFLAGS+= -DDO_BAD144
CFLAGS+= -DVESA_SUPPORT
CFLAGS+= ${CWARNFLAGS}
# By default, if a serial port is going to be used as console, use COM1

View File

@ -24,7 +24,7 @@
* the rights to redistribute these changes.
*
* from: Mach, Revision 2.2 92/04/04 11:34:26 rpd
* $Id: bios.S,v 1.12 1997/07/31 08:07:53 phk Exp $
* $Id: bios.S,v 1.13 1998/08/04 00:39:45 msmith Exp $
*/
/*
@ -476,31 +476,3 @@ xdone:
pop %ebx
pop %ebp
ret
#ifdef VESA_SUPPORT
ENTRY(vesa_mode)
push %ebp
mov %esp, %ebp
push %ebx
push %esi
push %edi
movw 0x8(%ebp), %bx
call EXT(prot_to_real)
data32
mov $0x4f02, %eax
sti
int $0x10
cli
data32
call EXT(real_to_prot)
pop %edi
pop %esi
pop %ebx
pop %ebp
ret
#endif

View File

@ -24,7 +24,7 @@
* the rights to redistribute these changes.
*
* from: Mach, [92/04/03 16:51:14 rvb]
* $Id: boot.c,v 1.69 1997/08/31 06:11:26 phk Exp $
* $Id: boot.c,v 1.70 1998/02/01 05:24:24 yokota Exp $
*/
@ -203,12 +203,6 @@ loadprog(void)
unsigned pad;
char *s, *t;
#ifdef VESA_SUPPORT
if (bootinfo.bi_vesa)
vesa_mode(bootinfo.bi_vesa);
#endif
read((void *)&head, sizeof(head));
if ( N_BADMAG(head)) {
printf("Invalid format!\n");
@ -389,10 +383,6 @@ nextarg:
goto nextarg;
if (c == 'a')
f |= RB_ASKNAME;
#ifdef VESA_SUPPORT
if (c == 'b')
bootinfo.bi_vesa = 0x102;
#endif
if (c == 'C')
f |= RB_CDROM;
if (c == 'c')