Remove -mtune, we'll let the compiler pick a good default (the current default sucks).diff -r1.929 -r1.930 src/sys/arch/i386/conf/GENERIC
(ad)
--- src/sys/arch/i386/conf/GENERIC 2009/03/17 20:04:39 1.929
+++ src/sys/arch/i386/conf/GENERIC 2009/03/27 21:04:35 1.930
@@ -1,44 +1,41 @@ | @@ -1,44 +1,41 @@ | |||
1 | # $NetBSD: GENERIC,v 1.929 2009/03/17 20:04:39 dyoung Exp $ | 1 | # $NetBSD: GENERIC,v 1.930 2009/03/27 21:04:35 ad 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 | include "arch/i386/conf/std.i386" | 21 | include "arch/i386/conf/std.i386" | |
22 | 22 | |||
23 | options INCLUDE_CONFIG_FILE # embed config file in kernel binary | 23 | options INCLUDE_CONFIG_FILE # embed config file in kernel binary | |
24 | 24 | |||
25 | #ident "GENERIC-$Revision: 1.929 $" | 25 | #ident "GENERIC-$Revision: 1.930 $" | |
26 | 26 | |||
27 | maxusers 64 # estimated number of users | 27 | maxusers 64 # estimated number of users | |
28 | 28 | |||
29 | makeoptions CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486, | |||
30 | # tune for more modern | |||
31 | ||||
32 | # For GENERIC, we build the exec formats as modules by default. | 29 | # For GENERIC, we build the exec formats as modules by default. | |
33 | no options EXEC_AOUT # exec a.out binaries | 30 | no options EXEC_AOUT # exec a.out binaries | |
34 | no options EXEC_ELF32 # exec ELF binaries | 31 | no options EXEC_ELF32 # exec ELF binaries | |
35 | no options EXEC_SCRIPT # exec #! scripts | 32 | no options EXEC_SCRIPT # exec #! scripts | |
36 | no options COREDUMP | 33 | no options COREDUMP | |
37 | 34 | |||
38 | # CPU-related options. | 35 | # CPU-related options. | |
39 | options VM86 # virtual 8086 emulation | 36 | options VM86 # virtual 8086 emulation | |
40 | options USER_LDT # user-settable LDT; used by WINE | 37 | options USER_LDT # user-settable LDT; used by WINE | |
41 | 38 | |||
42 | # Enhanced SpeedStep Technology in the Pentium M | 39 | # Enhanced SpeedStep Technology in the Pentium M | |
43 | options ENHANCED_SPEEDSTEP | 40 | options ENHANCED_SPEEDSTEP | |
44 | #options EST_FREQ_USERWRITE # any user can set frequency | 41 | #options EST_FREQ_USERWRITE # any user can set frequency |
--- src/sys/arch/i386/conf/NET4501 2009/03/06 20:31:49 1.67
+++ src/sys/arch/i386/conf/NET4501 2009/03/27 21:04:35 1.68
@@ -1,33 +1,32 @@ | @@ -1,33 +1,32 @@ | |||
1 | # $NetBSD: NET4501,v 1.67 2009/03/06 20:31:49 joerg Exp $ | 1 | # $NetBSD: NET4501,v 1.68 2009/03/27 21:04:35 ad Exp $ | |
2 | # | 2 | # | |
3 | # NET4501 -- kernel configuration for a Soekris Engineering net4501 | 3 | # NET4501 -- kernel configuration for a Soekris Engineering net4501 | |
4 | # single-board computer. | 4 | # single-board computer. | |
5 | # | 5 | # | |
6 | # http://www.soekris.com/ | 6 | # http://www.soekris.com/ | |
7 | # | 7 | # | |
8 | 8 | |||
9 | include "arch/i386/conf/std.i386" | 9 | include "arch/i386/conf/std.i386" | |
10 | 10 | |||
11 | #options INCLUDE_CONFIG_FILE # embed config file in kernel binary | 11 | #options INCLUDE_CONFIG_FILE # embed config file in kernel binary | |
12 | 12 | |||
13 | #ident "NET4501-$Revision: 1.67 $" | 13 | #ident "NET4501-$Revision: 1.68 $" | |
14 | 14 | |||
15 | maxusers 32 # estimated number of users | 15 | maxusers 32 # estimated number of users | |
16 | 16 | |||
17 | # AMD Elan SC520's timer runs at a different frequency | 17 | # AMD Elan SC520's timer runs at a different frequency | |
18 | options TIMER_FREQ=1189200 | 18 | options TIMER_FREQ=1189200 | |
19 | 19 | |||
20 | makeoptions CPUFLAGS="-march=i486 -mtune=i486" | |||
21 | makeoptions COPTS="-Os" | 20 | makeoptions COPTS="-Os" | |
22 | 21 | |||
23 | # CPU-related options. | 22 | # CPU-related options. | |
24 | #options VM86 # virtual 8086 emulation | 23 | #options VM86 # virtual 8086 emulation | |
25 | #options USER_LDT # user-settable LDT; used by WINE | 24 | #options USER_LDT # user-settable LDT; used by WINE | |
26 | 25 | |||
27 | #options MTRR # memory-type range register syscall support | 26 | #options MTRR # memory-type range register syscall support | |
28 | #options PERFCTRS # performance-monitoring counters support | 27 | #options PERFCTRS # performance-monitoring counters support | |
29 | 28 | |||
30 | # delay between "rebooting ..." message and hardware reset, in milliseconds | 29 | # delay between "rebooting ..." message and hardware reset, in milliseconds | |
31 | #options CPURESET_DELAY=2000 | 30 | #options CPURESET_DELAY=2000 | |
32 | 31 | |||
33 | # This option allows you to force a serial console at the specified | 32 | # This option allows you to force a serial console at the specified |
--- src/sys/arch/i386/conf/Attic/XBOX 2008/11/12 12:36:02 1.15
+++ src/sys/arch/i386/conf/Attic/XBOX 2009/03/27 21:04:35 1.16
@@ -1,31 +1,29 @@ | @@ -1,31 +1,29 @@ | |||
1 | # $NetBSD: XBOX,v 1.15 2008/11/12 12:36:02 ad Exp $ | 1 | # $NetBSD: XBOX,v 1.16 2009/03/27 21:04:35 ad Exp $ | |
2 | # | 2 | # | |
3 | # XBOX -- A basic Microsoft XBox kernel config file. | 3 | # XBOX -- A basic Microsoft XBox kernel config file. | |
4 | # | 4 | # | |
5 | 5 | |||
6 | include "arch/i386/conf/std.i386" | 6 | include "arch/i386/conf/std.i386" | |
7 | 7 | |||
8 | maxusers 32 # estimated number of users | 8 | maxusers 32 # estimated number of users | |
9 | 9 | |||
10 | options REALBASEMEM=639 # size of base memory (in KB) | 10 | options REALBASEMEM=639 # size of base memory (in KB) | |
11 | options REALEXTMEM=60416 # size of extended memory (in KB) | 11 | options REALEXTMEM=60416 # size of extended memory (in KB) | |
12 | 12 | |||
13 | options MSGBUFSIZE=65536 # for PCI_CONFIG_DUMP space | 13 | options MSGBUFSIZE=65536 # for PCI_CONFIG_DUMP space | |
14 | 14 | |||
15 | #options NFS_BOOT_RWSIZE=1024 # kue0 USB ethernet has issues here | 15 | #options NFS_BOOT_RWSIZE=1024 # kue0 USB ethernet has issues here | |
16 | 16 | |||
17 | makeoptions CPUFLAGS="-march=i686 -mtune=pentiumpro" | |||
18 | ||||
19 | options TIMER_FREQ=1125000 | 17 | options TIMER_FREQ=1125000 | |
20 | options XBOX # kernel support for xbox | 18 | options XBOX # kernel support for xbox | |
21 | 19 | |||
22 | # Standard system options | 20 | # Standard system options | |
23 | options INSECURE # disable kernel security levels - X needs this | 21 | options INSECURE # disable kernel security levels - X needs this | |
24 | options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT | 22 | options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT | |
25 | options NTP # NTP phase/frequency locked loop | 23 | options NTP # NTP phase/frequency locked loop | |
26 | options KTRACE # system call tracing via ktrace(1) | 24 | options KTRACE # system call tracing via ktrace(1) | |
27 | options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel | 25 | options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel | |
28 | 26 | |||
29 | # Diagnostic/debugging support options | 27 | # Diagnostic/debugging support options | |
30 | #options DIAGNOSTIC # expensive kernel consistency checks | 28 | #options DIAGNOSTIC # expensive kernel consistency checks | |
31 | #options DEBUG # expensive debugging checks/support | 29 | #options DEBUG # expensive debugging checks/support |