Thu Jan 19 22:43:11 2012 UTC ()
Don\'t forget to disable atabus* when disabling the efa driver.


(rkujawa)
diff -r1.152 -r1.153 src/sys/arch/amiga/conf/DRACO
diff -r1.282 -r1.283 src/sys/arch/amiga/conf/GENERIC
diff -r1.94 -r1.95 src/sys/arch/amiga/conf/GENERIC.in
diff -r1.104 -r1.105 src/sys/arch/amiga/conf/INSTALL
cvs diff -r1.152 -r1.153 src/sys/arch/amiga/conf/DRACO (expand / switch to unified diff)

--- src/sys/arch/amiga/conf/DRACO 2012/01/19 22:11:49 1.152
+++ src/sys/arch/amiga/conf/DRACO 2012/01/19 22:43:11 1.153
@@ -1,45 +1,45 @@ @@ -1,45 +1,45 @@
1# $NetBSD: DRACO,v 1.152 2012/01/19 22:11:49 rkujawa Exp $ 1# $NetBSD: DRACO,v 1.153 2012/01/19 22:43:11 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.93 2012/01/19 00:14:08 rkujawa Exp $ 6# Created from: # NetBSD: GENERIC.in,v 1.94 2012/01/19 22:11:49 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.152 $" 32#ident "GENERIC-$Revision: 1.153 $"
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.282 -r1.283 src/sys/arch/amiga/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/amiga/conf/GENERIC 2012/01/19 22:11:49 1.282
+++ src/sys/arch/amiga/conf/GENERIC 2012/01/19 22:43:11 1.283
@@ -1,45 +1,45 @@ @@ -1,45 +1,45 @@
1# $NetBSD: GENERIC,v 1.282 2012/01/19 22:11:49 rkujawa Exp $ 1# $NetBSD: GENERIC,v 1.283 2012/01/19 22:43:11 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.93 2012/01/19 00:14:08 rkujawa Exp $ 6# Created from: # NetBSD: GENERIC.in,v 1.94 2012/01/19 22:11:49 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.282 $" 32#ident "GENERIC-$Revision: 1.283 $"
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.
@@ -422,27 +422,27 @@ cbsc0 at zbus0 # CyberSCSI I @@ -422,27 +422,27 @@ cbsc0 at zbus0 # CyberSCSI I
422scsibus* at cbsc0 422scsibus* at cbsc0
423cbiisc0 at zbus0 # CyberSCSI II 423cbiisc0 at zbus0 # CyberSCSI II
424scsibus* at cbiisc0 424scsibus* at cbiisc0
425cbiiisc0 at p5bus0 # Cyberstorm mk.III/Cyberstorm PPC SCSI 425cbiiisc0 at p5bus0 # Cyberstorm mk.III/Cyberstorm PPC SCSI
426scsibus* at cbiiisc0 426scsibus* at cbiiisc0
427empsc0 at zbus0 # Emplant scsi 427empsc0 at zbus0 # Emplant scsi
428scsibus* at empsc0 428scsibus* at empsc0
429 429
430wdc0 at mainbus0 # A4000 & A1200 IDE bus 430wdc0 at mainbus0 # A4000 & A1200 IDE bus
431wdc* at zbus0 # Buddha / Catweasel 431wdc* at zbus0 # Buddha / Catweasel
432#efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV  432#efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV
433 433
434atabus* at wdc? channel ? # ATA bus 434atabus* at wdc? channel ? # ATA bus
435atabus* at efa? channel ? # ATA bus  435#atabus* at efa? channel ? # ATA bus
436wd* at atabus? drive ? # + drives 436wd* at atabus? drive ? # + drives
437atapibus* at atabus? # ATAPI bus 437atapibus* at atabus? # ATAPI bus
438cd* at atapibus? drive ? # ATAPI CD-ROM drives 438cd* at atapibus? drive ? # ATAPI CD-ROM drives
439sd* at atapibus? drive ? # ATAPI disk drives 439sd* at atapibus? drive ? # ATAPI disk drives
440 440
441pccard0 at mainbus0 441pccard0 at mainbus0
442pcmcia* at pccard0 442pcmcia* at pccard0
443com* at pcmcia? function ? # Modems and serial cards 443com* at pcmcia? function ? # Modems and serial cards
444pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards 444pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards
445aic* at pcmcia? function ? # Adaptec APA-1460 SCSI 445aic* at pcmcia? function ? # Adaptec APA-1460 SCSI
446wdc* at pcmcia? function ? 446wdc* at pcmcia? function ?
447awi* at pcmcia? function ? # BayStack 650 (802.11FH) 447awi* at pcmcia? function ? # BayStack 650 (802.11FH)
448ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet 448ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet
cvs diff -r1.94 -r1.95 src/sys/arch/amiga/conf/GENERIC.in (expand / switch to unified diff)

