[src/trunk]: src/sys/arch/alpha/alpha When checking for netboot, also check f...

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

details:   https://anonhg.NetBSD.org/src/rev/aea219588dc0
branches:  trunk
changeset: 486466:aea219588dc0
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon May 22 20:13:31 2000 +0000

description:
When checking for netboot, also check for MOP protocol.

diffstat:

 sys/arch/alpha/alpha/avalon_a12.c     |  7 ++++---
 sys/arch/alpha/alpha/dec_1000a.c      |  7 ++++---
 sys/arch/alpha/alpha/dec_2100_a50.c   |  7 ++++---
 sys/arch/alpha/alpha/dec_3000_300.c   |  7 ++++---
 sys/arch/alpha/alpha/dec_3000_500.c   |  7 ++++---
 sys/arch/alpha/alpha/dec_550.c        |  7 ++++---
 sys/arch/alpha/alpha/dec_6600.c       |  7 ++++---
 sys/arch/alpha/alpha/dec_alphabook1.c |  7 ++++---
 sys/arch/alpha/alpha/dec_axppci_33.c  |  7 ++++---
 sys/arch/alpha/alpha/dec_eb164.c      |  7 ++++---
 sys/arch/alpha/alpha/dec_eb64plus.c   |  7 ++++---
 sys/arch/alpha/alpha/dec_eb66.c       |  7 ++++---
 sys/arch/alpha/alpha/dec_kn20aa.c     |  7 ++++---
 13 files changed, 52 insertions(+), 39 deletions(-)

diffs (truncated from 364 to 300 lines):

