Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/x68k/stand/boot Be silent.



details:   https://anonhg.NetBSD.org/src/rev/2b4c771a7db4
branches:  trunk
changeset: 778234:2b4c771a7db4
user:      minoura <minoura%NetBSD.org@localhost>
date:      Tue Mar 20 12:37:01 2012 +0000

description:
Be silent.

diffstat:

 sys/arch/x68k/stand/boot/Makefile |  4 ++--
 sys/arch/x68k/stand/boot/boot.c   |  8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diffs (59 lines):

diff -r 9613993584e8 -r 2b4c771a7db4 sys/arch/x68k/stand/boot/Makefile
--- a/sys/arch/x68k/stand/boot/Makefile Tue Mar 20 12:04:01 2012 +0000
+++ b/sys/arch/x68k/stand/boot/Makefile Tue Mar 20 12:37:01 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.21 2011/12/25 06:09:09 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.22 2012/03/20 12:37:01 minoura Exp $
 
 NOMAN=         # defined
 
@@ -32,7 +32,7 @@
 CLEANFILES+=   vers.c
 vers.c:        ${VERSIONFILE}
        ${_MKTARGET_CREATE}
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+       ${HOST_SH} ${S}/conf/newvers_stand.sh \
            ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}
 
 CPPFLAGS+=     -nostdinc -I$S -I${.OBJDIR} -I$M/stand/libsa
diff -r 9613993584e8 -r 2b4c771a7db4 sys/arch/x68k/stand/boot/boot.c
--- a/sys/arch/x68k/stand/boot/boot.c   Tue Mar 20 12:04:01 2012 +0000
+++ b/sys/arch/x68k/stand/boot/boot.c   Tue Mar 20 12:37:01 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot.c,v 1.17 2011/12/25 06:09:09 tsutsui Exp $        */
+/*     $NetBSD: boot.c,v 1.18 2012/03/20 12:37:01 minoura Exp $        */
 
 /*
  * Copyright (c) 2001 Minoura Makoto
@@ -124,8 +124,10 @@
                printf("XXX: unknown corruption in /boot.\n");
        }
 
+#ifdef DEBUG
        printf("dev = %x, unit = %d, part = %c, name = %s\n",
               dev, unit, part + 'a', name);
+#endif
 
        if (dev == 0) {         /* SCSI */
                dev = X68K_MAKESCSIBOOTDEV(X68K_MAJOR_SD,
@@ -135,6 +137,7 @@
        } else {
                dev = X68K_MAKEBOOTDEV(X68K_MAJOR_FD, unit & 3, 0);
        }
+#ifdef DEBUG
        printf("boot device = %x\n", dev);
        printf("if = %d, unit = %d, id = %d, lun = %d, part = %c\n",
               B_X68K_SCSI_IF(dev),
@@ -142,9 +145,12 @@
               B_X68K_SCSI_ID(dev),
               B_X68K_SCSI_LUN(dev),
               B_X68K_SCSI_PART(dev) + 'a');
+#endif
 
        p = ((short*) marks[MARK_ENTRY]) - 1;
+#ifdef DEBUG
        printf("Kernel Version: 0x%x\n", *p);
+#endif
        if (*p != 0x4e73 && *p != 0) {
                /*
                 * XXX temporary solution; compatibility loader



Home | Main Index | Thread Index | Old Index