Fix for install/40961: The RAMDISK kernel has grown significantly

since bootst was written. Grab 3MB of the kernel image from tape
in hackprom_diskrd() instead of 2MB.

Bump bootst version on account of the above fix.

While here, use -Os instead of -O2 to compile mvme68k stand code.
This commit is contained in:
scw 2009-04-11 10:56:12 +00:00
parent 31582cc99b
commit 403ccaeac2
3 changed files with 7 additions and 6 deletions

View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile.booters,v 1.17 2009/04/03 10:38:13 tsutsui Exp $ # $NetBSD: Makefile.booters,v 1.18 2009/04/11 10:56:12 scw Exp $
S?= ${.CURDIR}/../../../.. S?= ${.CURDIR}/../../../..
MDEC_DIR?= /usr/mdec MDEC_DIR?= /usr/mdec
RELOC?= 0x3F0000 RELOC?= 0x3F0000
COPTS?= -O2 -Wall -Wno-main -Wmissing-prototypes -Wstrict-prototypes \ COPTS?= -Os -Wall -Wno-main -Wmissing-prototypes -Wstrict-prototypes \
-ffreestanding -ffreestanding -fomit-frame-pointer
DEFS?= DEFS?=
STRIPFLAG?= STRIPFLAG?=

View File

@ -1,4 +1,4 @@
/* $NetBSD: dev_tape.c,v 1.10 2008/04/28 20:23:29 martin Exp $ */ /* $NetBSD: dev_tape.c,v 1.11 2009/04/11 10:56:13 scw Exp $ */
/*- /*-
* Copyright (c) 1998 The NetBSD Foundation, Inc. * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -169,7 +169,7 @@ hackprom_diskrd(struct mvmeprom_dskio *ti)
static int blkoffset = 0; static int blkoffset = 0;
#define hackload_addr ((char *)0x080000) /* Load tape segment here */ #define hackload_addr ((char *)0x080000) /* Load tape segment here */
#define hackload_blocks 0x2000 /* 2Mb worth */ #define hackload_blocks 0x3000 /* 3Mb worth */
if ((ti->flag & IGNORE_FILENUM) == 0) { if ((ti->flag & IGNORE_FILENUM) == 0) {
/* /*

View File

@ -1,7 +1,8 @@
$NetBSD: version,v 1.4 2001/11/09 19:53:14 scw Exp $ $NetBSD: version,v 1.5 2009/04/11 10:56:13 scw Exp $
1.1: Initial bootst (from Dale Rahn) 1.1: Initial bootst (from Dale Rahn)
1.2: Update based on sun3 tapeboot (by Chuck Cranor) 1.2: Update based on sun3 tapeboot (by Chuck Cranor)
1.3: Support verbose/quiet boot. 1.3: Support verbose/quiet boot.
1.4: loadfile() update: ELF symbols no longer need backward seeks. 1.4: loadfile() update: ELF symbols no longer need backward seeks.
1.5: loadfile() update to avoid backwards seeks for ELF Program Headers. 1.5: loadfile() update to avoid backwards seeks for ELF Program Headers.
1.6: hackprom_diskrd() needs loads up to 3MB from tape for current kernels.