diff -r 1fc40b867202 -r aea219588dc0 sys/arch/alpha/alpha/avalon_a12.c
--- a/sys/arch/alpha/alpha/avalon_a12.c Mon May 22 20:09:12 2000 +0000
+++ b/sys/arch/alpha/alpha/avalon_a12.c Mon May 22 20:13:31 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: avalon_a12.c,v 1.4 1998/09/24 05:32:52 ross Exp $ */
+/* $NetBSD: avalon_a12.c,v 1.5 2000/05/22 20:13:32 thorpej Exp $ */
 
 /* [Notice revision 2.2]
  * Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
@@ -64,7 +64,7 @@
 #include "opt_avalon_a12.h"            /* Config options headers */
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: avalon_a12.c,v 1.4 1998/09/24 05:32:52 ross Exp $");
+__KERNEL_RCSID(0, "$NetBSD: avalon_a12.c,v 1.5 2000/05/22 20:13:32 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -161,7 +161,8 @@
 
        if (!initted) {
                scsiboot = (strcmp(b->protocol, "SCSI") == 0);
-               netboot = (strcmp(b->protocol, "BOOTP") == 0);
+               netboot = (strcmp(b->protocol, "BOOTP") == 0) ||
+                   (strcmp(b->protocol, "MOP") == 0);
 #if 0
                printf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
 #endif
diff -r 1fc40b867202 -r aea219588dc0 sys/arch/alpha/alpha/dec_1000a.c
--- a/sys/arch/alpha/alpha/dec_1000a.c  Mon May 22 20:09:12 2000 +0000
+++ b/sys/arch/alpha/alpha/dec_1000a.c  Mon May 22 20:13:31 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_1000a.c,v 1.6 1999/12/03 22:48:22 thorpej Exp $ */
+/* $NetBSD: dec_1000a.c,v 1.7 2000/05/22 20:13:31 thorpej Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.6 1999/12/03 22:48:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.7 2000/05/22 20:13:31 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -241,7 +241,8 @@
 
        if (!initted) {
                scsiboot = (strcmp(b->protocol, "SCSI") == 0);
-               netboot = (strcmp(b->protocol, "BOOTP") == 0);
+               netboot = (strcmp(b->protocol, "BOOTP") == 0) ||
+                   (strcmp(b->protocol, "MOP") == 0);
 #if 0
                printf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
 #endif
diff -r 1fc40b867202 -r aea219588dc0 sys/arch/alpha/alpha/dec_2100_a50.c
--- a/sys/arch/alpha/alpha/dec_2100_a50.c       Mon May 22 20:09:12 2000 +0000
+++ b/sys/arch/alpha/alpha/dec_2100_a50.c       Mon May 22 20:13:31 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_2100_a50.c,v 1.42 1999/12/03 22:48:22 thorpej Exp $ */
+/* $NetBSD: dec_2100_a50.c,v 1.43 2000/05/22 20:13:31 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -31,7 +31,7 @@
  */
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: dec_2100_a50.c,v 1.42 1999/12/03 22:48:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_2100_a50.c,v 1.43 2000/05/22 20:13:31 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -180,7 +180,8 @@
 
        if (!initted) {
                scsiboot = (strcmp(b->protocol, "SCSI") == 0);
-               netboot = (strcmp(b->protocol, "BOOTP") == 0);
+               netboot = (strcmp(b->protocol, "BOOTP") == 0) ||
+                   (strcmp(b->protocol, "MOP") == 0);
 #if 0
                printf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
 #endif
diff -r 1fc40b867202 -r aea219588dc0 sys/arch/alpha/alpha/dec_3000_300.c
--- a/sys/arch/alpha/alpha/dec_3000_300.c       Mon May 22 20:09:12 2000 +0000
+++ b/sys/arch/alpha/alpha/dec_3000_300.c       Mon May 22 20:13:31 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3000_300.c,v 1.29 1999/11/20 00:01:14 mrg Exp $ */
+/* $NetBSD: dec_3000_300.c,v 1.30 2000/05/22 20:13:32 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: dec_3000_300.c,v 1.29 1999/11/20 00:01:14 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3000_300.c,v 1.30 2000/05/22 20:13:32 thorpej Exp $");
 
 #include "opt_new_scc_driver.h"
 
@@ -181,7 +181,8 @@
 
        if (!initted) {
                scsiboot = (strcmp(b->protocol, "SCSI") == 0);
-               netboot = (strcmp(b->protocol, "BOOTP") == 0);
+               netboot = (strcmp(b->protocol, "BOOTP") == 0) ||
+                   (strcmp(b->protocol, "MOP") == 0);
 #if 0
                printf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
 #endif
diff -r 1fc40b867202 -r aea219588dc0 sys/arch/alpha/alpha/dec_3000_500.c
--- a/sys/arch/alpha/alpha/dec_3000_500.c       Mon May 22 20:09:12 2000 +0000
+++ b/sys/arch/alpha/alpha/dec_3000_500.c       Mon May 22 20:13:31 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3000_500.c,v 1.28 1999/11/19 10:49:46 mrg Exp $ */
+/* $NetBSD: dec_3000_500.c,v 1.29 2000/05/22 20:13:32 thorpej Exp $ */
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: dec_3000_500.c,v 1.28 1999/11/19 10:49:46 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3000_500.c,v 1.29 2000/05/22 20:13:32 thorpej Exp $");
 
 #include "opt_new_scc_driver.h"
 
@@ -202,7 +202,8 @@
 
        if (!initted) {
                scsiboot = (strcmp(b->protocol, "SCSI") == 0);
-               netboot = (strcmp(b->protocol, "BOOTP") == 0);
+               netboot = (strcmp(b->protocol, "BOOTP") == 0) ||
+                   (strcmp(b->protocol, "MOP") == 0);
 #if 0
                printf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
 #endif
diff -r 1fc40b867202 -r aea219588dc0 sys/arch/alpha/alpha/dec_550.c
--- a/sys/arch/alpha/alpha/dec_550.c    Mon May 22 20:09:12 2000 +0000
+++ b/sys/arch/alpha/alpha/dec_550.c    Mon May 22 20:13:31 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_550.c,v 1.6 2000/02/05 22:22:41 veego Exp $ */
+/* $NetBSD: dec_550.c,v 1.7 2000/05/22 20:13:32 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.6 2000/02/05 22:22:41 veego Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.7 2000/05/22 20:13:32 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -172,7 +172,8 @@
 
        if (!initted) {
                scsiboot = (strcmp(b->protocol, "SCSI") == 0);
-               netboot = (strcmp(b->protocol, "BOOTP") == 0);
+               netboot = (strcmp(b->protocol, "BOOTP") == 0) ||
+                   (strcmp(b->protocol, "MOP") == 0);
                /*
                 * Add an extra check to boot from ide drives:
                 * Newer SRM firmware use the protocol identifier IDE,
diff -r 1fc40b867202 -r aea219588dc0 sys/arch/alpha/alpha/dec_6600.c
--- a/sys/arch/alpha/alpha/dec_6600.c   Mon May 22 20:09:12 2000 +0000
+++ b/sys/arch/alpha/alpha/dec_6600.c   Mon May 22 20:13:31 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_6600.c,v 1.3 2000/02/05 22:19:19 veego Exp $ */
+/* $NetBSD: dec_6600.c,v 1.4 2000/05/22 20:13:32 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.3 2000/02/05 22:19:19 veego Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.4 2000/05/22 20:13:32 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -172,7 +172,8 @@
 
        if (!initted) {
                scsiboot = (strcmp(b->protocol, "SCSI") == 0);
-               netboot = (strcmp(b->protocol, "BOOTP") == 0);
+               netboot = (strcmp(b->protocol, "BOOTP") == 0) ||
+                   (strcmp(b->protocol, "MOP") == 0);
                /*
                 * Add an extra check to boot from ide drives:
                 * Newer SRM firmware use the protocol identifier IDE,
diff -r 1fc40b867202 -r aea219588dc0 sys/arch/alpha/alpha/dec_alphabook1.c
--- a/sys/arch/alpha/alpha/dec_alphabook1.c     Mon May 22 20:09:12 2000 +0000
+++ b/sys/arch/alpha/alpha/dec_alphabook1.c     Mon May 22 20:13:31 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_alphabook1.c,v 1.4 1999/12/03 22:48:22 thorpej Exp $ */
+/* $NetBSD: dec_alphabook1.c,v 1.5 2000/05/22 20:13:32 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -31,7 +31,7 @@
  */
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.4 1999/12/03 22:48:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.5 2000/05/22 20:13:32 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -171,7 +171,8 @@
 
        if (!initted) {
                scsiboot = (strcmp(b->protocol, "SCSI") == 0);
-               netboot = (strcmp(b->protocol, "BOOTP") == 0);
+               netboot = (strcmp(b->protocol, "BOOTP") == 0) ||
+                   (strcmp(b->protocol, "MOP") == 0);
 #if 0
                printf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
 #endif
diff -r 1fc40b867202 -r aea219588dc0 sys/arch/alpha/alpha/dec_axppci_33.c
--- a/sys/arch/alpha/alpha/dec_axppci_33.c      Mon May 22 20:09:12 2000 +0000
+++ b/sys/arch/alpha/alpha/dec_axppci_33.c      Mon May 22 20:13:31 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_axppci_33.c,v 1.43 1999/12/03 22:48:22 thorpej Exp $ */
+/* $NetBSD: dec_axppci_33.c,v 1.44 2000/05/22 20:13:32 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -31,7 +31,7 @@
  */
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: dec_axppci_33.c,v 1.43 1999/12/03 22:48:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_axppci_33.c,v 1.44 2000/05/22 20:13:32 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -215,7 +215,8 @@
 
        if (!initted) {
                scsiboot = (strcmp(b->protocol, "SCSI") == 0);
-               netboot = (strcmp(b->protocol, "BOOTP") == 0);
+               netboot = (strcmp(b->protocol, "BOOTP") == 0) ||
+                   (strcmp(b->protocol, "MOP") == 0);
 #if 0
                printf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
 #endif
diff -r 1fc40b867202 -r aea219588dc0 sys/arch/alpha/alpha/dec_eb164.c
--- a/sys/arch/alpha/alpha/dec_eb164.c  Mon May 22 20:09:12 2000 +0000
+++ b/sys/arch/alpha/alpha/dec_eb164.c  Mon May 22 20:13:31 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_eb164.c,v 1.32 2000/02/05 22:14:42 veego Exp $ */
+/* $NetBSD: dec_eb164.c,v 1.33 2000/05/22 20:13:32 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.32 2000/02/05 22:14:42 veego Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.33 2000/05/22 20:13:32 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -167,7 +167,8 @@
 
        if (!initted) {
                scsiboot = (strcmp(b->protocol, "SCSI") == 0);
-               netboot = (strcmp(b->protocol, "BOOTP") == 0);
+               netboot = (strcmp(b->protocol, "BOOTP") == 0) ||
+                   (strcmp(b->protocol, "MOP") == 0);
                /*
                 * Add an extra check to boot from ide drives:
                 * Newer SRM firmware use the protocol identifier IDE,
diff -r 1fc40b867202 -r aea219588dc0 sys/arch/alpha/alpha/dec_eb64plus.c
--- a/sys/arch/alpha/alpha/dec_eb64plus.c       Mon May 22 20:09:12 2000 +0000
+++ b/sys/arch/alpha/alpha/dec_eb64plus.c       Mon May 22 20:13:31 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_eb64plus.c,v 1.18 1999/12/03 22:48:22 thorpej Exp $ */
+/* $NetBSD: dec_eb64plus.c,v 1.19 2000/05/22 20:13:32 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: dec_eb64plus.c,v 1.18 1999/12/03 22:48:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_eb64plus.c,v 1.19 2000/05/22 20:13:32 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -172,7 +172,8 @@