Sat Oct 16 13:55:54 2010 UTC ()
Add commented out options MODULAR.


(tsutsui)
diff -r1.151 -r1.152 src/sys/arch/sun3/conf/GENERIC
diff -r1.107 -r1.108 src/sys/arch/sun3/conf/GENERIC3X
cvs diff -r1.151 -r1.152 src/sys/arch/sun3/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/sun3/conf/GENERIC 2010/07/07 01:24:52 1.151
+++ src/sys/arch/sun3/conf/GENERIC 2010/10/16 13:55:54 1.152
@@ -1,57 +1,60 @@ @@ -1,57 +1,60 @@
1# $NetBSD: GENERIC,v 1.151 2010/07/07 01:24:52 chs Exp $ 1# $NetBSD: GENERIC,v 1.152 2010/10/16 13:55:54 tsutsui Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4#  4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21# Supports Sun3 (3/50, 3/60, 3/110, 3/160, 3/260, 3/E) 21# Supports Sun3 (3/50, 3/60, 3/110, 3/160, 3/260, 3/E)
22# Supports root on: ie0, le0, sd*, ... 22# Supports root on: ie0, le0, sd*, ...
23 23
24include "arch/sun3/conf/std.sun3" 24include "arch/sun3/conf/std.sun3"
25 25
26options INCLUDE_CONFIG_FILE # embed config file in kernel binary 26options INCLUDE_CONFIG_FILE # embed config file in kernel binary
27 27
28#ident "GENERIC-$Revision: 1.151 $" 28#ident "GENERIC-$Revision: 1.152 $"
29 29
30makeoptions COPTS="-Os" # bootloader has size limit (~2MB) 30makeoptions COPTS="-Os" # bootloader has size limit (~2MB)
31 31
32# Machines to be supported by this kernel 32# Machines to be supported by this kernel
33options FPU_EMULATE 33options FPU_EMULATE
34options HAVECACHE # Sun3/260 VAC 34options HAVECACHE # Sun3/260 VAC
35 35
36# Needs to be set per system. i.e change these as you see fit 36# Needs to be set per system. i.e change these as you see fit
37maxusers 4 37maxusers 4
38 38
39# Standard system options 39# Standard system options
40options KTRACE # system call tracing 40options KTRACE # system call tracing
41options SYSVMSG # System V message queues 41options SYSVMSG # System V message queues
42options SYSVSEM # System V semaphores 42options SYSVSEM # System V semaphores
43options SYSVSHM # System V shared memory 43options SYSVSHM # System V shared memory
44options P1003_1B_SEMAPHORE # p1003.1b semaphore support 44options P1003_1B_SEMAPHORE # p1003.1b semaphore support
 45
 46#options MODULAR # new style module framework
 47
45#options INSECURE # disable kernel security level 48#options INSECURE # disable kernel security level
46#options USERCONF # userconf(4) support 49#options USERCONF # userconf(4) support
47#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) 50#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
48options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel 51options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
49 52
50# Enable experimental buffer queue strategy for better responsiveness under  53# Enable experimental buffer queue strategy for better responsiveness under
51# high disk I/O load. Use it with caution - it's not proven to be stable yet. 54# high disk I/O load. Use it with caution - it's not proven to be stable yet.
52#options BUFQ_READPRIO 55#options BUFQ_READPRIO
53#options BUFQ_PRIOCSCAN 56#options BUFQ_PRIOCSCAN
54 57
55# Which kernel debugger? Uncomment either this: 58# Which kernel debugger? Uncomment either this:
56options DDB 59options DDB
57# ... or these for KGDB (gdb remote target) 60# ... or these for KGDB (gdb remote target)
cvs diff -r1.107 -r1.108 src/sys/arch/sun3/conf/GENERIC3X (expand / switch to unified diff)

--- src/sys/arch/sun3/conf/GENERIC3X 2010/04/29 22:40:54 1.107
+++ src/sys/arch/sun3/conf/GENERIC3X 2010/10/16 13:55:54 1.108
@@ -1,39 +1,42 @@ @@ -1,39 +1,42 @@
1# $NetBSD: GENERIC3X,v 1.107 2010/04/29 22:40:54 chs Exp $ 1# $NetBSD: GENERIC3X,v 1.108 2010/10/16 13:55:54 tsutsui Exp $
2 2
3# GENERIC Sun3X (3/80, 3/470) 3# GENERIC Sun3X (3/80, 3/470)
4# Supports root on: ie0, le0, sd*, ... 4# Supports root on: ie0, le0, sd*, ...
5 5
6include "arch/sun3/conf/std.sun3x" 6include "arch/sun3/conf/std.sun3x"
7 7
8options INCLUDE_CONFIG_FILE # embed config file in kernel binary 8options INCLUDE_CONFIG_FILE # embed config file in kernel binary
9 9
10#ident "GENERIC3X-$Revision: 1.107 $" 10#ident "GENERIC3X-$Revision: 1.108 $"
11 11
12makeoptions COPTS="-Os" # bootloader has size limit (~2MB) 12makeoptions COPTS="-Os" # bootloader has size limit (~2MB)
13 13
14# Machines to be supported by this kernel 14# Machines to be supported by this kernel
15#options FPU_EMULATE # XXX - Ever needed? 15#options FPU_EMULATE # XXX - Ever needed?
16#options HAVE_IOCACHE # XXX - Not yet supported. 16#options HAVE_IOCACHE # XXX - Not yet supported.
17 17
18# Needs to be set per system. i.e change these as you see fit 18# Needs to be set per system. i.e change these as you see fit
19maxusers 4 19maxusers 4
20 20
21# Standard system options 21# Standard system options
22options KTRACE # system call tracing 22options KTRACE # system call tracing
23options SYSVMSG # System V message queues 23options SYSVMSG # System V message queues
24options SYSVSEM # System V semaphores 24options SYSVSEM # System V semaphores
25options SYSVSHM # System V shared memory 25options SYSVSHM # System V shared memory
26options P1003_1B_SEMAPHORE # p1003.1b semaphore support 26options P1003_1B_SEMAPHORE # p1003.1b semaphore support
 27
 28#options MODULAR # new style module framework
 29
27#options INSECURE # disable kernel security level 30#options INSECURE # disable kernel security level
28#options USERCONF # userconf(4) support 31#options USERCONF # userconf(4) support
29#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) 32#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
30options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel 33options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
31 34
32# Enable experimental buffer queue strategy for better responsiveness under  35# Enable experimental buffer queue strategy for better responsiveness under
33# high disk I/O load. Use it with caution - it's not proven to be stable yet. 36# high disk I/O load. Use it with caution - it's not proven to be stable yet.
34#options BUFQ_READPRIO 37#options BUFQ_READPRIO
35#options BUFQ_PRIOCSCAN 38#options BUFQ_PRIOCSCAN
36 39
37# Which kernel debugger? Uncomment either this: 40# Which kernel debugger? Uncomment either this:
38options DDB 41options DDB
39# ... or these for KGDB (gdb remote target) 42# ... or these for KGDB (gdb remote target)