Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/stand/efiboot Fix non-ACPI builds.



details:   https://anonhg.NetBSD.org/src/rev/da8c6fada468
branches:  trunk
changeset: 1024776:da8c6fada468
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Nov 04 07:28:34 2021 +0000

description:
Fix non-ACPI builds.

diffstat:

 sys/stand/efiboot/boot.c |  9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diffs (46 lines):

diff -r 7af6e6619fcb -r da8c6fada468 sys/stand/efiboot/boot.c
--- a/sys/stand/efiboot/boot.c  Thu Nov 04 06:57:51 2021 +0000
+++ b/sys/stand/efiboot/boot.c  Thu Nov 04 07:28:34 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot.c,v 1.41 2021/11/03 22:02:36 skrll Exp $  */
+/*     $NetBSD: boot.c,v 1.42 2021/11/04 07:28:34 skrll Exp $  */
 
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka <nonaka%netbsd.org@localhost>
@@ -93,7 +93,9 @@
 int    set_bootfile(const char *);
 int    set_bootargs(const char *);
 
+#ifdef EFIBOOT_ACPI
 void   command_acpi(char *);
+#endif
 void   command_boot(char *);
 void   command_dev(char *);
 void   command_initrd(char *);
@@ -116,7 +118,9 @@
 void   command_quit(char *);
 
 const struct boot_command commands[] = {
+#ifdef EFIBOOT_ACPI
        { "acpi",       command_acpi,           "acpi [{on|off}]" },
+#endif
        { "boot",       command_boot,           "boot [dev:][filename] [args]\n     (ex. \"hd0a:\\netbsd.old -s\"" },
        { "dev",        command_dev,            "dev" },
 #ifdef EFIBOOT_FDT
@@ -174,6 +178,7 @@
        }
 }
 
+#ifdef EFIBOOT_ACPI
 void
 command_acpi(char *arg)
 {
@@ -191,6 +196,8 @@
                    efi_acpi_enabled() ? "en" : "dis");
        }
 }
+#endif
+
 void
 command_boot(char *arg)
 {



Home | Main Index | Thread Index | Old Index