-# $OpenBSD: Makefile.inc,v 1.20 2022/12/30 06:50:27 jca Exp $
+# $OpenBSD: Makefile.inc,v 1.21 2023/02/23 19:48:21 miod Exp $
CFLAGS=${DEBUG} ${COPTS} -Oz -Wall -Werror
-CFLAGS+= -ffreestanding -fno-stack-protector -DMDRANDOM
+CFLAGS+= -ffreestanding -fno-stack-protector -DMDRANDOM -DBOOT_STTY
CPPFLAGS+=-I${S} -I${SADIR}/libsa -I. -I${.CURDIR}
SACFLAGS=-D_STANDALONE
DEBUGFLAGS=
-.\" $OpenBSD: boot.8,v 1.33 2022/08/17 18:50:11 kn Exp $
+.\" $OpenBSD: boot.8,v 1.34 2023/02/23 19:48:21 miod Exp $
.\"
.\" Copyright (c) 1997-2001 Michael Shalayeff
.\" All rights reserved.
.\" THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\"
-.Dd $Mdocdate: August 17 2022 $
+.Dd $Mdocdate: February 23 2023 $
.Dt BOOT 8 amd64
.Os
.Sh NAME
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
-/* $OpenBSD: exec_i386.c,v 1.3 2021/10/24 17:49:19 deraadt Exp $ */
+/* $OpenBSD: exec_i386.c,v 1.4 2023/02/23 19:48:21 miod Exp $ */
/*
* Copyright (c) 1997-1998 Michael Shalayeff
if ((av = alloc(ac)) == NULL)
panic("alloc for bootarg");
efi_makebootargs();
- delta = DEFAULT_KERNEL_ADDRESS - efi_loadaddr;
+ delta = -efi_loadaddr;
if (sa_cleanup != NULL)
(*sa_cleanup)();
-/* $OpenBSD: exec_i386.c,v 1.3 2021/10/24 17:49:19 deraadt Exp $ */
+/* $OpenBSD: exec_i386.c,v 1.4 2023/02/23 19:48:21 miod Exp $ */
/*
* Copyright (c) 1997-1998 Michael Shalayeff
if ((av = alloc(ac)) == NULL)
panic("alloc for bootarg");
efi_makebootargs();
- delta = DEFAULT_KERNEL_ADDRESS - efi_loadaddr;
+ delta = -efi_loadaddr;
if (sa_cleanup != NULL)
(*sa_cleanup)();
-/* $OpenBSD: exec_i386.c,v 1.9 2022/07/11 19:45:02 kettenis Exp $ */
+/* $OpenBSD: exec_i386.c,v 1.10 2023/02/23 19:48:21 miod Exp $ */
/*
* Copyright (c) 1997-1998 Michael Shalayeff
panic("alloc for bootarg");
efi_makebootargs();
efi_setconsdev();
- delta = DEFAULT_KERNEL_ADDRESS - efi_loadaddr;
+ delta = -efi_loadaddr;
if (sa_cleanup != NULL)
(*sa_cleanup)();
-/* $OpenBSD: libsa.h,v 1.7 2012/10/30 14:06:29 jsing Exp $ */
+/* $OpenBSD: libsa.h,v 1.8 2023/02/23 19:48:22 miod Exp $ */
/*
* Copyright (c) 1996-1999 Michael Shalayeff
#include <lib/libsa/stand.h>
#include <machine/biosvar.h>
-#define DEFAULT_KERNEL_ADDRESS 0
-
struct i386_boot_probes {
char *name;
void (**probes)(void);
-/* $OpenBSD: libsa.h,v 1.2 2017/08/07 19:34:53 kettenis Exp $ */
+/* $OpenBSD: libsa.h,v 1.3 2023/02/23 19:48:22 miod Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis
#include <lib/libsa/stand.h>
-#define DEFAULT_KERNEL_ADDRESS 0
-
#ifdef DEBUG
#define DPRINTF(x) printf x;
#else
-# $OpenBSD: Makefile,v 1.18 2022/12/30 06:44:35 jca Exp $
+# $OpenBSD: Makefile,v 1.19 2023/02/23 19:48:22 miod Exp $
NOMAN= #
CPPFLAGS+= -nostdinc
CPPFLAGS+= -I${S} -I. -I${.CURDIR}
CPPFLAGS+= -I${EFIDIR}/include -I${EFIDIR}/include/arm
-CPPFLAGS+= -D_STANDALONE
+CPPFLAGS+= -D_STANDALONE -DBOOT_STTY
CPPFLAGS+= -DSMALL -DSLOW -DNOBYFOUR -D__INTERNAL_LIBSA_CREAD
CPPFLAGS+= -DNEEDS_HEAP_H
COPTS+= -ffreestanding -fno-stack-protector
-/* $OpenBSD: libsa.h,v 1.3 2017/08/07 19:34:53 kettenis Exp $ */
+/* $OpenBSD: libsa.h,v 1.4 2023/02/23 19:48:22 miod Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis
#include <lib/libsa/stand.h>
-#define DEFAULT_KERNEL_ADDRESS 0
-
#ifdef DEBUG
#define DPRINTF(x) printf x;
#else
-# $OpenBSD: Makefile,v 1.29 2019/11/28 00:17:11 bluhm Exp $
+# $OpenBSD: Makefile,v 1.30 2023/02/23 19:48:22 miod Exp $
MAN= boot.8
MANSUBDIR=hppa
.include <bsd.prog.mk>
-CPPFLAGS+=${DEBUGFLAGS} -DRELOC=${LOADADDR} -DHEAP_LIMIT=${HEAP_LIMIT}
+CPPFLAGS+=${DEBUGFLAGS} -DRELOC=${LOADADDR} -DHEAP_LIMIT=${HEAP_LIMIT} \
+ -DBOOT_STTY
CFLAGS+=$(SACFLAGS)
CFLAGS+=-fno-pie
AFLAGS+=-fno-pie
-.\" $OpenBSD: boot.8,v 1.26 2019/12/23 12:44:34 bluhm Exp $
+.\" $OpenBSD: boot.8,v 1.27 2023/02/23 19:48:22 miod Exp $
.\"
.\" Copyright (c) 2002 Miodrag Vallat
.\" Copyright (c) 1997-2002 Michael Shalayeff
.\" THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\"
-.Dd $Mdocdate: December 23 2019 $
+.Dd $Mdocdate: February 23 2023 $
.Dt BOOT 8 hppa
.Os
.Sh NAME
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
.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 (i.e.,
-.\" .Li ttya ,
-.\" .Li ttyb ,
-.\" .Li ite0) .
-.El
-.\" .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.
-.\" The baudrate value is not used for the
-.\" .Li ite0
-.\" console.
-.\" .Pp
-.\" The default baudrate is 9600bps.
.It Ic time
Displays system time and date.
.El
-/* $OpenBSD: cdboot.c,v 1.15 2019/10/29 02:55:51 deraadt Exp $ */
+/* $OpenBSD: cdboot.c,v 1.16 2023/02/23 19:48:22 miod Exp $ */
/*
* Copyright (c) 2003 Michael Shalayeff
rc4_keysetup(&randomctx, rnddata, sizeof rnddata);
rc4_skip(&randomctx, 1536);
- marks[MARK_START] = (u_long)DEFAULT_KERNEL_ADDRESS;
+ marks[MARK_START] = 0;
if (!loadfile(path, marks, LOAD_KERNEL)) {
- marks[MARK_END] = ALIGN(marks[MARK_END] -
- (u_long)DEFAULT_KERNEL_ADDRESS);
+ marks[MARK_END] = ALIGN(marks[MARK_END]);
fcacheall();
__asm("mtctl %r0, %cr17");
-/* $OpenBSD: libsa.h,v 1.16 2020/12/09 18:10:18 krw Exp $ */
+/* $OpenBSD: libsa.h,v 1.17 2023/02/23 19:48:22 miod Exp $ */
/*
* Copyright (c) 1998-2004 Michael Shalayeff
#define EXEC_ELF
#define EXEC_SOM
-#define DEFAULT_KERNEL_ADDRESS 0
-
extern dev_t bootdev;
void pdc_init(void);
-# $OpenBSD: Makefile.inc,v 1.53 2022/12/30 06:50:27 jca Exp $
+# $OpenBSD: Makefile.inc,v 1.54 2023/02/23 19:48:22 miod Exp $
CFLAGS=${DEBUG} ${COPTS} -Oz -Wall -Werror
-CFLAGS+= -ffreestanding -fno-stack-protector -DMDRANDOM
+CFLAGS+= -ffreestanding -fno-stack-protector -DMDRANDOM -DBOOT_STTY
CPPFLAGS+=-I${S} -I${SADIR}/libsa -I. -I${.CURDIR}
SACFLAGS=-D_STANDALONE
DEBUGFLAGS=
-.\" $OpenBSD: boot.8,v 1.67 2019/12/23 12:44:34 bluhm Exp $
+.\" $OpenBSD: boot.8,v 1.68 2023/02/23 19:48:22 miod Exp $
.\"
.\" Copyright (c) 1997-2001 Michael Shalayeff
.\" All rights reserved.
.\" THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\"
-.Dd $Mdocdate: December 23 2019 $
+.Dd $Mdocdate: February 23 2023 $
.Dt BOOT 8 i386
.Os
.Sh NAME
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
-/* $OpenBSD: libsa.h,v 1.46 2020/06/14 16:00:11 deraadt Exp $ */
+/* $OpenBSD: libsa.h,v 1.47 2023/02/23 19:48:22 miod Exp $ */
/*
* Copyright (c) 1996-1999 Michael Shalayeff
#define EXEC_ELF
-#define DEFAULT_KERNEL_ADDRESS 0
-
struct i386_boot_probes {
char *name;
void (**probes)(void);
-.\" $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.
.\" THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\"
-.Dd $Mdocdate: December 23 2019 $
+.Dd $Mdocdate: February 23 2023 $
.Dt BOOT 8 landisk
.Os
.Sh NAME
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
.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
-/* $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
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)
{
-/* $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
#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);
-/* $OpenBSD: libsa.h,v 1.7 2020/12/09 18:10:19 krw Exp $ */
+/* $OpenBSD: libsa.h,v 1.8 2023/02/23 19:48:22 miod Exp $ */
/*
* Copyright (c) 2010 Miodrag Vallat.
#include <lib/libsa/stand.h>
-#define DEFAULT_KERNEL_ADDRESS 0
-
/* where the initrd is loaded */
#define INITRD_BASE PHYS_TO_CKSEG0(0x04000000)
-/* $OpenBSD: machdep.c,v 1.8 2014/07/13 09:26:08 jasper Exp $ */
+/* $OpenBSD: machdep.c,v 1.9 2023/02/23 19:48:22 miod Exp $ */
/*
* Copyright (c) 2010 Miodrag Vallat.
extern int bootprompt;
-/*
- * Console
- */
-
-int
-cnspeed(dev_t dev, int sp)
-{
- return CONSPEED;
-}
-
-char *
-ttyname(int fd)
-{
- return "pmon console";
-}
-
-dev_t
-ttydev(char *name)
-{
- /* we do not support any other console than pmon */
- return NODEV;
-}
-
/*
* Configuration and device path aerobics
*/
-.\" $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.
.\" THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\"
-.Dd $Mdocdate: January 12 2023 $
+.Dd $Mdocdate: February 23 2023 $
.Dt BOOT 8 luna88k
.Os
.Sh NAME
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
-/* $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 $ */
/*
/* 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.
*/
-/* $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);
-.\" $OpenBSD: boot.8,v 1.5 2022/09/05 10:03:50 kn Exp $
+.\" $OpenBSD: boot.8,v 1.6 2023/02/23 19:48:22 miod Exp $
.\"
.\" Copyright (c) 1997-2001 Michael Shalayeff
.\" All rights reserved.
.\" THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\"
-.Dd $Mdocdate: September 5 2022 $
+.Dd $Mdocdate: February 23 2023 $
.Dt BOOT 8 macppc
.Os
.Sh NAME
Variables include:
.Pp
.Bl -tag -compact -width boothow
-.It Ic addr
-Address at which to load the kernel.
.It Ic debug
Debug flag if
.Nm
.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 com0 ) .
-.\" Currently, only the first serial port
-.\" .Pq Li com0
-.\" is supported for console on macppc.
-.El
-.\" XXX ignored, so don't document it.
-.\" .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
-/* $OpenBSD: libsa.h,v 1.3 2022/10/21 21:26:49 gkoehler Exp $ */
+/* $OpenBSD: libsa.h,v 1.4 2023/02/23 19:48:22 miod Exp $ */
/*
* Copyright (c) 2006 Mark Kettenis
#include <lib/libsa/stand.h>
-#define DEFAULT_KERNEL_ADDRESS 0
-
void freeall(void);
void syncicache(void *, size_t);
-/* $OpenBSD: main.c,v 1.12 2020/10/03 06:22:20 gkoehler Exp $ */
+/* $OpenBSD: main.c,v 1.13 2023/02/23 19:48:22 miod Exp $ */
/* $NetBSD: boot.c,v 1.1 1997/04/16 20:29:17 thorpej Exp $ */
/*
_rtt();
}
-
-int
-cnspeed(dev_t dev, int sp)
-{
- return CONSPEED;
-}
-
-char ttyname_buf[8];
-
-char *
-ttyname(int fd)
-{
- snprintf(ttyname_buf, sizeof ttyname_buf, "ofc0");
- return ttyname_buf;
-}
-
-dev_t
-ttydev(char *name)
-{
- return makedev(0,0);
-}
-/* $OpenBSD: ofdev.h,v 1.2 2019/09/02 23:40:29 kettenis Exp $ */
+/* $OpenBSD: ofdev.h,v 1.3 2023/02/23 19:48:22 miod Exp $ */
/* $NetBSD: ofdev.h,v 1.1 1997/04/16 20:29:22 thorpej Exp $ */
/*
#define OFDEV_NET 1
#define OFDEV_DISK 2
-#define DEFAULT_KERNEL "/bsd"
-
extern char opened_name[];
int net_open(struct of_dev *);
-# $OpenBSD: Makefile,v 1.4 2023/01/04 13:01:47 deraadt Exp $
+# $OpenBSD: Makefile,v 1.5 2023/02/23 19:48:22 miod Exp $
NOMAN= #
CPPFLAGS+= -nostdinc
CPPFLAGS+= -I${S} -I. -I${.CURDIR}
CPPFLAGS+= -I${EFIDIR}/include -I${EFIDIR}/include/riscv64
-CPPFLAGS+= -D_STANDALONE
+CPPFLAGS+= -D_STANDALONE -DBOOT_STTY
CPPFLAGS+= -DSMALL -DSLOW -DNOBYFOUR -D__INTERNAL_LIBSA_CREAD
CPPFLAGS+= -DNEEDS_HEAP_H -DFWRANDOM
CPPFLAGS+= -march=rv64gc --target=riscv64 -mno-relax
-/* $OpenBSD: libsa.h,v 1.1 2021/04/28 19:01:00 drahn Exp $ */
+/* $OpenBSD: libsa.h,v 1.2 2023/02/23 19:48:22 miod Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis
#include <lib/libsa/stand.h>
-#define DEFAULT_KERNEL_ADDRESS 0
-
#ifdef DEBUG
#define DPRINTF(x) printf x;
#else
-/* $OpenBSD: boot.c,v 1.56 2021/10/26 16:29:49 deraadt Exp $ */
+/* $OpenBSD: boot.c,v 1.57 2023/02/23 19:48:22 miod Exp $ */
/*
* Copyright (c) 2003 Dale Rahn
strlcpy(cmd.image, kernelfile, sizeof(cmd.image));
cmd.boothowto = 0;
cmd.conf = "/etc/boot.conf";
- cmd.addr = (void *)DEFAULT_KERNEL_ADDRESS;
cmd.timeout = boottimeout;
if (upgrade()) {
bootprompt = 1; /* allow reselect should we fail */
printf("booting %s: ", cmd.path);
- marks[MARK_START] = (u_long)cmd.addr;
+ marks[MARK_START] = 0;
if ((fd = loadfile(cmd.path, marks, LOAD_ALL)) != -1) {
/* Prevent re-upgrade: chmod a-x bsd.upgrade */
-/* $OpenBSD: cmd.c,v 1.69 2022/06/27 20:22:26 miod Exp $ */
+/* $OpenBSD: cmd.c,v 1.70 2023/02/23 19:48:22 miod Exp $ */
/*
* Copyright (c) 1997-1999 Michael Shalayeff
static int Xls(void);
static int Xnop(void);
static int Xreboot(void);
+#ifdef BOOT_STTY
static int Xstty(void);
+#endif
static int Xtime(void);
#ifdef MACHINE_CMD
static int Xmachine(void);
#endif
{"reboot", CMDT_CMD, Xreboot},
{"set", CMDT_SET, Xset},
+#ifdef BOOT_STTY
{"stty", CMDT_CMD, Xstty},
+#endif
{"time", CMDT_CMD, Xtime},
{NULL, 0},
};
return 0;
}
+#ifdef BOOT_STTY
static int
Xstty(void)
{
}
return 0;
}
+#endif
static int
Xtime(void)
-/* $OpenBSD: cmd.h,v 1.18 2019/05/10 12:49:58 claudio Exp $ */
+/* $OpenBSD: cmd.h,v 1.19 2023/02/23 19:48:22 miod Exp $ */
/*
* Copyright (c) 1997 Michael Shalayeff
char image[MAXPATHLEN - 16]; /* image */
int boothowto; /* howto */
char *conf; /* /etc/boot.conf normally */
- void *addr; /* load here */
int timeout;
char path[MAXPATHLEN]; /* buffer for pathname compose */
-/* $OpenBSD: vars.c,v 1.15 2014/07/11 12:33:12 jasper Exp $ */
+/* $OpenBSD: vars.c,v 1.16 2023/02/23 19:48:22 miod Exp $ */
/*
* Copyright (c) 1998-2000 Michael Shalayeff
extern int debug;
int db_console = -1;
-static int Xaddr(void);
static int Xdevice(void);
#ifdef DEBUG
static int Xdebug(void);
static int Xdb_console(void);
static int Ximage(void);
static int Xhowto(void);
+#ifdef BOOT_STTY
static int Xtty(void);
+#endif
static int Xtimeout(void);
int Xset(void);
int Xenv(void);
const struct cmd_table cmd_set[] = {
- {"addr", CMDT_VAR, Xaddr},
{"howto", CMDT_VAR, Xhowto},
#ifdef DEBUG
{"debug", CMDT_VAR, Xdebug},
#endif
{"device", CMDT_VAR, Xdevice},
+#ifdef BOOT_STTY
{"tty", CMDT_VAR, Xtty},
+#endif
{"image", CMDT_VAR, Ximage},
{"timeout",CMDT_VAR, Xtimeout},
{"db_console", CMDT_VAR, Xdb_console},
return 0;
}
-static int
-Xaddr(void)
-{
- if (cmd.argc != 2)
- printf("%p\n", cmd.addr);
- else
- cmd.addr = (void *)strtol(cmd.argv[1], NULL, 0);
- return 0;
-}
-
+#ifdef BOOT_STTY
static int
Xtty(void)
{
}
return 0;
}
+#endif
static int
Xhowto(void)
projects / openbsd / commitdiff