enable rl(4), rlphy(4), pcscp(4) and isp(4) with option ISP_COMPILE_FW

ok drahn@, brad@

3 files changed, 34 insertions, 7 deletions

diff --git a/distrib/notes/macppc/hardware b/distrib/notes/macppc/hardware
index a13d893d434..8220474c231 100644
--- a/distrib/notes/macppc/hardware
+++ b/distrib/notes/macppc/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.41 2004/12/05 04:03:54 jsg Exp $
+dnl	$OpenBSD: hardware,v 1.42 2005/02/16 20:07:24 martin Exp $
 OpenBSD/MACHINE OSREV runs on iMac, G4 Power Macintosh, and G4 Cube, as well
 as PowerBook and iBook machines.
 
@@ -45,6 +45,9 @@ Supported devices {:-include-:}:
 			AHA-39160
 		Symbios Logic (NCR) 53C8xx-based PCI SCSI host adapters
 		    (53c810 and 53c825) (siop)
+		AMD Am53c974 PCscsi-PCI host adapters including the Tekram
+		    DC-390 (pcscp)
+		QLogic PCI SCSI controllers (isp)
 
 	RAID controllers
 		Adaptec SCSI RAID (I2O) controllers (ASR-2100S, ASR-3200S,
@@ -122,6 +125,20 @@ Supported devices {:-include-:}:
 			3Com 3cSOHO adapter
 			3Com 3c900B-FL and 3c900B-FL/FX fiber optic adapters
 			3Com 3c555/3c556/3c556B MiniPCI adapters
+		RealTek 8129/8139-based adapters (rl), including:
+			Accton MPX 5030/5038
+			Allied Telesyn AT2550
+			D-Link DFE530TX+
+			D-Link DFE538TX
+			Encore ENL832-TX 10/100 M PCI
+			Genius GF100TXR
+			KTX-9130TX 10/100 Fast Ethernet
+			Longshine LCS-8038TX-R
+			NDC NE100TX-E
+			Netronix EA-1210 Net Ether 10/100
+			Nortel BayStack 21
+			OvisLink LEF-8129TX, LEF-8139TX
+			SMC EZ Card 10/100 PCI 1211-TX
 
 	Wireless Ethernet Adapters
 		PCMCIA Adapters
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 9e52bd6d99c..7f9ca8d163e 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.69 2005/02/15 11:03:46 jsg Exp $g
+#	$OpenBSD: GENERIC,v 1.70 2005/02/16 20:07:24 martin Exp $g
 #
 # PPC GENERIC config file
 #
@@ -50,7 +50,9 @@ vgafb0		at pci?		# PCI VGA graphics
 ahc*		at pci?		# Adaptec 294x, aic78x0 SCSI
 #bha*		at pci?		# BusLogic 9xx SCSI
 #ami*		at pci?
-#pcscp*		at pci?		# AMD Am53c974 PCscsi-PCI SCSI
+pcscp*		at pci?		# AMD Am53c974 PCscsi-PCI SCSI
+isp*		at pci?		# Qlogic ISP [12]0x0 SCSI/FibreChannel
+option		ISP_COMPILE_FW
 pciide*		at pci?
 kauaiata*	at pci?		# Apple ATA 100
 wdc*		at kauaiata?
@@ -59,6 +61,7 @@ gem*		at pci?		# GMAC ethernet
 hme*		at pci?		# HME ethernet
 dc*		at pci?		# DEC Tulip 21143 clones
 xl*		at pci?		# 3C9xx ethernet
+rl*		at pci?		# RealTek 81[23]9 ethernet
 em*		at pci?		# Intel Pro/1000 ethernet
 ti*		at pci?		# Alteon Tigon 1Gb ethernet
 re*		at pci?		# Realtek 8169/8169S/8110S
@@ -89,6 +92,7 @@ bmtphy*		at mii?		# Broadcom 10/100 PHYs
 eephy*		at mii?		# Marvell 88E1000 Gigabit PHYs
 urlphy*		at mii?		# Realtek RTL8150L internal PHY
 rgephy*		at mii?		# Realtek 8169S/8110S PHY
+rlphy*		at mii?		# Realtek 8139 internal PHYs
 ukphy*		at mii?		# generic unknown PHYs
 
 # crypto
@@ -156,7 +160,8 @@ scsibus*	at ahc?
 #scsibus*	at mesh?
 scsibus*	at ioprbs?
 scsibus*	at iopsp?
-#scsibus*	at pcscp?
+scsibus*	at pcscp?
+scsibus*	at isp?
 scsibus*	at siop?
 #scsibus*	at fwscsi?
 
diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK
index dc83dc82f82..36479dc6789 100644
--- a/sys/arch/macppc/conf/RAMDISK
+++ b/sys/arch/macppc/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.38 2005/02/15 11:03:46 jsg Exp $
+#	$OpenBSD: RAMDISK,v 1.39 2005/02/16 20:07:24 martin Exp $
 #
 # PPC GENERIC config file
 #
@@ -53,7 +53,9 @@ vgafb0		at pci?		# PCI VGA graphics
 #adv*		at pci?		# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
 ahc*		at pci?		# Adaptec 294x, aic78x0 SCSI
 #bha*		at pci?		# BusLogic 9xx SCSI
-#pcscp*		at pci?		# AMD Am53c974 PCscsi-PCI SCSI
+pcscp*		at pci?		# AMD Am53c974 PCscsi-PCI SCSI
+isp*		at pci?		# Qlogic ISP [12]0x0 SCSI/FibreChannel
+option		ISP_COMPILE_FW
 pciide*		at pci?
 kauaiata*	at pci?		# Apple ATA 100
 wdc*		at kauaiata?
@@ -65,6 +67,7 @@ xl*		at pci?		# 3C9xx ethernet
 em*		at pci?		# Intel Pro/1000 ethernet
 ti*		at pci?		# Alteon Tigon 1Gb ethernet
 re*		at pci?		# Realtek 8169/8169S/8110S
+rl*		at pci?		# Realtek 81[23]9 ethernet
 an*		at pci?		# Cisco/Aironet 802.11DS
 wi*		at pci?		# WaveLAN IEEE 802.11DS
 
@@ -90,6 +93,7 @@ bmtphy*		at mii?		# Broadcom 10/100 PHYs
 eephy*		at mii?		# Marvell 88E1000 Gigabit PHYs
 urlphy*		at mii?		# Realtek RTL8150L internal PHY
 rgephy*		at mii?		# Realtek 8169S/8110S PHY
+rlphy*		at mii?		# Realtek 8139 internal PHYs
 ukphy*		at mii?		# generic unknown PHYs
 
 macintr0	at macobio?	# old interrupt controller
@@ -119,7 +123,8 @@ scsibus*	at ahc?
 #scsibus*	at bha?
 #scsibus*	at esp?
 #scsibus*	at mesh?
-#scsibus*	at pcscp?
+scsibus*	at pcscp?
+scsibus*	at isp?
 
 mediabay*	at macobio?
 wdc*		at mediabay?