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, 50 deletions

diff --git a/sys/arch/landisk/stand/boot/boot.8 b/sys/arch/landisk/stand/boot/boot.8
index 30db74bd1e4..4e06cfa84d4 100644
--- a/sys/arch/landisk/stand/boot/boot.8
+++ b/sys/arch/landisk/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.12 2019/12/23 12:44:34 bluhm Exp $
+.\"	$OpenBSD: boot.8,v 1.13 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: December 23 2019 $
+.Dd $Mdocdate: February 23 2023 $
 .Dt BOOT 8 landisk
 .Os
 .Sh NAME
@@ -189,8 +189,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 db_console
 Boolean (0 or 1) to permit entry into the kernel debugger before the
 .Em ddb.console
@@ -211,27 +209,6 @@ File name containing the kernel image.
 .It Ic timeout
 Number of seconds boot will wait for human intervention before
 booting the default kernel image.
-.\" .It Nm tty
-.\" Active console device name (e.g.,
-.\" .Li scif0 ) .
-.El
-.\" XXX although implemented, better leave it undocumented for now -- miod
-.\" .It stty Op Ar device Op Ar speed
-.\" Displays or sets the
-.\" .Ar speed
-.\" for a console
-.\" .Ar device .
-.\" If changing the baudrate for the currently active console,
-.\" .Nm
-.\" offers you five seconds of grace time before committing the change
-.\" to allow you to change your terminal's speed to match.
-.\" If changing speed
-.\" .Em not
-.\" for the active console, the baudrate is set for the
-.\" .Em next
-.\" time you switch to a serial console.
-.\" .Pp
-.\" The default baudrate is 9600bps.
 .It Ic time
 Displays system time and date.
 .El
diff --git a/sys/arch/landisk/stand/boot/devs.c b/sys/arch/landisk/stand/boot/devs.c
index 4af103a56bb..71ae13d68c7 100644
--- a/sys/arch/landisk/stand/boot/devs.c
+++ b/sys/arch/landisk/stand/boot/devs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: devs.c,v 1.12 2020/12/09 18:10:19 krw Exp $	*/
+/*	$OpenBSD: devs.c,v 1.13 2023/02/23 19:48:22 miod Exp $	*/
 
 /*
  * Copyright (c) 2006 Michael Shalayeff
@@ -51,25 +51,6 @@ devboot(dev_t bootdev, char *p)
 	p[2] = '\0';
 }
 
-char *
-ttyname(int fd)
-{
-	return "scif";
-}
-
-dev_t
-ttydev(char *name)
-{
-	return NODEV;
-}
-
-int
-cnspeed(dev_t dev, int sp)
-{
-	scif_init(sp);
-	return sp;
-}
-
 void
 run_loadfile(uint64_t *marks, int howto)
 {
diff --git a/sys/arch/landisk/stand/boot/libsa.h b/sys/arch/landisk/stand/boot/libsa.h
index e356858acf1..fefddf6ec44 100644
--- a/sys/arch/landisk/stand/boot/libsa.h
+++ b/sys/arch/landisk/stand/boot/libsa.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: libsa.h,v 1.9 2022/08/24 17:35:15 miod Exp $	*/
+/*	$OpenBSD: libsa.h,v 1.10 2023/02/23 19:48:22 miod Exp $	*/
 
 /*
  * Copyright (c) 2006 Michael Shalayeff
@@ -19,10 +19,6 @@
 
 #include <lib/libsa/stand.h>
 
-#define	EXEC_ELF
-
-#define	DEFAULT_KERNEL_ADDRESS	0
-
 #define	PCLOCK	33333333
 
 int readsects(int dev, uint32_t lba, void *buf, size_t size);