[src/trunk]: src/sys/arch/amiga/conf regen

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

details:   https://anonhg.NetBSD.org/src/rev/ec1f4649edb5
branches:  trunk
changeset: 999267:ec1f4649edb5
user:      sevan <sevan%NetBSD.org@localhost>
date:      Sun May 26 23:03:31 2019 +0000

description:
regen

diffstat:

 sys/arch/amiga/conf/DRACO   |  22 ++++++----------------
 sys/arch/amiga/conf/GENERIC |   7 ++++---
 sys/arch/amiga/conf/INSTALL |  22 ++++++----------------
 3 files changed, 16 insertions(+), 35 deletions(-)

diffs (152 lines):

diff -r 9bd7e3dc2704 -r ec1f4649edb5 sys/arch/amiga/conf/DRACO
--- a/sys/arch/amiga/conf/DRACO Sun May 26 23:00:57 2019 +0000
+++ b/sys/arch/amiga/conf/DRACO Sun May 26 23:03:31 2019 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: DRACO,v 1.189 2019/04/13 08:26:14 isaki Exp $
+# $NetBSD: DRACO,v 1.190 2019/05/26 23:03:31 sevan Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
 #
-# Created from: # NetBSD: GENERIC.in,v 1.141 2019/04/13 08:22:58 isaki Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.142 2019/05/26 23:00:57 sevan Exp $
 #
 ##
 # GENERIC machine description file
@@ -29,7 +29,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.189 $"
+#ident                 "GENERIC-$Revision: 1.190 $"
 
 makeoptions    COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
 
@@ -152,7 +152,7 @@
 # Alternate buffer queue strategies for better responsiveness under high
 # disk I/O load.
 #options       BUFQ_READPRIO
-#options       BUFQ_PRIOCSCAN
+options        BUFQ_PRIOCSCAN
 
 #
 # Misc. debugging options
@@ -306,7 +306,7 @@
 pseudo-device  tap                     # virtual Ethernet
 #pseudo-device gre                     # generic L3 over IP tunnel
 pseudo-device  bpfilter                # Berkeley packet filter
-#pseudo-device carp                    # Common Address Redundancy Protocol
+pseudo-device  carp                    # Common Address Redundancy Protocol
 pseudo-device  npf                     # NPF packet filter
 pseudo-device  gif                     # IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device faith                   # IPv[46] tcp relay translation i/f
@@ -347,16 +347,6 @@
 pseudo-device  nsmb                    # experimental - SMB requester
 
 # Veriexec
-#
-# a pseudo device needed for veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+include "dev/veriexec.config"
 
 config netbsd root on ? type ?
diff -r 9bd7e3dc2704 -r ec1f4649edb5 sys/arch/amiga/conf/GENERIC
--- a/sys/arch/amiga/conf/GENERIC       Sun May 26 23:00:57 2019 +0000
+++ b/sys/arch/amiga/conf/GENERIC       Sun May 26 23:03:31 2019 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: GENERIC,v 1.324 2019/04/26 21:40:28 sevan Exp $
+# $NetBSD: GENERIC,v 1.325 2019/05/26 23:03:31 sevan Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
 #
-# Created from: # NetBSD: GENERIC.in,v 1.141 2019/04/13 08:22:58 isaki Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.142 2019/05/26 23:00:57 sevan Exp $
 #
 ##
 # GENERIC machine description file
@@ -29,7 +29,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.324 $"
+#ident                 "GENERIC-$Revision: 1.325 $"
 
 makeoptions    COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
 
@@ -594,6 +594,7 @@
 pseudo-device   bcsp                    # BlueCore Serial Protocol
 pseudo-device   btuart                  # Bluetooth HCI UART (H4)
 
+# Veriexec
 include "dev/veriexec.config"
 
 config netbsd root on ? type ?
diff -r 9bd7e3dc2704 -r ec1f4649edb5 sys/arch/amiga/conf/INSTALL
--- a/sys/arch/amiga/conf/INSTALL       Sun May 26 23:00:57 2019 +0000
+++ b/sys/arch/amiga/conf/INSTALL       Sun May 26 23:03:31 2019 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: INSTALL,v 1.131 2018/08/01 20:04:10 maxv Exp $
+# $NetBSD: INSTALL,v 1.132 2019/05/26 23:03:31 sevan Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
 #
-# Created from: # NetBSD: GENERIC.in,v 1.135 2017/09/13 22:24:42 sevan Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.142 2019/05/26 23:00:57 sevan Exp $
 #
 ##
 # GENERIC machine description file
@@ -29,7 +29,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.131 $"
+#ident                 "GENERIC-$Revision: 1.132 $"
 
 makeoptions    COPTS="-Os"
 
@@ -130,7 +130,7 @@
 # Alternate buffer queue strategies for better responsiveness under high
 # disk I/O load.
 #options       BUFQ_READPRIO
-#options       BUFQ_PRIOCSCAN
+options        BUFQ_PRIOCSCAN
 
 #
 # Misc. debugging options
@@ -497,7 +497,7 @@
 pseudo-device  tap                     # virtual Ethernet
 #pseudo-device gre                     # generic L3 over IP tunnel
 pseudo-device  bpfilter                # Berkeley packet filter
-#pseudo-device carp                    # Common Address Redundancy Protocol
+pseudo-device  carp                    # Common Address Redundancy Protocol
 pseudo-device  npf                     # NPF packet filter
 pseudo-device  gif                     # IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device faith                   # IPv[46] tcp relay translation i/f
@@ -537,16 +537,6 @@
 pseudo-device   btuart                  # Bluetooth HCI UART (H4)
 
 # Veriexec
-#
-# a pseudo device needed for veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+include "dev/veriexec.config"
 
 config netbsd root on ? type ?