[src/trunk]: src/sys/arch/prep/stand/boot PR 54394: do not compile in experim...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/169c80e4aba7
branches:  trunk
changeset: 459304:169c80e4aba7
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Sep 03 14:18:32 2019 +0000

description:
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@.

diffstat:

 sys/arch/prep/stand/boot/Makefile |  3 ++-
 sys/arch/prep/stand/boot/boot.c   |  6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diffs (49 lines):

diff -r 7a93c554990c -r 169c80e4aba7 sys/arch/prep/stand/boot/Makefile
--- a/sys/arch/prep/stand/boot/Makefile Tue Sep 03 13:43:34 2019 +0000
+++ b/sys/arch/prep/stand/boot/Makefile Tue Sep 03 14:18:32 2019 +0000
@@ -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+= -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
diff -r 7a93c554990c -r 169c80e4aba7 sys/arch/prep/stand/boot/boot.c
--- a/sys/arch/prep/stand/boot/boot.c   Tue Sep 03 13:43:34 2019 +0000
+++ b/sys/arch/prep/stand/boot/boot.c   Tue Sep 03 14:18:32 2019 +0000
@@ -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 @@
        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++];