12 files changed, 26 insertions, 1 deletions

diff --git a/sys/alpha/alpha/api_up1000.c b/sys/alpha/alpha/api_up1000.c
index 26e8e2fc1192..cdd68a372d46 100644
--- a/sys/alpha/alpha/api_up1000.c
+++ b/sys/alpha/alpha/api_up1000.c
@@ -28,6 +28,7 @@
 
 #include "opt_ddb.h"
 #include <sys/param.h>
+#include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
@@ -102,6 +103,7 @@ api_up1000_cons_init()
 			if (siocnattach(0x3f8, comcnrate))
 				panic("can't init serial console");
 
+			boothowto |= RB_SERIAL;
 			break;
 		}
 
diff --git a/sys/alpha/alpha/dec_1000a.c b/sys/alpha/alpha/dec_1000a.c
index a41e3f6041e1..9525b26b3d79 100644
--- a/sys/alpha/alpha/dec_1000a.c
+++ b/sys/alpha/alpha/dec_1000a.c
@@ -76,6 +76,7 @@
 #include "opt_ddb.h"
 
 #include <sys/param.h>
+#include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/termios.h>
 
@@ -200,6 +201,7 @@ dec_1000a_cons_init()
 			if (siocnattach(0x3f8, comcnrate))
 				panic("can't init serial console");
 
+			boothowto |= RB_SERIAL;
 			break;
 		}
 
diff --git a/sys/alpha/alpha/dec_2100_a50.c b/sys/alpha/alpha/dec_2100_a50.c
index b2428245430b..f4e9e97d54e2 100644
--- a/sys/alpha/alpha/dec_2100_a50.c
+++ b/sys/alpha/alpha/dec_2100_a50.c
@@ -37,6 +37,7 @@
 #include "opt_ddb.h"
 
 #include <sys/param.h>
+#include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/termios.h>
 
@@ -130,6 +131,8 @@ dec_2100_a50_cons_init()
 			comconsole = 0;
 			if (siocnattach(0x3f8, comcnrate))
 				panic("can't init serial console");
+
+			boothowto |= RB_SERIAL;
 			break;
 		}
 
diff --git a/sys/alpha/alpha/dec_2100_a500.c b/sys/alpha/alpha/dec_2100_a500.c
index 0297e6036bdd..6e66d7535afa 100644
--- a/sys/alpha/alpha/dec_2100_a500.c
+++ b/sys/alpha/alpha/dec_2100_a500.c
@@ -29,6 +29,7 @@
 #include "opt_ddb.h"
 
 #include <sys/param.h>
+#include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/termios.h>
 
@@ -119,6 +120,8 @@ dec_2100_a500_cons_init()
 	comconsole = 0;
 	if (siocnattach(0x3f8, comcnrate))
 	    panic("can't init serial console");
+
+	boothowto |= RB_SERIAL;
 	break;
 
     case 3:
diff --git a/sys/alpha/alpha/dec_axppci_33.c b/sys/alpha/alpha/dec_axppci_33.c
index 630cc55b75c4..f212f5ca784c 100644
--- a/sys/alpha/alpha/dec_axppci_33.c
+++ b/sys/alpha/alpha/dec_axppci_33.c
@@ -34,6 +34,7 @@
 #include "opt_ddb.h"
 
 #include <sys/param.h>
+#include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/termios.h>
 
@@ -139,6 +140,8 @@ dec_axppci_33_cons_init()
 			comconsole = 0;
 			if (siocnattach(0x3f8, comcnrate))
 				panic("can't init serial console");
+
+			boothowto |= RB_SERIAL;
 			break;
 		}
 
diff --git a/sys/alpha/alpha/dec_eb164.c b/sys/alpha/alpha/dec_eb164.c
index cdbee6a7d528..4293d3786a46 100644
--- a/sys/alpha/alpha/dec_eb164.c
+++ b/sys/alpha/alpha/dec_eb164.c
@@ -34,6 +34,7 @@
 #include "opt_ddb.h"
 
 #include <sys/param.h>
+#include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/termios.h>
 
