Module Name: src
Committed By: martin
Date: Tue Aug 1 16:07:20 UTC 2023
Modified Files:
src/sys/arch/i386/conf [netbsd-10]: ALL GENERIC
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #293):
sys/arch/i386/conf/ALL: revision 1.507
sys/arch/i386/conf/GENERIC: revision 1.1247
i386/ALL: Enable EFI runtime support.
PR kern/57076
i386/GENERIC: Enable EFI runtime support.
PR kern/57076
To generate a diff of this commit:
cvs rdiff -u -r1.503.4.1 -r1.503.4.2 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1243 -r1.1243.2.1 src/sys/arch/i386/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.503.4.1 src/sys/arch/i386/conf/ALL:1.503.4.2
--- src/sys/arch/i386/conf/ALL:1.503.4.1 Sun Jul 30 12:01:54 2023
+++ src/sys/arch/i386/conf/ALL Tue Aug 1 16:07:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.503.4.1 2023/07/30 12:01:54 martin Exp $
+# $NetBSD: ALL,v 1.503.4.2 2023/08/01 16:07:19 martin Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.503.4.1 $"
+#ident "ALL-$Revision: 1.503.4.2 $"
maxusers 64 # estimated number of users
@@ -1806,9 +1806,9 @@ pseudo-device pad
# userland interface to drivers, including autoconf and properties retrieval
pseudo-device drvctl
-# EFI runtime support -- doesn't build yet
-#options EFI_RUNTIME
-#pseudo-device efi # /dev/efi
+# EFI runtime support
+options EFI_RUNTIME
+pseudo-device efi # /dev/efi
# Pass-to-Userspace Transporter
pseudo-device putter
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1243 src/sys/arch/i386/conf/GENERIC:1.1243.2.1
--- src/sys/arch/i386/conf/GENERIC:1.1243 Sun Dec 11 04:20:52 2022
+++ src/sys/arch/i386/conf/GENERIC Tue Aug 1 16:07:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1243 2022/12/11 04:20:52 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.1243.2.1 2023/08/01 16:07:19 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1243 $"
+#ident "GENERIC-$Revision: 1.1243.2.1 $"
maxusers 64 # estimated number of users
@@ -1508,9 +1508,9 @@ pseudo-device cmos
# userland interface to drivers, including autoconf and properties retrieval
pseudo-device drvctl
-# EFI runtime support -- not yet tested
-#options EFI_RUNTIME
-#pseudo-device efi # /dev/efi
+# EFI runtime support
+options EFI_RUNTIME
+pseudo-device efi # /dev/efi
include "dev/veriexec.config"
