Module Name: src
Committed By: tsutsui
Date: Sat Jul 5 09:55:42 UTC 2014
Modified Files:
src/sys/arch/amiga/conf: DRACO GENERIC INSTALL
Log Message:
Regen to reflect GENERIC.in rev 1.121-1.124:
rev 1.121:
> dd preliminary support for the Individual Computers ACA500 in the form of
> acahf
> driver. If ACA500 is equipped with supported accelerator with MMU, it allows
> running NetBSD on an Amiga 500.
>
> Since ACA is not autoconf-aware, and the probe procedure does not exist yet,
> the
> driver is activated with the ACA500_SUPPORT kernel option. The acahf driver
> is commented out in the GENERIC kernel for now (at least until it stops being
> very experimental and hackish).
>
> When it comes to ACA-specific hardware, for now the boot CF slot works.
> Support for everything else is incoming...
rev 1.122:
> Changes to ACA500 support:
> - Add support for second (aux) CF slot.
> - Rework wdc attachment to be more sane.
> - Add support for clockport on ACA500.
> - Fix style where appropriate.
rev 1.123:
> Implement the probe procedure for ACA500. Now the user just needs acafh0
> compiled in his kernel and it all should(tm) work.
>
> Due to lack of obio in amiga port, the probe is called directly from
> mbattach().
> This is going to change with the introduction of obio for all non-autoconfig
> expansions.
rev 1.124:
> Disable X-Surf devices for DRACO's configuration.
>
> - ne at xsh requires ax88190 and ax88190 requires mii(4),
> but all mii devices are declared only inside AMIGA_CONFIGURATION
> - X-Surf also add wdc(4) but all children devices like atabus and
> atapibus are declared only for AMIGA_CONFIGURATION
>
> XXX: DRACO kernel is not built during build.sh release.
To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 src/sys/arch/amiga/conf/DRACO
cvs rdiff -u -r1.305 -r1.306 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.123 -r1.124 src/sys/arch/amiga/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/conf/DRACO
diff -u src/sys/arch/amiga/conf/DRACO:1.173 src/sys/arch/amiga/conf/DRACO:1.174
--- src/sys/arch/amiga/conf/DRACO:1.173 Fri Oct 4 15:13:51 2013
+++ src/sys/arch/amiga/conf/DRACO Sat Jul 5 09:55:42 2014
@@ -1,9 +1,9 @@
-# $NetBSD: DRACO,v 1.173 2013/10/04 15:13:51 rkujawa Exp $
+# $NetBSD: DRACO,v 1.174 2014/07/05 09:55:42 tsutsui Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
#
-# Created from: # NetBSD: GENERIC.in,v 1.119 2013/08/11 16:15:52 rkujawa Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.124 2014/07/05 09:47:30 tsutsui Exp $
#
##
# GENERIC machine description file
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.173 $"
+#ident "GENERIC-$Revision: 1.174 $"
maxusers 8
@@ -292,14 +292,6 @@ ed* at zbus0 # Hydra, ASDG LanRover
es* at zbus0 # CEI A4066 EthernetPLUS
qn* at zbus0 # Quicknet
-xsh* at zbus0 # X-Surf 100
-ne* at xshbus? # NE2000 chip on X-Surf 100
-
-xsurf* at zbus0 # X-Surf
-ne* at xsurfbus? # NE2000 chip on X-Surf
-gencp* at xsurfbus? # clockports on X-Surf
-wdc* at xsurfbus? # IDE on X-Surf
-clockport* at gencp?
# Arcnet
bah* at zbus0 # C=/Ameristar A2060 / 560
Index: src/sys/arch/amiga/conf/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.305 src/sys/arch/amiga/conf/GENERIC:1.306
--- src/sys/arch/amiga/conf/GENERIC:1.305 Fri Oct 4 15:13:51 2013
+++ src/sys/arch/amiga/conf/GENERIC Sat Jul 5 09:55:42 2014
@@ -1,9 +1,9 @@
-# $NetBSD: GENERIC,v 1.305 2013/10/04 15:13:51 rkujawa Exp $
+# $NetBSD: GENERIC,v 1.306 2014/07/05 09:55:42 tsutsui Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
#
-# Created from: # NetBSD: GENERIC.in,v 1.119 2013/08/11 16:15:52 rkujawa Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.124 2014/07/05 09:47:30 tsutsui Exp $
#
##
# GENERIC machine description file
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.305 $"
+#ident "GENERIC-$Revision: 1.306 $"
maxusers 8
@@ -382,6 +382,7 @@ xsurf* at zbus0 # X-Surf
ne* at xsurfbus? # NE2000 chip on X-Surf
gencp* at xsurfbus? # clockports on X-Surf
wdc* at xsurfbus? # IDE on X-Surf
+
clockport* at gencp?
# Arcnet
@@ -434,6 +435,10 @@ scsibus* at cbiiisc0
empsc0 at zbus0 # Emplant scsi
scsibus* at empsc0
+acafh0 at mainbus0 # Individual Computers ACA500
+wdc* at acafhbus? # CF slots on ACA500
+gencp* at acafhbus? # clockport on ACA500
+
wdc0 at mainbus0 # A4000 & A1200 IDE bus
wdc* at zbus0 # Buddha / Catweasel
#efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV
Index: src/sys/arch/amiga/conf/INSTALL
diff -u src/sys/arch/amiga/conf/INSTALL:1.123 src/sys/arch/amiga/conf/INSTALL:1.124
--- src/sys/arch/amiga/conf/INSTALL:1.123 Fri Oct 4 15:13:51 2013
+++ src/sys/arch/amiga/conf/INSTALL Sat Jul 5 09:55:42 2014
@@ -1,9 +1,9 @@
-# $NetBSD: INSTALL,v 1.123 2013/10/04 15:13:51 rkujawa Exp $
+# $NetBSD: INSTALL,v 1.124 2014/07/05 09:55:42 tsutsui Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
#
-# Created from: # NetBSD: GENERIC.in,v 1.119 2013/08/11 16:15:52 rkujawa Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.124 2014/07/05 09:47:30 tsutsui Exp $
#
##
# GENERIC machine description file
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.123 $"
+#ident "GENERIC-$Revision: 1.124 $"
makeoptions COPTS="-Os"
@@ -325,6 +325,7 @@ xsurf* at zbus0 # X-Surf
ne* at xsurfbus? # NE2000 chip on X-Surf
gencp* at xsurfbus? # clockports on X-Surf
wdc* at xsurfbus? # IDE on X-Surf
+
clockport* at gencp?
# Arcnet
@@ -377,6 +378,10 @@ scsibus* at cbiiisc0
empsc0 at zbus0 # Emplant scsi
scsibus* at empsc0
+acafh0 at mainbus0 # Individual Computers ACA500
+wdc* at acafhbus? # CF slots on ACA500
+gencp* at acafhbus? # clockport on ACA500
+
wdc0 at mainbus0 # A4000 & A1200 IDE bus
wdc* at zbus0 # Buddha / Catweasel
#efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV
