Module Name: src
Committed By: jmcneill
Date: Wed Oct 6 10:15:20 UTC 2021
Modified Files:
src/sys/stand/efiboot: efifdt.c
src/sys/stand/efiboot/bootarm: Makefile
Log Message:
Fix bootarm build.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/stand/efiboot/efifdt.c
cvs rdiff -u -r1.7 -r1.8 src/sys/stand/efiboot/bootarm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/stand/efiboot/efifdt.c
diff -u src/sys/stand/efiboot/efifdt.c:1.30 src/sys/stand/efiboot/efifdt.c:1.31
--- src/sys/stand/efiboot/efifdt.c:1.30 Wed Oct 6 10:13:19 2021
+++ src/sys/stand/efiboot/efifdt.c Wed Oct 6 10:15:20 2021
@@ -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 @@ efi_fdt_gop(void)
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 @@ efi_fdt_gop(void)
snprintf(buf, sizeof(buf), "/chosen/framebuffer@%" PRIx64, mode->FrameBufferBase);
fdt_setprop_string(fdt_data, chosen, "stdout-path", buf);
}
+#endif
return;
}
Index: src/sys/stand/efiboot/bootarm/Makefile
diff -u src/sys/stand/efiboot/bootarm/Makefile:1.7 src/sys/stand/efiboot/bootarm/Makefile:1.8
--- src/sys/stand/efiboot/bootarm/Makefile:1.7 Wed Oct 6 10:13:20 2021
+++ src/sys/stand/efiboot/bootarm/Makefile Wed Oct 6 10:15:20 2021
@@ -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 @@ GNUEFIARCH= arm
LIBGNUEFI_ARCH= arm
OBJCOPY_FORMAT= -O binary
+EFIBOOT_FDT= yes
+
EXTRA_SOURCES= efibootarm.c
EXTRA_SOURCES+= cache.S
