Module Name: src
Committed By: snj
Date: Wed Apr 15 21:05:16 UTC 2009
Modified Files:
src/sys/arch/mvme68k/stand [netbsd-4-0]: Makefile.booters
src/sys/arch/mvme68k/stand/bootst [netbsd-4-0]: dev_tape.c version
Log Message:
Pull up following revision(s) (requested by scw in ticket #1304):
sys/arch/mvme68k/stand/Makefile.booters: revision 1.18
sys/arch/mvme68k/stand/bootst/dev_tape.c: revision 1.11
sys/arch/mvme68k/stand/bootst/version: revision 1.5
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.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.68.1 src/sys/arch/mvme68k/stand/Makefile.booters
cvs rdiff -u -r1.7 -r1.7.34.1 src/sys/arch/mvme68k/stand/bootst/dev_tape.c
cvs rdiff -u -r1.4 -r1.4.112.1 src/sys/arch/mvme68k/stand/bootst/version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mvme68k/stand/Makefile.booters
diff -u src/sys/arch/mvme68k/stand/Makefile.booters:1.14 src/sys/arch/mvme68k/stand/Makefile.booters:1.14.68.1
--- src/sys/arch/mvme68k/stand/Makefile.booters:1.14 Sat Dec 24 22:22:33 2005
+++ src/sys/arch/mvme68k/stand/Makefile.booters Wed Apr 15 21:05:16 2009
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.booters,v 1.14 2005/12/24 22:22:33 tsutsui Exp $
+# $NetBSD: Makefile.booters,v 1.14.68.1 2009/04/15 21:05:16 snj Exp $
S?= ${.CURDIR}/../../../..
MDEC_DIR?= /usr/mdec
RELOC?= 0x3F0000
-COPTS?= -O2 -Wall -Wno-main -Wmissing-prototypes -Wstrict-prototypes \
- -ffreestanding
+COPTS?= -Os -Wall -Wno-main -Wmissing-prototypes -Wstrict-prototypes \
+ -ffreestanding -fomit-frame-pointer
DEFS?=
STRIPFLAG?=
Index: src/sys/arch/mvme68k/stand/bootst/dev_tape.c
diff -u src/sys/arch/mvme68k/stand/bootst/dev_tape.c:1.7 src/sys/arch/mvme68k/stand/bootst/dev_tape.c:1.7.34.1
--- src/sys/arch/mvme68k/stand/bootst/dev_tape.c:1.7 Sun Dec 11 12:18:19 2005
+++ src/sys/arch/mvme68k/stand/bootst/dev_tape.c Wed Apr 15 21:05:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dev_tape.c,v 1.7 2005/12/11 12:18:19 christos Exp $ */
+/* $NetBSD: dev_tape.c,v 1.7.34.1 2009/04/15 21:05:16 snj Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -185,7 +185,7 @@
static int blkoffset = 0;
#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 ) {
/*
Index: src/sys/arch/mvme68k/stand/bootst/version
diff -u src/sys/arch/mvme68k/stand/bootst/version:1.4 src/sys/arch/mvme68k/stand/bootst/version:1.4.112.1
--- src/sys/arch/mvme68k/stand/bootst/version:1.4 Fri Nov 9 19:53:14 2001
+++ src/sys/arch/mvme68k/stand/bootst/version Wed Apr 15 21:05:16 2009
@@ -1,7 +1,8 @@
-$NetBSD: version,v 1.4 2001/11/09 19:53:14 scw Exp $
+$NetBSD: version,v 1.4.112.1 2009/04/15 21:05:16 snj Exp $
1.1: Initial bootst (from Dale Rahn)
1.2: Update based on sun3 tapeboot (by Chuck Cranor)
1.3: Support verbose/quiet boot.
1.4: loadfile() update: ELF symbols no longer need backward seeks.
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.
