Fri Feb 23 22:10:40 2024 UTC (89d)
s/optionms/options/ in copy-pasted comment.


(andvar)
diff -r1.122 -r1.123 src/sys/arch/amd64/conf/files.amd64
diff -r1.407 -r1.408 src/sys/arch/i386/conf/files.i386
diff -r1.34 -r1.35 src/sys/arch/xen/conf/files.compat
cvs diff -r1.122 -r1.123 src/sys/arch/amd64/conf/files.amd64 (expand / switch to unified diff)

--- src/sys/arch/amd64/conf/files.amd64 2023/12/05 16:32:38 1.122
+++ src/sys/arch/amd64/conf/files.amd64 2024/02/23 22:10:39 1.123
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: files.amd64,v 1.122 2023/12/05 16:32:38 thorpej Exp $ 1# $NetBSD: files.amd64,v 1.123 2024/02/23 22:10:39 andvar Exp $
2# 2#
3# new style config file for amd64 architecture 3# new style config file for amd64 architecture
4# 4#
5 5
6# maxpartitions must be first item in files.${ARCH}.newconf 6# maxpartitions must be first item in files.${ARCH}.newconf
7maxpartitions 16 7maxpartitions 16
8 8
9maxusers 2 16 128 9maxusers 2 16 128
10 10
11# delay before cpu_reset() for reboot. 11# delay before cpu_reset() for reboot.
12defparam CPURESET_DELAY 12defparam CPURESET_DELAY
13 13
14# The REAL{BASE,EXT}MEM options 14# The REAL{BASE,EXT}MEM options
15defparam opt_realmem.h REALBASEMEM REALEXTMEM 15defparam opt_realmem.h REALBASEMEM REALEXTMEM
16 16
17# The PHYSMEM_MAX_{SIZE,ADDR} optionms 17# The PHYSMEM_MAX_{SIZE,ADDR} options
18defparam opt_physmem.h PHYSMEM_MAX_ADDR PHYSMEM_MAX_SIZE 18defparam opt_physmem.h PHYSMEM_MAX_ADDR PHYSMEM_MAX_SIZE
19 19
20# Enable GCC spectre V2 mitigation options 20# Enable GCC spectre V2 mitigation options
21defflag opt_spectre.h SPECTRE_V2_GCC_MITIGATION 21defflag opt_spectre.h SPECTRE_V2_GCC_MITIGATION
22 22
23# Enable kernel self-relocation at bootstrap 23# Enable kernel self-relocation at bootstrap
24defflag opt_selfreloc.h SELFRELOC 24defflag opt_selfreloc.h SELFRELOC
25 25
26# 26#
27# XXX these are just here at the moment so that we can share files 27# XXX these are just here at the moment so that we can share files
28# with the i386 (they include the opt_*.h for these) 28# with the i386 (they include the opt_*.h for these)
29# 29#
30 30
cvs diff -r1.407 -r1.408 src/sys/arch/i386/conf/files.i386 (expand / switch to unified diff)

--- src/sys/arch/i386/conf/files.i386 2020/10/21 13:31:51 1.407
+++ src/sys/arch/i386/conf/files.i386 2024/02/23 22:10:39 1.408
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1# $NetBSD: files.i386,v 1.407 2020/10/21 13:31:51 christos Exp $ 1# $NetBSD: files.i386,v 1.408 2024/02/23 22:10:39 andvar Exp $
2# 2#
3# new style config file for i386 architecture 3# new style config file for i386 architecture
4# 4#
5 5
6# maxpartitions must be first item in files.${ARCH}.newconf 6# maxpartitions must be first item in files.${ARCH}.newconf
7maxpartitions 8 7maxpartitions 8
8 8
9maxusers 2 16 128 9maxusers 2 16 128
10 10
11defparam opt_kernbase.h KERNBASE 11defparam opt_kernbase.h KERNBASE
12 12
13# delay before cpu_reset() for reboot. 13# delay before cpu_reset() for reboot.
14defparam CPURESET_DELAY 14defparam CPURESET_DELAY
15 15
16# Obsolete Xbox support 16# Obsolete Xbox support
17obsolete defflag XBOX 17obsolete defflag XBOX
18 18
19# User-settable LDT (used by WINE) 19# User-settable LDT (used by WINE)
20defflag USER_LDT 20defflag USER_LDT
21 21
22# X server support in console drivers 22# X server support in console drivers
23defflag opt_xserver.h XSERVER XSERVER_DDB 23defflag opt_xserver.h XSERVER XSERVER_DDB
24 24
25# The REAL{BASE,EXT}MEM options 25# The REAL{BASE,EXT}MEM options
26defparam opt_realmem.h REALBASEMEM REALEXTMEM 26defparam opt_realmem.h REALBASEMEM REALEXTMEM
27 27
28# The PHYSMEM_MAX_{SIZE,ADDR} optionms 28# The PHYSMEM_MAX_{SIZE,ADDR} options
29defparam opt_physmem.h PHYSMEM_MAX_ADDR PHYSMEM_MAX_SIZE 29defparam opt_physmem.h PHYSMEM_MAX_ADDR PHYSMEM_MAX_SIZE
30 30
31# PCI BIOS options 31# PCI BIOS options
32defflag opt_pcibios.h PCIBIOS PCIBIOSVERBOSE 32defflag opt_pcibios.h PCIBIOS PCIBIOSVERBOSE
33 PCIBIOS_INTR_GUESS PCIINTR_DEBUG 33 PCIBIOS_INTR_GUESS PCIINTR_DEBUG
34defparam opt_pcibios.h PCIBIOS_IRQS_HINT 34defparam opt_pcibios.h PCIBIOS_IRQS_HINT
35 35
36# splraise()/spllower() debug 36# splraise()/spllower() debug
37defflag opt_spldebug.h SPLDEBUG 37defflag opt_spldebug.h SPLDEBUG
38 38
39# Enable GCC spectre V2 mitigation options 39# Enable GCC spectre V2 mitigation options
40defflag opt_spectre.h SPECTRE_V2_GCC_MITIGATION 40defflag opt_spectre.h SPECTRE_V2_GCC_MITIGATION
41 41
cvs diff -r1.34 -r1.35 src/sys/arch/xen/conf/files.compat (expand / switch to unified diff)

