summaryrefslogtreecommitdiffstats
path: root/sys/i386
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1997-08-31 06:11:26 +0000
committerphk <phk@FreeBSD.org>1997-08-31 06:11:26 +0000
commit2fd4aa4ddff6800e1a692d84c9a3fbf1ef3df97a (patch)
tree7808160d1e747d527192b16f9285a6a3ffc64cf8 /sys/i386
parent6152eccaa461fa864aad3ef2b61daed5e1d29c2f (diff)
downloadFreeBSD-src-2fd4aa4ddff6800e1a692d84c9a3fbf1ef3df97a.zip
FreeBSD-src-2fd4aa4ddff6800e1a692d84c9a3fbf1ef3df97a.tar.gz
Remove pbzero(), things we load zero their own bss.
Make VESA_SUPPORT default
Diffstat (limited to 'sys/i386')
-rw-r--r--sys/i386/boot/biosboot/Makefile4
-rw-r--r--sys/i386/boot/biosboot/asm.S36
-rw-r--r--sys/i386/boot/biosboot/boot.c4
-rw-r--r--sys/i386/boot/biosboot/boot.h3
4 files changed, 6 insertions, 41 deletions
diff --git a/sys/i386/boot/biosboot/Makefile b/sys/i386/boot/biosboot/Makefile
index 5c7871e..0c7fd9c 100644
--- a/sys/i386/boot/biosboot/Makefile
+++ b/sys/i386/boot/biosboot/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.58 1997/07/31 08:07:53 phk Exp $
+# $Id: Makefile,v 1.59 1997/07/31 11:30:30 phk Exp $
#
PROG= boot
@@ -13,7 +13,7 @@ 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+= -DVESA_SUPPORT
CFLAGS+= -I${.CURDIR}/../../..
CFLAGS+= ${CWARNFLAGS}
diff --git a/sys/i386/boot/biosboot/asm.S b/sys/i386/boot/biosboot/asm.S
index b0f66da..da01aca 100644
--- a/sys/i386/boot/biosboot/asm.S
+++ b/sys/i386/boot/biosboot/asm.S
@@ -24,7 +24,7 @@
* the rights to redistribute these changes.
*
* from: Mach, Revision 2.2 92/04/04 11:34:13 rpd
- * $Id$
+ * $Id: asm.S,v 1.11 1997/02/22 09:30:04 peter Exp $
*/
@@ -210,40 +210,6 @@ ourreturn:
jmp ourreturn
/*
- *
- * pbzero( dst, cnt)
- * where src is a virtual address and dst is a physical address
- */
-
-ENTRY(pbzero)
- push %ebp
- mov %esp, %ebp
- push %es
- push %esi
- push %edi
- push %ecx
-
- cld
-
- /* set %es to point at the flat segment */
- movw $0x10, %ax
- mov %ax, %es
-
- mov 0x8(%ebp), %edi /* destination */
- mov 0xc(%ebp), %ecx /* count */
- xorl %eax, %eax /* value 0 */
-
- rep
- stosb
-
- pop %ecx
- pop %edi
- pop %esi
- pop %es
- pop %ebp
-
- ret
-/*
* pcpy(src, dst, cnt)
* where src is a virtual address and dst is a physical address
*/
diff --git a/sys/i386/boot/biosboot/boot.c b/sys/i386/boot/biosboot/boot.c
index 8b1ae11..306aefe 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.67 1997/06/14 10:00:42 bde Exp $
+ * $Id: boot.c,v 1.68 1997/07/31 08:07:54 phk Exp $
*/
@@ -269,7 +269,7 @@ loadprog(void)
* nonexistent memory. A full symbol table is unlikely to fit on 4MB
* machines.
*/
- pbzero((void *)addr,head.a_bss);
+ /* kzip & kernel will zero their own bss */
addr += head.a_bss;
/* Pad to a page boundary. */
diff --git a/sys/i386/boot/biosboot/boot.h b/sys/i386/boot/biosboot/boot.h
index b5fb5b0..39eb9df 100644
--- a/sys/i386/boot/biosboot/boot.h
+++ b/sys/i386/boot/biosboot/boot.h
@@ -24,7 +24,7 @@
* the rights to redistribute these changes.
*
* from: Mach, Revision 2.2 92/04/04 11:35:03 rpd
- * $Id: boot.h,v 1.19 1997/06/09 05:10:55 bde Exp $
+ * $Id: boot.h,v 1.20 1997/07/12 10:23:17 joerg Exp $
*/
#include <sys/param.h>
@@ -54,7 +54,6 @@ void prot_to_real(void);
#endif
void startprog(unsigned int physaddr, int howto, int bootdev,
/* XXX struct bootinfo * */ unsigned int bootinfo);
-void pbzero(void *dst, size_t count);
void pcpy(const void *src, void *dst, size_t count);
/* bios.S */
OpenPOWER on IntegriCloud