diff options
| author |   yasuoka <yasuoka@openbsd.org> | 2017-05-31 08:23:33 +0000 |
|---|---|---|
| committer | yasuoka <yasuoka@openbsd.org> | 2017-05-31 08:23:33 +0000 |
| commit | b41a05da001910eb37e72590de5f487c973087cc (patch) | |
| tree | f8a36df1e2bfe56794536a46a4237f7abe970e2b /sys | |
| parent | Implement support for iwm(4) firmware's missed beacon notification. (diff) | |
| download | wireguard-openbsd-b41a05da001910eb37e72590de5f487c973087cc.tar.xz wireguard-openbsd-b41a05da001910eb37e72590de5f487c973087cc.zip | |
Disable "machine boot" and "machine comaddr" from efiboot.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/stand/libsa/cmd_i386.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/arch/amd64/stand/libsa/cmd_i386.c b/sys/arch/amd64/stand/libsa/cmd_i386.c index 9c3eac0b881..592cca49547 100644 --- a/sys/arch/amd64/stand/libsa/cmd_i386.c +++ b/sys/arch/amd64/stand/libsa/cmd_i386.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd_i386.c,v 1.10 2016/06/10 18:36:06 jcs Exp $ */ +/* $OpenBSD: cmd_i386.c,v 1.11 2017/05/31 08:23:33 yasuoka Exp $ */ /* * Copyright (c) 1997-1999 Michael Shalayeff @@ -54,8 +54,10 @@ int Xregs(void); int bootbuf(void *, int); const struct cmd_table cmd_machine[] = { +#ifndef EFIBOOT { "boot", CMDT_CMD, Xboot }, { "comaddr", CMDT_CMD, Xcomaddr }, +#endif { "diskinfo", CMDT_CMD, Xdiskinfo }, { "memory", CMDT_CMD, Xmemory }, #ifdef EFIBOOT @@ -89,12 +91,11 @@ Xregs(void) } #endif +#ifndef EFIBOOT int Xboot(void) { -#ifdef EFIBOOT printf("Not supported yet\n"); -#else int dev, part, st; struct diskinfo *dip; char buf[DEV_BSIZE], *dest = (void *)BOOTBIOS_ADDR; @@ -151,9 +152,9 @@ Xboot(void) bad: printf("Invalid device!\n"); -#endif return 0; } +#endif int Xmemory(void) @@ -224,6 +225,7 @@ Xmemory(void) return 0; } +#ifndef EFIBOOT int Xcomaddr(void) { @@ -234,3 +236,4 @@ Xcomaddr(void) return 0; } +#endif |