Mon Jan 28 14:56:03 2013 UTC ()
Regen config files.


(rkujawa)
diff -r1.162 -r1.163 src/sys/arch/amiga/conf/DRACO
diff -r1.294 -r1.295 src/sys/arch/amiga/conf/GENERIC
diff -r1.113 -r1.114 src/sys/arch/amiga/conf/INSTALL
cvs diff -r1.162 -r1.163 src/sys/arch/amiga/conf/DRACO (expand / switch to unified diff)

--- src/sys/arch/amiga/conf/DRACO 2012/11/25 23:37:28 1.162
+++ src/sys/arch/amiga/conf/DRACO 2013/01/28 14:56:02 1.163
@@ -1,45 +1,45 @@ @@ -1,45 +1,45 @@
1# $NetBSD: DRACO,v 1.162 2012/11/25 23:37:28 rkujawa Exp $ 1# $NetBSD: DRACO,v 1.163 2013/01/28 14:56:02 rkujawa Exp $
2# 2#
3# This file was automatically created. 3# This file was automatically created.
4# Changes will be lost when make is run in this directory. 4# Changes will be lost when make is run in this directory.
5# 5#
6# Created from: # NetBSD: GENERIC.in,v 1.107 2012/11/25 23:37:10 rkujawa Exp $ 6# Created from: # NetBSD: GENERIC.in,v 1.108 2013/01/28 14:54:51 rkujawa Exp $
7# 7#
8## 8##
9# GENERIC machine description file 9# GENERIC machine description file
10# 10#
11# This machine description file is used to generate the default NetBSD 11# This machine description file is used to generate the default NetBSD
12# kernel. The generic kernel does not include all options, subsystems 12# kernel. The generic kernel does not include all options, subsystems
13# and device drivers, but should be useful for most applications. 13# and device drivers, but should be useful for most applications.
14# 14#
15# The machine description file can be customised for your specific 15# The machine description file can be customised for your specific
16# machine to reduce the kernel size and improve its performance. 16# machine to reduce the kernel size and improve its performance.
17# 17#
18# For further information on compiling NetBSD kernels, see the config(8) 18# For further information on compiling NetBSD kernels, see the config(8)
19# man page. 19# man page.
20# 20#
21# For further information on hardware support for this architecture, see 21# For further information on hardware support for this architecture, see
22# the intro(4) man page. For further information about kernel options 22# the intro(4) man page. For further information about kernel options
23# for this architecture, see the options(4) man page. For an explanation 23# for this architecture, see the options(4) man page. For an explanation
24# of each device driver in this file see the section 4 man page for the 24# of each device driver in this file see the section 4 man page for the
25# device. 25# device.
26 26
27 27
28include "arch/amiga/conf/std.amiga" 28include "arch/amiga/conf/std.amiga"
29 29
30options INCLUDE_CONFIG_FILE # embed config file in kernel binary 30options INCLUDE_CONFIG_FILE # embed config file in kernel binary
31 31
32#ident "GENERIC-$Revision: 1.162 $" 32#ident "GENERIC-$Revision: 1.163 $"
33 33
34 34
35maxusers 8 35maxusers 8
36options RTC_OFFSET=0 36options RTC_OFFSET=0
37 37
38# 38#
39# mainboards to support (in addition to Amiga) 39# mainboards to support (in addition to Amiga)
40# 40#
41options DRACO 41options DRACO
42# 42#
43# processors this kernel should support 43# processors this kernel should support
44# 44#
45options M68060 # support for 060 45options M68060 # support for 060
cvs diff -r1.294 -r1.295 src/sys/arch/amiga/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/amiga/conf/GENERIC 2012/11/25 23:37:28 1.294
+++ src/sys/arch/amiga/conf/GENERIC 2013/01/28 14:56:03 1.295
@@ -1,45 +1,45 @@ @@ -1,45 +1,45 @@
1# $NetBSD: GENERIC,v 1.294 2012/11/25 23:37:28 rkujawa Exp $ 1# $NetBSD: GENERIC,v 1.295 2013/01/28 14:56:03 rkujawa Exp $
2# 2#
3# This file was automatically created. 3# This file was automatically created.
4# Changes will be lost when make is run in this directory. 4# Changes will be lost when make is run in this directory.
5# 5#
6# Created from: # NetBSD: GENERIC.in,v 1.107 2012/11/25 23:37:10 rkujawa Exp $ 6# Created from: # NetBSD: GENERIC.in,v 1.108 2013/01/28 14:54:51 rkujawa Exp $
7# 7#
8## 8##
9# GENERIC machine description file 9# GENERIC machine description file
10# 10#
11# This machine description file is used to generate the default NetBSD 11# This machine description file is used to generate the default NetBSD
12# kernel. The generic kernel does not include all options, subsystems 12# kernel. The generic kernel does not include all options, subsystems
13# and device drivers, but should be useful for most applications. 13# and device drivers, but should be useful for most applications.
14# 14#
15# The machine description file can be customised for your specific 15# The machine description file can be customised for your specific
16# machine to reduce the kernel size and improve its performance. 16# machine to reduce the kernel size and improve its performance.
17# 17#
18# For further information on compiling NetBSD kernels, see the config(8) 18# For further information on compiling NetBSD kernels, see the config(8)
19# man page. 19# man page.
20# 20#
21# For further information on hardware support for this architecture, see 21# For further information on hardware support for this architecture, see
22# the intro(4) man page. For further information about kernel options 22# the intro(4) man page. For further information about kernel options
23# for this architecture, see the options(4) man page. For an explanation 23# for this architecture, see the options(4) man page. For an explanation
24# of each device driver in this file see the section 4 man page for the 24# of each device driver in this file see the section 4 man page for the
25# device. 25# device.
26 26
27 27
28include "arch/amiga/conf/std.amiga" 28include "arch/amiga/conf/std.amiga"
29 29
30options INCLUDE_CONFIG_FILE # embed config file in kernel binary 30options INCLUDE_CONFIG_FILE # embed config file in kernel binary
31 31
32#ident "GENERIC-$Revision: 1.294 $" 32#ident "GENERIC-$Revision: 1.295 $"
33 33
34 34
35maxusers 8 35maxusers 8
36options RTC_OFFSET=0 36options RTC_OFFSET=0
37 37
38# 38#
39# mainboards to support (in addition to Amiga) 39# mainboards to support (in addition to Amiga)
40# 40#
41options DRACO 41options DRACO
42options BB060STUPIDROM # You need this, if you have a non-DraCo 42options BB060STUPIDROM # You need this, if you have a non-DraCo
43 # MC68060 with an OS ROM up to (at least) 43 # MC68060 with an OS ROM up to (at least)
44 # V40 (OS3.1) and want to boot with the 44 # V40 (OS3.1) and want to boot with the
45 # bootblock. 45 # bootblock.
@@ -488,26 +488,27 @@ options PCIVERBOSE # verbo @@ -488,26 +488,27 @@ options PCIVERBOSE # verbo
488options PCI_NETBSD_CONFIGURE # supported by mppb(4), p5pb(4), empb(4) 488options PCI_NETBSD_CONFIGURE # supported by mppb(4), p5pb(4), empb(4)
489 489
490p5pb0 at p5bus0 # Phase5 PCI bridge (CVPPC/BVPPC/G-REX) 490p5pb0 at p5bus0 # Phase5 PCI bridge (CVPPC/BVPPC/G-REX)
491p5membar* at zbus0 # Phase5 PCI bridge autoconfiguring BARs 491p5membar* at zbus0 # Phase5 PCI bridge autoconfiguring BARs
492#options P5PB_DEBUG # enable excessive debug for p5pb 492#options P5PB_DEBUG # enable excessive debug for p5pb
493#options P5PB_CONSOLE # console on CVPPC/BVPPC/Voodoo3 493#options P5PB_CONSOLE # console on CVPPC/BVPPC/Voodoo3
494pci* at p5pb0 494pci* at p5pb0
495 495
496mppb* at zbus0 # Matay Prometheus Zorro-PCI bridge 496mppb* at zbus0 # Matay Prometheus Zorro-PCI bridge
497pci* at mppb? 497pci* at mppb?
498 498
499empb0 at zbus0 # ELBOX Mediator PCI 1200 499empb0 at zbus0 # ELBOX Mediator PCI 1200
500emmem0 at zbus0 # ELBOX Mediator PCI memory space 500emmem0 at zbus0 # ELBOX Mediator PCI memory space
 501empm0 at empb0 # ELBOX Mediator PCI Power Management