@@ -113,6 +114,7 @@ dec_eb164_cons_init()
 			if (siocnattach(0x3f8, comcnrate))
 				panic("can't init serial console");
 
+			boothowto |= RB_SERIAL;
 			break;
 		}
 
diff --git a/sys/alpha/alpha/dec_eb64plus.c b/sys/alpha/alpha/dec_eb64plus.c
index 25bb39bdd26d..6b2015306217 100644
--- a/sys/alpha/alpha/dec_eb64plus.c
+++ b/sys/alpha/alpha/dec_eb64plus.c
@@ -51,6 +51,7 @@
 #include "opt_ddb.h"
 
 #include <sys/param.h>
+#include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/termios.h>
 
@@ -146,6 +147,7 @@ dec_eb64plus_cons_init()
 			if (siocnattach(0x3f8, comcnrate))
                                 panic("can't init serial console");
 
+			boothowto |= RB_SERIAL;
 			break;
 		}
 
diff --git a/sys/alpha/alpha/dec_kn20aa.c b/sys/alpha/alpha/dec_kn20aa.c
index 8c50114a6cbf..ff2c6cb6c894 100644
--- a/sys/alpha/alpha/dec_kn20aa.c
+++ b/sys/alpha/alpha/dec_kn20aa.c
@@ -34,6 +34,7 @@
 #include "opt_ddb.h"
 
 #include <sys/param.h>
+#include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/termios.h>
 
@@ -123,6 +124,7 @@ dec_kn20aa_cons_init()
 			if (siocnattach(0x3f8, comcnrate))
 				panic("can't init serial console");
 
+			boothowto |= RB_SERIAL;
 			break;
 		}
 
diff --git a/sys/alpha/alpha/dec_kn300.c b/sys/alpha/alpha/dec_kn300.c
index 8400f57d5ef9..9c31662cdbb6 100644
--- a/sys/alpha/alpha/dec_kn300.c
+++ b/sys/alpha/alpha/dec_kn300.c
@@ -32,6 +32,7 @@
 
 #include "opt_ddb.h"
 #include <sys/param.h>
+#include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
@@ -123,6 +124,8 @@ dec_kn300_cons_init()
 		comconsole = 0;
 		if (siocnattach(0x3f8, comcnrate))
 			panic("can't init serial console");
+
+		boothowto |= RB_SERIAL;
 		break;
 
 	case 3:
diff --git a/sys/alpha/alpha/dec_st550.c b/sys/alpha/alpha/dec_st550.c
index 31a19d588e25..b1a3167b07d5 100644
--- a/sys/alpha/alpha/dec_st550.c
+++ b/sys/alpha/alpha/dec_st550.c
@@ -35,6 +35,7 @@
 #include "opt_ddb.h"
 
 #include <sys/param.h>
+#include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
@@ -122,6 +123,7 @@ st550_cons_init()
 			if (siocnattach(0x3f8, comcnrate))
 				panic("can't init serial console");
 
+			boothowto |= RB_SERIAL;
 			break;
 		}
 
diff --git a/sys/alpha/alpha/dec_st6600.c b/sys/alpha/alpha/dec_st6600.c
index f1a5f5944f9e..124f09c065d2 100644
--- a/sys/alpha/alpha/dec_st6600.c
+++ b/sys/alpha/alpha/dec_st6600.c
@@ -28,6 +28,7 @@
 
 #include "opt_ddb.h"
 #include <sys/param.h>
+#include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
@@ -109,6 +110,7 @@ st6600_cons_init()
 			if (siocnattach(0x3f8, comcnrate))
 				panic("can't init serial console");
 
+			boothowto |= RB_SERIAL;
 			break;
 		}
 
diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c
index 6d95d9a26941..02643ae08fbd 100644
--- a/sys/alpha/alpha/machdep.c
+++ b/sys/alpha/alpha/machdep.c
@@ -1002,7 +1002,6 @@ alpha_init(pfn, ptb, bim, bip, biv)
 	 * Look at arguments passed to us and compute boothowto.
 	 */
 
-	boothowto = 0;
 #ifdef KADB
 	boothowto |= RB_KDB;
 #endif