--- src/sys/arch/xen/conf/files.compat 2022/06/23 14:32:16 1.34
+++ src/sys/arch/xen/conf/files.compat 2024/02/23 22:10:39 1.35
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: files.compat,v 1.34 2022/06/23 14:32:16 bouyer Exp $ 1# $NetBSD: files.compat,v 1.35 2024/02/23 22:10:39 andvar Exp $
2# NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp  2# NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp
3 3
4# options for MP configuration through the MP spec 4# options for MP configuration through the MP spec
5#defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI 5#defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI
6#defflag opt_mpacpi.h MPACPI MPACPI_SCANPCI 6#defflag opt_mpacpi.h MPACPI MPACPI_SCANPCI
7 7
8# XXX define fake options to make config create the .h files 8# XXX define fake options to make config create the .h files
9defflag lapic.h XXXLAPIC 9defflag lapic.h XXXLAPIC
10defflag apm.h XXXAPM 10defflag apm.h XXXAPM
11defflag eisa.h XXXEISA 11defflag eisa.h XXXEISA
12defflag mca.h XXXMCA 12defflag mca.h XXXMCA
13defflag ega.h XXXEGA 13defflag ega.h XXXEGA
14defflag pcdisplay.h XXXPCDISPLAY 14defflag pcdisplay.h XXXPCDISPLAY
@@ -34,15 +34,15 @@ defflag opt_largepages.h XXXLARGEPAGES @@ -34,15 +34,15 @@ defflag opt_largepages.h XXXLARGEPAGES
34 34
35#Pentium 4+ Thermal Monitor ODCM (aka On Demand Clock Modulation) 35#Pentium 4+ Thermal Monitor ODCM (aka On Demand Clock Modulation)
36defflag opt_intel_odcm.h XXXINTEL_ONDEMAND_CLOCKMOD 36defflag opt_intel_odcm.h XXXINTEL_ONDEMAND_CLOCKMOD
37 37
38# Intel On Die Temperature sensor 38# Intel On Die Temperature sensor
39defflag opt_intel_coretemp.h XXXINTEL_CORETEMP 39defflag opt_intel_coretemp.h XXXINTEL_CORETEMP
40 40
41# VIA C7 Temperature sensor 41# VIA C7 Temperature sensor
42defflag opt_via_c7temp.h XXXVIA_CORETEMP 42defflag opt_via_c7temp.h XXXVIA_CORETEMP
43 43
44# Multiboot support 44# Multiboot support
45defflag opt_multiboot.h XXXMULTIBOOT 45defflag opt_multiboot.h XXXMULTIBOOT
46 46
47# The PHYSMEM_MAX_{SIZE,ADDR} optionms 47# The PHYSMEM_MAX_{SIZE,ADDR} options
48defparam opt_physmem.h XXXPHYSMEM_MAX_ADDR XXXPHYSMEM_MAX_SIZE 48defparam opt_physmem.h XXXPHYSMEM_MAX_ADDR XXXPHYSMEM_MAX_SIZE