501pci* at empb0 502pci* at empb0
502 503
503#cv3dpb* at zbus0 # CyberVision 64/3D PCI bridge 504#cv3dpb* at zbus0 # CyberVision 64/3D PCI bridge
504 505
505#genfb* at pci? # generic fb, CVPPC/BVPPC only 506#genfb* at pci? # generic fb, CVPPC/BVPPC only
506#voodoofb* at pci? # 3Dfx Voodoo 3 in G-REX 507#voodoofb* at pci? # 3Dfx Voodoo 3 in G-REX
507#radeonfb* at pci? # untested 508#radeonfb* at pci? # untested
508 509
509ne* at pci? # NE2000 Ethernet 510ne* at pci? # NE2000 Ethernet
510satalink* at pci? dev ? function ? flags 0x0002 # SiI SATALink 3112  511satalink* at pci? dev ? function ? flags 0x0002 # SiI SATALink 3112
511 512
512# Bluetooth Controller and Device support 513# Bluetooth Controller and Device support
513# tested only with btuart on an A1200 514# tested only with btuart on an A1200
cvs diff -r1.113 -r1.114 src/sys/arch/amiga/conf/INSTALL (expand / switch to unified diff)

--- src/sys/arch/amiga/conf/INSTALL 2012/11/25 23:37:28 1.113
+++ src/sys/arch/amiga/conf/INSTALL 2013/01/28 14:56:03 1.114
@@ -1,45 +1,45 @@ @@ -1,45 +1,45 @@
1# $NetBSD: INSTALL,v 1.113 2012/11/25 23:37:28 rkujawa Exp $ 1# $NetBSD: INSTALL,v 1.114 2013/01/28 14:56:03 rkujawa Exp $
2# 2#
3# This file was automatically created. 3# This file was automatically created.
4# Changes will be lost when make is run in this directory. 4# Changes will be lost when make is run in this directory.
5# 5#
6# Created from: # NetBSD: GENERIC.in,v 1.107 2012/11/25 23:37:10 rkujawa Exp $ 6# Created from: # NetBSD: GENERIC.in,v 1.108 2013/01/28 14:54:51 rkujawa Exp $
7# 7#
8## 8##
9# GENERIC machine description file 9# GENERIC machine description file
10# 10#
11# This machine description file is used to generate the default NetBSD 11# This machine description file is used to generate the default NetBSD
12# kernel. The generic kernel does not include all options, subsystems 12# kernel. The generic kernel does not include all options, subsystems
13# and device drivers, but should be useful for most applications. 13# and device drivers, but should be useful for most applications.
14# 14#
15# The machine description file can be customised for your specific 15# The machine description file can be customised for your specific
16# machine to reduce the kernel size and improve its performance. 16# machine to reduce the kernel size and improve its performance.
17# 17#
18# For further information on compiling NetBSD kernels, see the config(8) 18# For further information on compiling NetBSD kernels, see the config(8)
19# man page. 19# man page.
20# 20#
21# For further information on hardware support for this architecture, see 21# For further information on hardware support for this architecture, see
22# the intro(4) man page. For further information about kernel options 22# the intro(4) man page. For further information about kernel options
23# for this architecture, see the options(4) man page. For an explanation 23# for this architecture, see the options(4) man page. For an explanation
24# of each device driver in this file see the section 4 man page for the 24# of each device driver in this file see the section 4 man page for the
25# device. 25# device.
26 26
27 27
28include "arch/amiga/conf/std.amiga" 28include "arch/amiga/conf/std.amiga"
29 29
30options INCLUDE_CONFIG_FILE # embed config file in kernel binary 30options INCLUDE_CONFIG_FILE # embed config file in kernel binary
31 31
32#ident "GENERIC-$Revision: 1.113 $" 32#ident "GENERIC-$Revision: 1.114 $"
33 33
34makeoptions COPTS="-Os" 34makeoptions COPTS="-Os"
35 35
36maxusers 8 36maxusers 8
37options RTC_OFFSET=0 37options RTC_OFFSET=0
38 38
39# 39#
40# mainboards to support (in addition to Amiga) 40# mainboards to support (in addition to Amiga)
41# 41#
42options DRACO 42options DRACO
43options BB060STUPIDROM # You need this, if you have a non-DraCo 43options BB060STUPIDROM # You need this, if you have a non-DraCo
44 # MC68060 with an OS ROM up to (at least) 44 # MC68060 with an OS ROM up to (at least)
45 # V40 (OS3.1) and want to boot with the 45 # V40 (OS3.1) and want to boot with the
@@ -427,26 +427,27 @@ options PCIVERBOSE # verbo @@ -427,26 +427,27 @@ options PCIVERBOSE # verbo
427options PCI_NETBSD_CONFIGURE # supported by mppb(4), p5pb(4), empb(4) 427options PCI_NETBSD_CONFIGURE # supported by mppb(4), p5pb(4), empb(4)
428 428
429p5pb0 at p5bus0 # Phase5 PCI bridge (CVPPC/BVPPC/G-REX) 429p5pb0 at p5bus0 # Phase5 PCI bridge (CVPPC/BVPPC/G-REX)
430p5membar* at zbus0 # Phase5 PCI bridge autoconfiguring BARs 430p5membar* at zbus0 # Phase5 PCI bridge autoconfiguring BARs
431#options P5PB_DEBUG # enable excessive debug for p5pb 431#options P5PB_DEBUG # enable excessive debug for p5pb
432#options P5PB_CONSOLE # console on CVPPC/BVPPC/Voodoo3 432#options P5PB_CONSOLE # console on CVPPC/BVPPC/Voodoo3
433pci* at p5pb0 433pci* at p5pb0
434 434
435mppb* at zbus0 # Matay Prometheus Zorro-PCI bridge 435mppb* at zbus0 # Matay Prometheus Zorro-PCI bridge
436pci* at mppb? 436pci* at mppb?
437 437
438empb0 at zbus0 # ELBOX Mediator PCI 1200 438empb0 at zbus0 # ELBOX Mediator PCI 1200
439emmem0 at zbus0 # ELBOX Mediator PCI memory space 439emmem0 at zbus0 # ELBOX Mediator PCI memory space
 440empm0 at empb0 # ELBOX Mediator PCI Power Management
440pci* at empb0 441pci* at empb0
441 442
442#cv3dpb* at zbus0 # CyberVision 64/3D PCI bridge 443#cv3dpb* at zbus0 # CyberVision 64/3D PCI bridge
443 444
444#genfb* at pci? # generic fb, CVPPC/BVPPC only 445#genfb* at pci? # generic fb, CVPPC/BVPPC only
445#voodoofb* at pci? # 3Dfx Voodoo 3 in G-REX 446#voodoofb* at pci? # 3Dfx Voodoo 3 in G-REX
446#radeonfb* at pci? # untested 447#radeonfb* at pci? # untested
447 448
448ne* at pci? # NE2000 Ethernet 449ne* at pci? # NE2000 Ethernet
449satalink* at pci? dev ? function ? flags 0x0002 # SiI SATALink 3112  450satalink* at pci? dev ? function ? flags 0x0002 # SiI SATALink 3112
450 451
451# Bluetooth Controller and Device support 452# Bluetooth Controller and Device support
452# tested only with btuart on an A1200 453# tested only with btuart on an A1200