Module Name: src
Committed By: martin
Date: Tue Sep 3 14:18:32 UTC 2019
Modified Files:
src/sys/arch/prep/stand/boot: Makefile boot.c
Log Message:
PR 54394: do not compile in experimental SCSI support by default,
#ifdef it out as it breaks some machines. Based on a patch by
Ulrich Teichert, with #ifdef instead of comments suggested by nonaka@.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/prep/stand/boot/Makefile
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/prep/stand/boot/boot.c
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/prep/stand/boot/Makefile
diff -u src/sys/arch/prep/stand/boot/Makefile:1.30 src/sys/arch/prep/stand/boot/Makefile:1.31
--- src/sys/arch/prep/stand/boot/Makefile:1.30 Sat Apr 8 19:53:22 2017
+++ src/sys/arch/prep/stand/boot/Makefile Tue Sep 3 14:18:32 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2017/04/08 19:53:22 christos Exp $
+# $NetBSD: Makefile,v 1.31 2019/09/03 14:18:32 martin Exp $
NOMAN= # defined
@@ -32,6 +32,7 @@ CPPFLAGS= -nostdinc -I${.OBJDIR} -I${MKB
CPPFLAGS+= -D_STANDALONE -DRELOC=${RELOC} -DUSE_SCAN
CPPFLAGS+= -D__daddr_t=int32_t
#CPPFLAGS+= -DDBMONITOR
+#CPPFLAGS+= -DSCSI_SUPPORT # experimental
.if (${BASE} == "boot")
CPPFLAGS+= -DCONS_VGA -DVGA_RESET
Index: src/sys/arch/prep/stand/boot/boot.c
diff -u src/sys/arch/prep/stand/boot/boot.c:1.20 src/sys/arch/prep/stand/boot/boot.c:1.21
--- src/sys/arch/prep/stand/boot/boot.c:1.20 Fri Aug 8 19:45:48 2014
+++ src/sys/arch/prep/stand/boot/boot.c Tue Sep 3 14:18:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.20 2014/08/08 19:45:48 joerg Exp $ */
+/* $NetBSD: boot.c,v 1.21 2019/09/03 14:18:32 martin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -46,7 +46,9 @@
#include "sdvar.h"
char *names[] = {
+#ifdef SCSI_SUPPORT
"sd(0,0,0)netbsd", "sd(0,0,0)onetbsd",
+#endif
"in()",
};
#define NUMNAMES (sizeof (names) / sizeof (names[0]))
@@ -142,10 +144,12 @@ boot(void *resp, u_long loadaddr)
printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
printf("\n");
+#ifdef SCSI_SUPPORT
/*
* Initialize siop@pci0 dev 16 func 0
*/
siop_init(0, 16, 0);
+#endif
for (;;) {
name = names[n++];
