summaryrefslogtreecommitdiffstats
path: root/sys/alpha
diff options
context:
space:
mode:
Diffstat (limited to 'sys/alpha')
-rw-r--r--sys/alpha/alpha/api_up1000.c42
-rw-r--r--sys/alpha/alpha/dec_1000a.c47
-rw-r--r--sys/alpha/alpha/dec_2100_a50.c45
-rw-r--r--sys/alpha/alpha/dec_2100_a500.c45
-rw-r--r--sys/alpha/alpha/dec_axppci_33.c45
-rw-r--r--sys/alpha/alpha/dec_eb164.c47
-rw-r--r--sys/alpha/alpha/dec_eb64plus.c39
-rw-r--r--sys/alpha/alpha/dec_kn20aa.c42
-rw-r--r--sys/alpha/alpha/dec_kn300.c40
-rw-r--r--sys/alpha/alpha/dec_st550.c43
-rw-r--r--sys/alpha/alpha/dec_st6600.c42
-rw-r--r--sys/alpha/conf/NOTES3
12 files changed, 11 insertions, 469 deletions
diff --git a/sys/alpha/alpha/api_up1000.c b/sys/alpha/alpha/api_up1000.c
index f21ec34..b2577b0 100644
--- a/sys/alpha/alpha/api_up1000.c
+++ b/sys/alpha/alpha/api_up1000.c
@@ -27,9 +27,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_ddb.h"
-#include "opt_dev_sc.h"
-
#include <sys/param.h>
#include <sys/reboot.h>
#include <sys/systm.h>
@@ -49,18 +46,6 @@ __FBSDID("$FreeBSD$");
#include <alpha/pci/irongatereg.h>
#include <alpha/pci/irongatevar.h>
-#ifndef NO_SIO
-#ifndef CONSPEED
-#define CONSPEED TTYDEF_SPEED
-#endif
-static int comcnrate = CONSPEED;
-extern int comconsole;
-extern int siocnattach(int, int);
-extern int siogdbattach(int, int);
-#endif
-
-extern int sccnattach(void);
-
void api_up1000_init(void);
static void api_up1000_cons_init(void);
@@ -85,40 +70,15 @@ api_up1000_cons_init()
irongate_init();
-#ifndef NO_SIO
-#ifdef DDB
- siogdbattach(0x2f8, 57600);
-#endif
-#endif
-
ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off);
switch (ctb->ctb_term_type) {
case 2:
-#ifndef NO_SIO
- /* serial console ... */
- /*
- * Delay to allow PROM putchars to complete.
- * FIFO depth * character time,
- * character time = (1000000 / (defaultrate / 10))
- */
- DELAY(160000000 / comcnrate);
- comconsole = 0;
- if (siocnattach(0x3f8, comcnrate))
- panic("can't init serial console");
-
boothowto |= RB_SERIAL;
-#endif
break;
case 3:
- /* display console ... */
- /* XXX */
-#ifdef DEV_SC
- sccnattach();
-#else
- panic("not configured to use display && keyboard console");
-#endif
+ boothowto &= ~RB_SERIAL;
break;
default:
diff --git a/sys/alpha/alpha/dec_1000a.c b/sys/alpha/alpha/dec_1000a.c
index a1d1d39..16ba0e5 100644
--- a/sys/alpha/alpha/dec_1000a.c
+++ b/sys/alpha/alpha/dec_1000a.c
@@ -74,9 +74,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_ddb.h"
-#include "opt_dev_sc.h"
-
#include <sys/param.h>
#include <sys/reboot.h>
#include <sys/systm.h>
@@ -94,18 +91,6 @@ __FBSDID("$FreeBSD$");
#include <dev/pci/pcivar.h>
-#ifndef NO_SIO
-#ifndef CONSPEED
-#define CONSPEED TTYDEF_SPEED
-#endif
-static int comcnrate = CONSPEED;
-extern int comconsole;
-extern int siocnattach(int, int);
-extern int siogdbattach(int, int);
-#endif
-
-extern int sccnattach(void);
-
void dec_1000a_init(int);
static void dec_1000a_cons_init(void);
@@ -185,45 +170,15 @@ dec_1000a_cons_init()
apecs_init();
}
-#ifndef NO_SIO
-#ifdef DDB
- siogdbattach(0x2f8, 57600);
-#endif
-#endif
-
ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off);
switch (ctb->ctb_term_type) {
case 2:
-#ifndef NO_SIO
- /* serial console ... */
- /*
- * Delay to allow PROM putchars to complete.
- * FIFO depth * character time,
- * character time = (1000000 / (defaultrate / 10)).
- */
- DELAY(160000000 / comcnrate);
-
- /*
- * Force a comconsole on com1 if the SRM has a serial
- * console.
- */
- comconsole = 0;
- if (siocnattach(0x3f8, comcnrate))
- panic("can't init serial console");
-
boothowto |= RB_SERIAL;
-#endif
break;
case 3:
- /* display console ... */
- /* XXX */
-#ifdef DEV_SC
- sccnattach();
-#else
- panic("not configured to use display && keyboard console");
-#endif
+ boothowto &= ~RB_SERIAL;
break;
default:
diff --git a/sys/alpha/alpha/dec_2100_a50.c b/sys/alpha/alpha/dec_2100_a50.c
index 79138b2..ba9e434 100644
--- a/sys/alpha/alpha/dec_2100_a50.c
+++ b/sys/alpha/alpha/dec_2100_a50.c
@@ -35,9 +35,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_ddb.h"
-#include "opt_dev_sc.h"
-
#include <sys/param.h>
#include <sys/reboot.h>
#include <sys/systm.h>
@@ -54,18 +51,6 @@ __FBSDID("$FreeBSD$");
#include <alpha/pci/apecsreg.h>
#include <alpha/pci/apecsvar.h>
-#ifndef NO_SIO
-#ifndef CONSPEED
-#define CONSPEED TTYDEF_SPEED
-#endif
-static int comcnrate = CONSPEED;
-extern int comconsole;
-extern int siocnattach(int, int);
-extern int siogdbattach(int, int);
-#endif
-
-extern int sccnattach(void);
-
void dec_2100_a50_init(void);
static void dec_2100_a50_cons_init(void);
static void dec_2100_a50_intr_map(void *);
@@ -110,43 +95,15 @@ dec_2100_a50_cons_init()
apecs_init();
-#ifndef NO_SIO
-#ifdef DDB
- siogdbattach(0x2f8, 9600);
-#endif
-#endif
-
ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off);
switch (ctb->ctb_term_type) {
case 2:
-#ifndef NO_SIO
- /* serial console ... */
- /*
- * Delay to allow PROM putchars to complete.
- * FIFO depth * character time,
- * character time = (1000000 / (defaultrate / 10)).
- */
- DELAY(160000000 / comcnrate);
- /*
- * Force a comconsole on com1 if the SRM has a serial console.
- */
- comconsole = 0;
- if (siocnattach(0x3f8, comcnrate))
- panic("can't init serial console");
-
boothowto |= RB_SERIAL;
-#endif
break;
case 3:
- /* display console ... */
- /* XXX */
-#ifdef DEV_SC
- sccnattach();
-#else
- panic("not configured to use display && keyboard console");
-#endif
+ boothowto &= ~RB_SERIAL;
break;
default:
diff --git a/sys/alpha/alpha/dec_2100_a500.c b/sys/alpha/alpha/dec_2100_a500.c
index 547d4ed..e202b2f 100644
--- a/sys/alpha/alpha/dec_2100_a500.c
+++ b/sys/alpha/alpha/dec_2100_a500.c
@@ -27,9 +27,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_ddb.h"
-#include "opt_dev_sc.h"
-
#include <sys/param.h>
#include <sys/reboot.h>
#include <sys/systm.h>
@@ -47,18 +44,6 @@ __FBSDID("$FreeBSD$");
#include <alpha/pci/t2var.h>
#include <alpha/pci/t2reg.h>
-#ifndef NO_SIO
-#ifndef CONSPEED
-#define CONSPEED TTYDEF_SPEED
-#endif
-static int comcnrate = CONSPEED;
-extern int comconsole;
-extern int siocnattach(int, int);
-extern int siogdbattach(int, int);
-#endif
-
-extern int sccnattach(void);
-
void dec_2100_a500_init(int);
static void dec_2100_a500_cons_init(void);
static void dec_2100_a500_intr_init(void);
@@ -101,43 +86,15 @@ dec_2100_a500_cons_init()
struct ctb *ctb;
t2_init();
-#ifndef NO_SIO
-#ifdef DDB
- siogdbattach(0x2f8, 9600);
-#endif
-#endif
-
ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off);
switch (ctb->ctb_term_type) {
case 2:
-#ifndef NO_SIO
- /* serial console ... */
- /*
- * Delay to allow PROM putchars to complete.
- * FIFO depth * character time,
- * character time = (1000000 / (defaultrate / 10))
- */
- DELAY(160000000 / comcnrate);
- /*
- * force a comconsole on com1 if the SRM has a serial console
- */
- comconsole = 0;
- if (siocnattach(0x3f8, comcnrate))
- panic("can't init serial console");
-
boothowto |= RB_SERIAL;
-#endif
break;
case 3:
- /* display console ... */
- /* XXX */
-#ifdef DEV_SC
- sccnattach();
-#else
- panic("not configured to use display && keyboard console");
-#endif
+ boothowto &= ~RB_SERIAL;
break;
default:
diff --git a/sys/alpha/alpha/dec_axppci_33.c b/sys/alpha/alpha/dec_axppci_33.c
index 13e04ea..476ec0f 100644
--- a/sys/alpha/alpha/dec_axppci_33.c
+++ b/sys/alpha/alpha/dec_axppci_33.c
@@ -32,9 +32,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_ddb.h"
-#include "opt_dev_sc.h"
-
#include <sys/param.h>
#include <sys/reboot.h>
#include <sys/systm.h>
@@ -51,18 +48,6 @@ __FBSDID("$FreeBSD$");
#include <dev/pci/pcivar.h>
#include <alpha/pci/lcavar.h>
-#ifndef NO_SIO
-#ifndef CONSPEED
-#define CONSPEED TTYDEF_SPEED
-#endif
-static int comcnrate = CONSPEED;
-extern int comconsole;
-extern int siocnattach(int, int);
-extern int siogdbattach(int, int);
-#endif
-
-extern int sccnattach(void);
-
void dec_axppci_33_init(void);
static void dec_axppci_33_cons_init(void);
static int dec_axppci_33_intr_route (device_t, device_t, int);
@@ -125,43 +110,15 @@ dec_axppci_33_cons_init()
lca_init();
-#ifndef NO_SIO
-#ifdef DDB
- siogdbattach(0x2f8, 9600);
-#endif
-#endif
-
ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off);
switch (ctb->ctb_term_type) {
case 2:
-#ifndef NO_SIO
- /* serial console ... */
- /*
- * Delay to allow PROM putchars to complete.
- * FIFO depth * character time,
- * character time = (1000000 / (defaultrate / 10))
- */
- DELAY(160000000 / comcnrate);
- /*
- * force a comconsole on com1 if the SRM has a serial console
- */
- comconsole = 0;
- if (siocnattach(0x3f8, comcnrate))
- panic("can't init serial console");
-
boothowto |= RB_SERIAL;
-#endif
break;
case 3:
- /* display console ... */
- /* XXX */
-#ifdef DEV_SC
- sccnattach();
-#else
- panic("not configured to use display && keyboard console");
-#endif
+ boothowto &= ~RB_SERIAL;
break;
default:
diff --git a/sys/alpha/alpha/dec_eb164.c b/sys/alpha/alpha/dec_eb164.c
index fb7e701..f3ac0e8 100644
--- a/sys/alpha/alpha/dec_eb164.c
+++ b/sys/alpha/alpha/dec_eb164.c
@@ -32,9 +32,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_ddb.h"
-#include "opt_dev_sc.h"
-
#include <sys/param.h>
#include <sys/reboot.h>
#include <sys/systm.h>
@@ -48,18 +45,6 @@ __FBSDID("$FreeBSD$");
#include <alpha/pci/ciavar.h>
-#ifndef NO_SIO
-#ifndef CONSPEED
-#define CONSPEED TTYDEF_SPEED
-#endif
-static int comcnrate = CONSPEED;
-extern int comconsole;
-extern int siocnattach(int, int);
-extern int siogdbattach(int, int);
-#endif
-
-extern int sccnattach(void);
-
void dec_eb164_init(void);
static void dec_eb164_cons_init(void);
static void eb164_intr_init(void);
@@ -98,45 +83,15 @@ dec_eb164_cons_init()
cia_init();
-#ifndef NO_SIO
-#ifdef DDB
- siogdbattach(0x2f8, 57600);
-#endif
-#endif
-
ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off);
switch (ctb->ctb_term_type) {
case 2:
-#ifndef NO_SIO
- /* serial console ... */
- /*
- * Delay to allow PROM putchars to complete.
- * FIFO depth * character time,
- * character time = (1000000 / (defaultrate / 10))
- */
- DELAY(160000000 / comcnrate);
-
- /*
- * Force a comconsole on com1 if the SRM has a serial
- * console.
- */
- comconsole = 0;
- if (siocnattach(0x3f8, comcnrate))
- panic("can't init serial console");
-
boothowto |= RB_SERIAL;
-#endif
break;
case 3:
- /* display console ... */
- /* XXX */
-#ifdef DEV_SC
- sccnattach();
-#else
- panic("not configured to use display && keyboard console");
-#endif
+ boothowto &= ~RB_SERIAL;
break;
default:
diff --git a/sys/alpha/alpha/dec_eb64plus.c b/sys/alpha/alpha/dec_eb64plus.c
index 670e2ea..36d6afc 100644
--- a/sys/alpha/alpha/dec_eb64plus.c
+++ b/sys/alpha/alpha/dec_eb64plus.c
@@ -48,9 +48,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_ddb.h"
-#include "opt_dev_sc.h"
-
#include <sys/param.h>
#include <sys/reboot.h>
#include <sys/systm.h>
@@ -68,17 +65,6 @@ __FBSDID("$FreeBSD$");
#include <alpha/pci/apecsreg.h>
#include <alpha/pci/apecsvar.h>
-#ifndef NO_SIO
-#ifndef CONSPEED
-#define CONSPEED TTYDEF_SPEED
-#endif
-static int comcnrate = CONSPEED;
-extern int comconsole;
-extern int siocnattach(int, int);
-#endif
-
-extern int sccnattach(void);
-
void dec_eb64plus_init(void);
static void dec_eb64plus_cons_init(void);
static void dec_eb64plus_intr_init(void);
@@ -132,34 +118,11 @@ dec_eb64plus_cons_init()
switch (ctb->ctb_term_type) {
case 2:
-#ifndef NO_SIO
- /* serial console ... */
- /*
- * Delay to allow PROM putchars to complete.
- * FIFO depth * character time,
- * character time = (1000000 / (defaultrate / 10))
- */
- DELAY(160000000 / comcnrate);
-
- /*
- * force a comconsole on com1 if the SRM has a serial
- * console.
- */
- comconsole = 0;
- if (siocnattach(0x3f8, comcnrate))
- panic("can't init serial console");
-
boothowto |= RB_SERIAL;
-#endif
break;
case 3:
-#ifdef DEV_SC
- /* graphics adapter console */
- sccnattach();
-#else
- panic("not configured to use display && keyboard console");
-#endif
+ boothowto &= ~RB_SERIAL;
break;
default:
diff --git a/sys/alpha/alpha/dec_kn20aa.c b/sys/alpha/alpha/dec_kn20aa.c
index de9b91b..38ec292 100644
--- a/sys/alpha/alpha/dec_kn20aa.c
+++ b/sys/alpha/alpha/dec_kn20aa.c
@@ -32,9 +32,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_ddb.h"
-#include "opt_dev_sc.h"
-
#include <sys/param.h>
#include <sys/reboot.h>
#include <sys/systm.h>
@@ -51,18 +48,6 @@ __FBSDID("$FreeBSD$");
#include <alpha/pci/ciareg.h>
#include <alpha/pci/ciavar.h>
-#ifndef NO_SIO
-#ifndef CONSPEED
-#define CONSPEED TTYDEF_SPEED
-#endif
-static int comcnrate = CONSPEED;
-extern int comconsole;
-extern int siocnattach(int, int);
-extern int siogdbattach(int, int);
-#endif
-
-extern int sccnattach(void);
-
void dec_kn20aa_init(void);
static void dec_kn20aa_cons_init(void);
static void dec_kn20aa_intr_init(void);
@@ -108,40 +93,15 @@ dec_kn20aa_cons_init()
cia_init();
-#ifndef NO_SIO
-#ifdef DDB
- siogdbattach(0x2f8, 9600);
-#endif
-#endif
-
ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off);
switch (ctb->ctb_term_type) {
case 2:
-#ifndef NO_SIO
- /* serial console ... */
- /*
- * Delay to allow PROM putchars to complete.
- * FIFO depth * character time,
- * character time = (1000000 / (defaultrate / 10))
- */
- DELAY(160000000 / comcnrate);
- comconsole = 0;
- if (siocnattach(0x3f8, comcnrate))
- panic("can't init serial console");
-
boothowto |= RB_SERIAL;
-#endif
break;
case 3:
- /* display console ... */
- /* XXX */
-#ifdef DEV_SC
- sccnattach();
-#else
- panic("not configured to use display && keyboard console");
-#endif
+ boothowto &= ~RB_SERIAL;
break;
default:
diff --git a/sys/alpha/alpha/dec_kn300.c b/sys/alpha/alpha/dec_kn300.c
index fa1f830..b4f7f3e 100644
--- a/sys/alpha/alpha/dec_kn300.c
+++ b/sys/alpha/alpha/dec_kn300.c
@@ -31,9 +31,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_ddb.h"
-#include "opt_dev_sc.h"
-
#include <sys/param.h>
#include <sys/reboot.h>
#include <sys/systm.h>
@@ -54,18 +51,6 @@ __FBSDID("$FreeBSD$");
#include <alpha/mcbus/mcbusreg.h>
#include <alpha/mcbus/mcbusvar.h>
-#ifndef NO_SIO
-#ifndef CONSPEED
-#define CONSPEED TTYDEF_SPEED
-#endif
-static int comcnrate = CONSPEED;
-extern int comconsole;
-extern int siocnattach(int, int);
-extern int siogdbattach(int, int);
-#endif
-
-extern int sccnattach(void);
-
void dec_kn300_init(void);
void dec_kn300_cons_init(void);
@@ -102,38 +87,15 @@ dec_kn300_cons_init()
mcbus_init();
-#ifndef NO_SIO
-#ifdef DDB
- siogdbattach(0x2f8, 57600);
-#endif
-#endif
-
ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off);
switch (ctb->ctb_term_type) {
case 2:
-#ifndef NO_SIO
- /* serial console ... */
- /*
- * Delay to allow PROM putchars to complete.
- * FIFO depth * character time,
- * character time = (1000000 / (defaultrate / 10))
- */
- DELAY(160000000 / comcnrate);
- comconsole = 0;
- if (siocnattach(0x3f8, comcnrate))
- panic("can't init serial console");
-
boothowto |= RB_SERIAL;
-#endif
break;
case 3:
-#ifdef DEV_SC
- sccnattach();
-#else
- panic("not configured to use display && keyboard console");
-#endif
+ boothowto &= ~RB_SERIAL;
break;
default:
diff --git a/sys/alpha/alpha/dec_st550.c b/sys/alpha/alpha/dec_st550.c
index e81e982..73af900 100644
--- a/sys/alpha/alpha/dec_st550.c
+++ b/sys/alpha/alpha/dec_st550.c
@@ -34,9 +34,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_ddb.h"
-#include "opt_dev_sc.h"
-
#include <sys/param.h>
#include <sys/reboot.h>
#include <sys/systm.h>
@@ -56,18 +53,6 @@ __FBSDID("$FreeBSD$");
#include <alpha/pci/ciareg.h>
#include <alpha/pci/ciavar.h>
-#ifndef NO_SIO
-#ifndef CONSPEED
-#define CONSPEED TTYDEF_SPEED
-#endif
-static int comcnrate = CONSPEED;
-extern int comconsole;
-extern int siocnattach(int, int);
-extern int siogdbattach(int, int);
-#endif
-
-extern int sccnattach(void);
-
void st550_init(void);
static void st550_cons_init(void);
static void st550_intr_init(void);
@@ -105,41 +90,15 @@ st550_cons_init()
cia_init();
-#ifndef NO_SIO
-#ifdef DDB
- siogdbattach(0x2f8, 57600);
-#endif
-#endif
-
ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off);
switch (ctb->ctb_term_type) {
case 2:
-#ifndef NO_SIO
- /* serial console ... */
- /* XXX */
- /*
- * Delay to allow PROM putchars to complete.
- * FIFO depth * character time,
- * character time = (1000000 / (defaultrate / 10))
- */
- DELAY(160000000 / comcnrate);
- comconsole = 0;
- if (siocnattach(0x3f8, comcnrate))
- panic("can't init serial console");
-
boothowto |= RB_SERIAL;
-#endif
break;
case 3:
- /* display console ... */
- /* XXX */
-#ifdef DEV_SC
- sccnattach();
-#else
- panic("not configured to use display && keyboard console");
-#endif
+ boothowto &= ~RB_SERIAL;
break;
default:
diff --git a/sys/alpha/alpha/dec_st6600.c b/sys/alpha/alpha/dec_st6600.c
index c940c62..2750946 100644
--- a/sys/alpha/alpha/dec_st6600.c
+++ b/sys/alpha/alpha/dec_st6600.c
@@ -27,9 +27,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_ddb.h"
-#include "opt_dev_sc.h"
-
#include <sys/param.h>
#include <sys/reboot.h>
#include <sys/systm.h>
@@ -48,18 +45,6 @@ __FBSDID("$FreeBSD$");
#include <dev/pci/pcivar.h>
#include <alpha/pci/tsunamivar.h>
-#ifndef NO_SIO
-#ifndef CONSPEED
-#define CONSPEED TTYDEF_SPEED
-#endif
-static int comcnrate = CONSPEED;
-extern int comconsole;
-extern int siocnattach(int, int);
-extern int siogdbattach(int, int);
-#endif
-
-extern int sccnattach(void);
-
void st6600_init(void);
static void st6600_cons_init(void);
static void st6600_intr_init(void);
@@ -89,40 +74,15 @@ st6600_cons_init()
tsunami_init();
-#ifndef NO_SIO
-#ifdef DDB
- siogdbattach(0x2f8, 57600);
-#endif
-#endif
-
ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off);
switch (ctb->ctb_term_type) {
case 2:
-#ifndef NO_SIO
- /* serial console ... */
- /*
- * Delay to allow PROM putchars to complete.
- * FIFO depth * character time,
- * character time = (1000000 / (defaultrate / 10))
- */
- DELAY(160000000 / comcnrate);
- comconsole = 0;
- if (siocnattach(0x3f8, comcnrate))
- panic("can't init serial console");
-
boothowto |= RB_SERIAL;
-#endif
break;
case 3:
- /* display console ... */
- /* XXX */
-#ifdef DEV_SC
- sccnattach();
-#else
- panic("not configured to use display && keyboard console");
-#endif
+ boothowto &= ~RB_SERIAL;
break;
default:
diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES
index 55f2da4..f963934 100644
--- a/sys/alpha/conf/NOTES
+++ b/sys/alpha/conf/NOTES
@@ -40,9 +40,6 @@ options DEC_KN8AE # AlphaServer 8200/8400 (Turbolaser)
options DEC_KN300 # AlphaServer 4100 (Rawhide),
# AlphaServer 1200 (Tincup)
-# Allow building a kernel without sio(4).
-options NO_SIO
-
#####################################################################
# HARDWARE BUS CONFIGURATION
OpenPOWER on IntegriCloud