--- src/sys/arch/amiga/conf/GENERIC.in 2012/01/19 22:11:49 1.94
+++ src/sys/arch/amiga/conf/GENERIC.in 2012/01/19 22:43:11 1.95
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: GENERIC.in,v 1.94 2012/01/19 22:11:49 rkujawa Exp $ 1# $NetBSD: GENERIC.in,v 1.95 2012/01/19 22:43:11 rkujawa Exp $
2# 2#
3## 3##
4# GENERIC machine description file 4# GENERIC machine description file
5# 5#
6# This machine description file is used to generate the default NetBSD 6# This machine description file is used to generate the default NetBSD
7# kernel. The generic kernel does not include all options, subsystems 7# kernel. The generic kernel does not include all options, subsystems
8# and device drivers, but should be useful for most applications. 8# and device drivers, but should be useful for most applications.
9# 9#
10# The machine description file can be customised for your specific 10# The machine description file can be customised for your specific
11# machine to reduce the kernel size and improve its performance. 11# machine to reduce the kernel size and improve its performance.
12# 12#
13# For further information on compiling NetBSD kernels, see the config(8) 13# For further information on compiling NetBSD kernels, see the config(8)
14# man page. 14# man page.
@@ -42,27 +42,27 @@ m4_define(M4_Target`_CONFIGURATION', `') @@ -42,27 +42,27 @@ m4_define(M4_Target`_CONFIGURATION', `')
42m4_ifelse(M4_Target, `AMIGA', `', `m4_define(`DRACO_CONFIGURATION', `')') 42m4_ifelse(M4_Target, `AMIGA', `', `m4_define(`DRACO_CONFIGURATION', `')')
43 43
44# If not building DRACO, set AMIGA_CONFIGURATION 44# If not building DRACO, set AMIGA_CONFIGURATION
45# 45#
46m4_ifelse(M4_Target, `DRACO', `', `m4_define(`AMIGA_CONFIGURATION', `')') 46m4_ifelse(M4_Target, `DRACO', `', `m4_define(`AMIGA_CONFIGURATION', `')')
47 47
48 48
49m4_divert(0)m4_dnl 49m4_divert(0)m4_dnl
50 50
51include "arch/amiga/conf/std.amiga" 51include "arch/amiga/conf/std.amiga"
52 52
53options INCLUDE_CONFIG_FILE # embed config file in kernel binary 53options INCLUDE_CONFIG_FILE # embed config file in kernel binary
54 54
55#ident "GENERIC-$Revision: 1.94 $" 55#ident "GENERIC-$Revision: 1.95 $"
56 56
57m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl 57m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
58makeoptions COPTS="-Os" 58makeoptions COPTS="-Os"
59')m4_dnl 59')m4_dnl
60 60
61maxusers 8 61maxusers 8
62options RTC_OFFSET=0 62options RTC_OFFSET=0
63 63
64# 64#
65# mainboards to support (in addition to Amiga) 65# mainboards to support (in addition to Amiga)
66# 66#
67m4_ifdef(`DRACO_CONFIGURATION', `m4_dnl 67m4_ifdef(`DRACO_CONFIGURATION', `m4_dnl
68options DRACO 68options DRACO
@@ -503,27 +503,27 @@ cbsc0 at zbus0 # CyberSCSI I @@ -503,27 +503,27 @@ cbsc0 at zbus0 # CyberSCSI I
503scsibus* at cbsc0 503scsibus* at cbsc0
504cbiisc0 at zbus0 # CyberSCSI II 504cbiisc0 at zbus0 # CyberSCSI II
505scsibus* at cbiisc0 505scsibus* at cbiisc0
506cbiiisc0 at p5bus0 # Cyberstorm mk.III/Cyberstorm PPC SCSI 506cbiiisc0 at p5bus0 # Cyberstorm mk.III/Cyberstorm PPC SCSI
507scsibus* at cbiiisc0 507scsibus* at cbiiisc0
508empsc0 at zbus0 # Emplant scsi 508empsc0 at zbus0 # Emplant scsi
509scsibus* at empsc0 509scsibus* at empsc0
510 510
511wdc0 at mainbus0 # A4000 & A1200 IDE bus 511wdc0 at mainbus0 # A4000 & A1200 IDE bus
512wdc* at zbus0 # Buddha / Catweasel 512wdc* at zbus0 # Buddha / Catweasel
513#efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV  513#efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV
514 514
515atabus* at wdc? channel ? # ATA bus 515atabus* at wdc? channel ? # ATA bus
516atabus* at efa? channel ? # ATA bus  516#atabus* at efa? channel ? # ATA bus
517wd* at atabus? drive ? # + drives 517wd* at atabus? drive ? # + drives
518atapibus* at atabus? # ATAPI bus 518atapibus* at atabus? # ATAPI bus
519cd* at atapibus? drive ? # ATAPI CD-ROM drives 519cd* at atapibus? drive ? # ATAPI CD-ROM drives
520sd* at atapibus? drive ? # ATAPI disk drives 520sd* at atapibus? drive ? # ATAPI disk drives
521 521
522pccard0 at mainbus0 522pccard0 at mainbus0
523pcmcia* at pccard0 523pcmcia* at pccard0
524com* at pcmcia? function ? # Modems and serial cards 524com* at pcmcia? function ? # Modems and serial cards
525pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards 525pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards
526aic* at pcmcia? function ? # Adaptec APA-1460 SCSI 526aic* at pcmcia? function ? # Adaptec APA-1460 SCSI
527wdc* at pcmcia? function ? 527wdc* at pcmcia? function ?
528awi* at pcmcia? function ? # BayStack 650 (802.11FH) 528awi* at pcmcia? function ? # BayStack 650 (802.11FH)
529ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet 529ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet
cvs diff -r1.104 -r1.105 src/sys/arch/amiga/conf/INSTALL (expand / switch to unified diff)

--- src/sys/arch/amiga/conf/INSTALL 2012/01/19 22:11:49 1.104
+++ src/sys/arch/amiga/conf/INSTALL 2012/01/19 22:43:11 1.105
@@ -1,45 +1,45 @@ @@ -1,45 +1,45 @@
1# $NetBSD: INSTALL,v 1.104 2012/01/19 22:11:49 rkujawa Exp $ 1# $NetBSD: INSTALL,v 1.105 2012/01/19 22:43:11 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.93 2012/01/19 00:14:08 rkujawa Exp $ 6# Created from: # NetBSD: GENERIC.in,v 1.94 2012/01/19 22:11:49 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.104 $" 32#ident "GENERIC-$Revision: 1.105 $"
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
@@ -368,27 +368,27 @@ cbsc0 at zbus0 # CyberSCSI I @@ -368,27 +368,27 @@ cbsc0 at zbus0 # CyberSCSI I
368scsibus* at cbsc0 368scsibus* at cbsc0
369cbiisc0 at zbus0 # CyberSCSI II 369cbiisc0 at zbus0 # CyberSCSI II
370scsibus* at cbiisc0 370scsibus* at cbiisc0
371cbiiisc0 at p5bus0 # Cyberstorm mk.III/Cyberstorm PPC SCSI 371cbiiisc0 at p5bus0 # Cyberstorm mk.III/Cyberstorm PPC SCSI
372scsibus* at cbiiisc0 372scsibus* at cbiiisc0
373empsc0 at zbus0 # Emplant scsi 373empsc0 at zbus0 # Emplant scsi
374scsibus* at empsc0 374scsibus* at empsc0
375 375
376wdc0 at mainbus0 # A4000 & A1200 IDE bus 376wdc0 at mainbus0 # A4000 & A1200 IDE bus
377wdc* at zbus0 # Buddha / Catweasel 377wdc* at zbus0 # Buddha / Catweasel
378#efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV  378#efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV
379 379
380atabus* at wdc? channel ? # ATA bus 380atabus* at wdc? channel ? # ATA bus
381atabus* at efa? channel ? # ATA bus  381#atabus* at efa? channel ? # ATA bus
382wd* at atabus? drive ? # + drives 382wd* at atabus? drive ? # + drives
383atapibus* at atabus? # ATAPI bus 383atapibus* at atabus? # ATAPI bus
384cd* at atapibus? drive ? # ATAPI CD-ROM drives 384cd* at atapibus? drive ? # ATAPI CD-ROM drives
385sd* at atapibus? drive ? # ATAPI disk drives 385sd* at atapibus? drive ? # ATAPI disk drives
386 386
387pccard0 at mainbus0 387pccard0 at mainbus0
388pcmcia* at pccard0 388pcmcia* at pccard0
389com* at pcmcia? function ? # Modems and serial cards 389com* at pcmcia? function ? # Modems and serial cards
390pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards 390pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards
391aic* at pcmcia? function ? # Adaptec APA-1460 SCSI 391aic* at pcmcia? function ? # Adaptec APA-1460 SCSI
392wdc* at pcmcia? function ? 392wdc* at pcmcia? function ?
393awi* at pcmcia? function ? # BayStack 650 (802.11FH) 393awi* at pcmcia? function ? # BayStack 650 (802.11FH)
394ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet 394ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet