Remove dangerous user-settable "addr" variable from MI boot loader, and

only compile tty-related code (stty command, tty variable) on platforms
where it makes sense for the boot loader to control it, rather than the
PROM/firmware/whatever.

3 files changed, 4 insertions, 32 deletions

diff --git a/sys/arch/luna88k/stand/boot/boot.8 b/sys/arch/luna88k/stand/boot/boot.8
index 19d6874850f..b5c056a5930 100644
--- a/sys/arch/luna88k/stand/boot/boot.8
+++ b/sys/arch/luna88k/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.1 2023/01/12 19:37:53 miod Exp $
+.\"	$OpenBSD: boot.8,v 1.2 2023/02/23 19:48:22 miod Exp $
 .\"
 .\" Copyright (c) 1997-2001 Michael Shalayeff
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: January 12 2023 $
+.Dd $Mdocdate: February 23 2023 $
 .Dt BOOT 8 luna88k
 .Os
 .Sh NAME
@@ -191,8 +191,6 @@ are both specified, sets that variable to the given value.
 Variables include:
 .Pp
 .Bl -tag -compact -width db_console
-.It Ic addr
-Address at which to load the kernel.
 .It Ic debug
 Debug flag if
 .Nm
diff --git a/sys/arch/luna88k/stand/boot/init_main.c b/sys/arch/luna88k/stand/boot/init_main.c
index fbe39498161..ab4b22c85f9 100644
--- a/sys/arch/luna88k/stand/boot/init_main.c
+++ b/sys/arch/luna88k/stand/boot/init_main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init_main.c,v 1.11 2023/01/27 13:58:17 aoyama Exp $	*/
+/*	$OpenBSD: init_main.c,v 1.12 2023/02/23 19:48:22 miod Exp $	*/
 /*	$NetBSD: init_main.c,v 1.6 2013/03/05 15:34:53 tsutsui Exp $	*/
 
 /*
@@ -269,30 +269,6 @@ _rtt(void)
 	/* NOTREACHED */
 }
 
-
-/*
- * "machine tty" command to select a different console is not supported,
- * console device selection is performed using the DIP switches.
- */
-
-int
-cnspeed(dev_t dev, int sp)
-{
-	return 9600;
-}
-
-char *
-ttyname(int fd)
-{
-	return "console";
-}
-
-dev_t
-ttydev(char *name)
-{
-	return NODEV;
-}
-
 /*
  * Return the default boot device.
  */
diff --git a/sys/arch/luna88k/stand/boot/libsa.h b/sys/arch/luna88k/stand/boot/libsa.h
index 55d12787244..9a3de988f1b 100644
--- a/sys/arch/luna88k/stand/boot/libsa.h
+++ b/sys/arch/luna88k/stand/boot/libsa.h
@@ -1,11 +1,9 @@
-/*	$OpenBSD: libsa.h,v 1.1 2023/01/10 17:10:57 miod Exp $	*/
+/*	$OpenBSD: libsa.h,v 1.2 2023/02/23 19:48:22 miod Exp $	*/
 
 /* public domain */
 
 #include <lib/libsa/stand.h>
 
-#define DEFAULT_KERNEL_ADDRESS 0
-
 void devboot(dev_t, char *);
 void machdep(void);
 void run_loadfile(uint64_t *, int);