[src/trunk]: src/sys/stand/efiboot Fix bootarm build.

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2f6b8f8b66fd
branches:  trunk
changeset: 1023988:2f6b8f8b66fd
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Wed Oct 06 10:15:20 2021 +0000

description:
Fix bootarm build.

diffstat:

 sys/stand/efiboot/bootarm/Makefile |  4 +++-
 sys/stand/efiboot/efifdt.c         |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (43 lines):

diff -r 3731f5ce176d -r 2f6b8f8b66fd sys/stand/efiboot/bootarm/Makefile
--- a/sys/stand/efiboot/bootarm/Makefile        Wed Oct 06 10:13:19 2021 +0000
+++ b/sys/stand/efiboot/bootarm/Makefile        Wed Oct 06 10:15:20 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/10/06 10:13:20 jmcneill Exp $
+# $NetBSD: Makefile,v 1.8 2021/10/06 10:15:20 jmcneill Exp $
 
 PROG=          bootarm.efi
 OBJFMT=                binary
@@ -7,6 +7,8 @@
 LIBGNUEFI_ARCH=        arm
 OBJCOPY_FORMAT=        -O binary
 
+EFIBOOT_FDT=   yes
+
 EXTRA_SOURCES= efibootarm.c
 EXTRA_SOURCES+=        cache.S
 
diff -r 3731f5ce176d -r 2f6b8f8b66fd sys/stand/efiboot/efifdt.c
--- a/sys/stand/efiboot/efifdt.c        Wed Oct 06 10:13:19 2021 +0000
+++ b/sys/stand/efiboot/efifdt.c        Wed Oct 06 10:15:20 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: efifdt.c,v 1.30 2021/10/06 10:13:19 jmcneill Exp $ */
+/* $NetBSD: efifdt.c,v 1.31 2021/10/06 10:15:20 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2019 Jason R. Thorpe
@@ -387,6 +387,7 @@
                fdt_appendprop_u32(fdt_data, fb, "stride", mode->Info->PixelsPerScanLine * 4);  /* XXX */
                fdt_appendprop_string(fdt_data, fb, "format", "a8b8g8r8");
 
+#ifdef EFIBOOT_ACPI
                /*
                 * In ACPI mode, use GOP as console.
                 */
@@ -394,6 +395,7 @@
                        snprintf(buf, sizeof(buf), "/chosen/framebuffer@%" PRIx64, mode->FrameBufferBase);
                        fdt_setprop_string(fdt_data, chosen, "stdout-path", buf);
                }
+#endif
 
                return;
        }