Remove the entire firmware directory

Some of this is DFSG-free, but it has been moved to firmware-free so
we don't need it in linux-2.6 as well.

svn path=/dists/trunk/linux-2.6/; revision=17068

4 files changed, 26 insertions, 565 deletions

diff --git a/debian/patches/debian/dfsg/files-1 b/debian/patches/debian/dfsg/files-1
index bb2e4d208..c418d1500 100644
--- a/debian/patches/debian/dfsg/files-1
+++ b/debian/patches/debian/dfsg/files-1
@@ -1,38 +1,8 @@
 rm Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt
 
-rm firmware/*.HEX
-rm firmware/*.ihex
-rm firmware/3com
-rm firmware/acenic
-rm firmware/adaptec
-rm firmware/advansys
-rm firmware/bnx2
-rm firmware/bnx2x
-rm firmware/cpia2
-rm firmware/cxgb3
-rm firmware/dabusb
-rm firmware/e100
-rm firmware/edgeport
-rm firmware/emi26
-rm firmware/emi62
-rm firmware/ess
-rm firmware/kaweth
-rm firmware/keyspan
-rm firmware/korg
-rm firmware/matrox
-rm firmware/myricom
-rm firmware/ositech
-rm firmware/qlogic
-rm firmware/r128
-rm firmware/radeon
-rm firmware/sb16
-rm firmware/sun
-rm firmware/tehuti
-rm firmware/tigon
-rm firmware/ttusb-budget
-rm firmware/vicam
-rm firmware/yam
-rm firmware/yamaha
+# Some of this is DFSG-free, but it has been moved to firmware-free so
+# we don't need it in linux-2.6 as well.
+rm firmware
 
 rm arch/powerpc/sysdev/micropatch.c
 
diff --git a/debian/patches/debian/dfsg/firmware-Sierra-Wireless-CIS-copyright.patch b/debian/patches/debian/dfsg/firmware-Sierra-Wireless-CIS-copyright.patch
deleted file mode 100644
index aee113067..000000000
--- a/debian/patches/debian/dfsg/firmware-Sierra-Wireless-CIS-copyright.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Fri, 5 Mar 2010 23:28:48 +0000
-Subject: [PATCH] Correct attribution and licence of Sierra Wireless CIS files
-
-These files have nothing to do with the pcmcia-cs project; they are
-distributed by Sierra Wireless under GPLv3.
-
---- a/firmware/WHENCE
-+++ b/firmware/WHENCE
-@@ -634,13 +634,22 @@ File: cis/MT5634ZLX.cis
-       cis/RS-COM-2P.cis
-       cis/COMpad2.cis
-       cis/COMpad4.cis
--      cis/SW_555_SER.cis
-+
-+Licence: GPL
-+
-+Originally developed by the pcmcia-cs project
-+
-+--------------------------------------------------------------------------
-+
-+Driver: SERIAL_8520_CS - Serial PCMCIA adapter
-+
-+File: cis/SW_555_SER.cis
-       cis/SW_7xx_SER.cis
-       cis/SW_8xx_SER.cis
- 
--Licence: GPL
-+Licence: GPLv3
- 
--Originally developed by the pcmcia-cs project
-+Copyright Sierra Wireless
- 
- --------------------------------------------------------------------------
- 
diff --git a/debian/patches/debian/dfsg/firmware-cleanup.patch b/debian/patches/debian/dfsg/firmware-cleanup.patch
index 7e4e8c67f..13fe60a75 100644
--- a/debian/patches/debian/dfsg/firmware-cleanup.patch
+++ b/debian/patches/debian/dfsg/firmware-cleanup.patch
@@ -1,128 +1,26 @@
-diff --git a/firmware/Makefile b/firmware/Makefile
-index 1c00d05..3bf888d 100644
---- a/firmware/Makefile
-+++ b/firmware/Makefile
-@@ -20,55 +20,8 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
- # accurate. In the latter case it doesn't matter -- it'll use $(fw-shipped-all).
- # But be aware that the config file might not be included at all.
+diff --git a/Makefile b/Makefile
+index d6592b6..9afac11 100644
+--- a/Makefile
++++ b/Makefile
+@@ -487,7 +487,7 @@ scripts: scripts_basic include/config/auto.conf include/config/tristate.conf
  
--ifdef CONFIG_ACENIC_OMIT_TIGON_I
--acenic-objs := acenic/tg2.bin
--fw-shipped- += acenic/tg1.bin
--else
--acenic-objs := acenic/tg1.bin acenic/tg2.bin
--endif
--fw-shipped-$(CONFIG_3C359) += 3com/3C359.bin
--fw-shipped-$(CONFIG_ACENIC) += $(acenic-objs)
--fw-shipped-$(CONFIG_ADAPTEC_STARFIRE) += adaptec/starfire_rx.bin \
--					 adaptec/starfire_tx.bin
- fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin
--fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw
--fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-6.2.5.0.fw \
--			      bnx2x/bnx2x-e1h-6.2.5.0.fw \
--			      bnx2x/bnx2x-e2-6.2.5.0.fw
--fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.2.1.fw \
--			     bnx2/bnx2-rv2p-09-6.0.17.fw \
--			     bnx2/bnx2-rv2p-09ax-6.0.17.fw \
--			     bnx2/bnx2-mips-06-6.2.1.fw \
--			     bnx2/bnx2-rv2p-06-6.0.15.fw
--fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
--fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin
--fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
--				   cxgb3/t3c_psram-1.1.0.bin \
--				   cxgb3/t3fw-7.10.0.bin \
--				   cxgb3/ael2005_opt_edc.bin \
--				   cxgb3/ael2005_twx_edc.bin \
--				   cxgb3/ael2020_twx_edc.bin
--fw-shipped-$(CONFIG_DRM_MGA) += matrox/g200_warp.fw matrox/g400_warp.fw
--fw-shipped-$(CONFIG_DRM_R128) += r128/r128_cce.bin
--fw-shipped-$(CONFIG_DRM_RADEON) += radeon/R100_cp.bin radeon/R200_cp.bin \
--				   radeon/R300_cp.bin radeon/R420_cp.bin \
--				   radeon/RS690_cp.bin radeon/RS600_cp.bin \
--				   radeon/R520_cp.bin \
--				   radeon/R600_pfp.bin radeon/R600_me.bin \
--				   radeon/RV610_pfp.bin radeon/RV610_me.bin \
--				   radeon/RV630_pfp.bin radeon/RV630_me.bin \
--				   radeon/RV620_pfp.bin radeon/RV620_me.bin \
--				   radeon/RV635_pfp.bin radeon/RV635_me.bin \
--				   radeon/RV670_pfp.bin radeon/RV670_me.bin \
--				   radeon/RS780_pfp.bin radeon/RS780_me.bin \
--				   radeon/RV770_pfp.bin radeon/RV770_me.bin \
--				   radeon/RV730_pfp.bin radeon/RV730_me.bin \
--				   radeon/RV710_pfp.bin radeon/RV710_me.bin
- fw-shipped-$(CONFIG_DVB_AV7110) += av7110/bootcode.bin
--fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin
--fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \
--			     e100/d102e_ucode.bin
--fw-shipped-$(CONFIG_MYRI_SBUS) += myricom/lanai.bin
- fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis cis/PCMLM28.cis \
- 				     cis/DP83903.cis cis/NE2K.cis \
- 				     cis/tamarack.cis cis/PE-200.cis \
-@@ -77,67 +32,8 @@ fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis \
- 				       cis/COMpad2.cis cis/COMpad4.cis \
- 				       cis/SW_555_SER.cis cis/SW_7xx_SER.cis \
- 				       cis/SW_8xx_SER.cis
--fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin
--fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \
--				      advansys/3550.bin advansys/38C0800.bin
--fw-shipped-$(CONFIG_SCSI_QLOGIC_1280) += qlogic/1040.bin qlogic/1280.bin \
--					 qlogic/12160.bin
--fw-shipped-$(CONFIG_SCSI_QLOGICPTI) += qlogic/isp1000.bin
--fw-shipped-$(CONFIG_INFINIBAND_QIB) += qlogic/sd7220.fw
--fw-shipped-$(CONFIG_SMCTR) += tr_smctr.bin
--fw-shipped-$(CONFIG_SND_KORG1212) += korg/k1212.dsp
--fw-shipped-$(CONFIG_SND_MAESTRO3) += ess/maestro3_assp_kernel.fw \
--				     ess/maestro3_assp_minisrc.fw
--fw-shipped-$(CONFIG_SND_SB16_CSP) += sb16/mulaw_main.csp sb16/alaw_main.csp \
--				     sb16/ima_adpcm_init.csp \
--				     sb16/ima_adpcm_playback.csp \
--				     sb16/ima_adpcm_capture.csp
--fw-shipped-$(CONFIG_SND_YMFPCI) += yamaha/ds1_ctrl.fw yamaha/ds1_dsp.fw \
--				   yamaha/ds1e_ctrl.fw
--fw-shipped-$(CONFIG_SND_WAVEFRONT) += yamaha/yss225_registers.bin
--fw-shipped-$(CONFIG_TEHUTI) += tehuti/bdx.bin
--fw-shipped-$(CONFIG_TIGON3) += tigon/tg3.bin tigon/tg3_tso.bin \
--			       tigon/tg3_tso5.bin
--fw-shipped-$(CONFIG_TYPHOON) += 3com/typhoon.bin
--fw-shipped-$(CONFIG_USB_DABUSB) += dabusb/firmware.fw dabusb/bitstream.bin
--fw-shipped-$(CONFIG_USB_EMI26) += emi26/loader.fw emi26/firmware.fw \
--				  emi26/bitstream.fw
--fw-shipped-$(CONFIG_USB_EMI62) += emi62/loader.fw emi62/bitstream.fw \
--				  emi62/spdif.fw emi62/midi.fw
--fw-shipped-$(CONFIG_USB_KAWETH) += kaweth/new_code.bin kaweth/trigger_code.bin \
--				   kaweth/new_code_fix.bin \
--				   kaweth/trigger_code_fix.bin
--ifdef CONFIG_FIRMWARE_IN_KERNEL
--fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_MPR) += keyspan/mpr.fw
--fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA18X) += keyspan/usa18x.fw
--fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA19) += keyspan/usa19.fw
--fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA19QI) += keyspan/usa19qi.fw
--fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA19QW) += keyspan/usa19qw.fw
--fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA19W) += keyspan/usa19w.fw
--fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA28) += keyspan/usa28.fw
--fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA28XA) += keyspan/usa28xa.fw
--fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA28XB) += keyspan/usa28xb.fw
--fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA28X) += keyspan/usa28x.fw
--fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA49W) += keyspan/usa49w.fw
--fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA49WLC) += keyspan/usa49wlc.fw
--else
--fw-shipped- += keyspan/mpr.fw keyspan/usa18x.fw keyspan/usa19.fw	\
--	keyspan/usa19qi.fw keyspan/usa19qw.fw keyspan/usa19w.fw		\
--	keyspan/usa28.fw keyspan/usa28xa.fw keyspan/usa28xb.fw		\
--	keyspan/usa28x.fw keyspan/usa49w.fw keyspan/usa49wlc.fw
--endif
--fw-shipped-$(CONFIG_USB_SERIAL_TI) += ti_3410.fw ti_5052.fw \
--				      mts_cdma.fw mts_gsm.fw mts_edge.fw
--fw-shipped-$(CONFIG_USB_SERIAL_EDGEPORT) += edgeport/boot.fw edgeport/boot2.fw \
--					    edgeport/down.fw edgeport/down2.fw
--fw-shipped-$(CONFIG_USB_SERIAL_EDGEPORT_TI) += edgeport/down3.bin
--fw-shipped-$(CONFIG_USB_SERIAL_WHITEHEAT) += whiteheat_loader.fw whiteheat.fw \
--					   # whiteheat_loader_debug.fw
- fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_PDA) += keyspan_pda/keyspan_pda.fw
- fw-shipped-$(CONFIG_USB_SERIAL_XIRCOM) += keyspan_pda/xircom_pgs.fw
--fw-shipped-$(CONFIG_USB_VICAM) += vicam/firmware.fw
--fw-shipped-$(CONFIG_VIDEO_CPIA2) += cpia2/stv0672_vp4.bin
--fw-shipped-$(CONFIG_YAM) += yam/1200.bin yam/9600.bin
+ # Objects we will link into vmlinux / subdirs we need to visit
+ init-y		:= init/
+-drivers-y	:= drivers/ sound/ firmware/
++drivers-y	:= drivers/ sound/
+ net-y		:= net/
+ libs-y		:= lib/
+ core-y		:= usr/
+diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst
+index 6bf8e87..2f6db83 100644
+--- a/scripts/Makefile.fwinst
++++ b/scripts/Makefile.fwinst
+@@ -13,7 +13,7 @@ src := $(obj)
+ -include $(objtree)/.config
  
- fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)
+ include scripts/Kbuild.include
+-include $(srctree)/$(obj)/Makefile
++-include $(srctree)/$(obj)/Makefile
+ 
+ include scripts/Makefile.host
  
diff --git a/debian/patches/debian/dfsg/firmware-pcmcia-cs-CIS-source-and-copyright.patch b/debian/patches/debian/dfsg/firmware-pcmcia-cs-CIS-source-and-copyright.patch
deleted file mode 100644
index 930e900cc..000000000
--- a/debian/patches/debian/dfsg/firmware-pcmcia-cs-CIS-source-and-copyright.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Fri, 5 Mar 2010 04:20:36 +0000
-Subject: [PATCH] firmware: Add source and copyright notice for CIS files from pcmcia-cs
-
---- a/firmware/WHENCE
-+++ b/firmware/WHENCE
-@@ -602,30 +602,42 @@ File: cis/LA-PCM.cis
-       cis/tamarack.cis
-       cis/PE-200.cis
-       cis/PE520.cis
-+Source: cis/src/LA-PCM.cis
-+Source: cis/src/PCMLM28.cis
-+Source: cis/src/DP83903.cis
-+Source: cis/src/NE2K.cis
-+Source: cis/src/tamarack.cis
-+Source: cis/src/PE-200.cis
-+Source: cis/src/PE520.cis
- 
--Licence: GPL
-+Licence: Dual GPLv2/MPL
- 
- Originally developed by the pcmcia-cs project
-+Copyright (C) 1998, 1999, 2000 David A. Hinds
- 
- --------------------------------------------------------------------------
- 
- Driver: PCMCIA_3C589 - 3Com PCMCIA adapter
- 
- File: cis/3CXEM556.cis
-+Source: cis/src/3CXEM556.cis
- 
--Licence: GPL
-+Licence: Dual GPLv2/MPL
- 
- Originally developed by the pcmcia-cs project
-+Copyright (C) 1998, 1999, 2000 David A. Hinds
- 
- --------------------------------------------------------------------------
- 
- Driver: PCMCIA_3C574 - 3Com PCMCIA adapter
- 
- File: cis/3CCFEM556.cis
-+Source: cis/src/3CCFEM556.cis
- 
--Licence: GPL
-+Licence: Dual GPLv2/MPL
- 
- Originally developed by the pcmcia-cs project
-+Copyright (C) 1998, 1999, 2000 David A. Hinds
- 
- --------------------------------------------------------------------------
- 
-@@ -634,10 +645,15 @@ File: cis/MT5634ZLX.cis
-       cis/RS-COM-2P.cis
-       cis/COMpad2.cis
-       cis/COMpad4.cis
-+Source: cis/src/MT5634ZLX.cis
-+Source: cis/src/RS-COM-2P.cis
-+Source: cis/src/COMpad2.cis
-+Source: cis/src/COMpad4.cis
- 
--Licence: GPL
-+Licence: Dual GPLv2/MPL
- 
- Originally developed by the pcmcia-cs project
-+Copyright (C) 1998, 1999, 2000 David A. Hinds
- 
- --------------------------------------------------------------------------
- 
---- /dev/null
-+++ b/firmware/cis/src/3CCFEM556.cis
-@@ -0,0 +1,22 @@
-+#
-+# This card is MFC-compliant, but identifies itself as single function
-+#
-+vers_1 5.0, "3Com", "Megahertz 3CCFEM556", "LAN + 56k Modem"
-+manfid 0x0101, 0x0556
-+funcid 0
-+
-+mfc {
-+  funcid network_adapter
-+  config base 0x1000 mask 0x267 last_index 0x07
-+  cftable_entry 0x07
-+    Vcc Vnom 5V
-+    irq mask 0xffff [level]
-+    io  0x0000-0x000f [8bit] [16bit]
-+}, {
-+  funcid serial_port
-+  config base 0x1100 mask 0x277 last_index 0x27
-+  cftable_entry 0x27
-+    Vcc Vnom 5V
-+    irq mask 0xffff [level]
-+    io  0x0000-0x0007 [8bit]
-+}
---- /dev/null
-+++ b/firmware/cis/src/3CXEM556.cis
-@@ -0,0 +1,22 @@
-+#
-+# This card is MFC-compliant, but identifies itself as single function
-+#
-+vers_1 5.0, "3Com", "Megahertz 3CXEM556", "LAN + 56k Modem"
-+manfid 0x0101, 0x0035
-+funcid 0
-+
-+mfc {
-+  funcid network_adapter
-+  config base 0x0800 mask 0x63 last_index 0x07
-+  cftable_entry 0x07
-+    Vcc Vnom 5V
-+    irq mask 0xffff [level]
-+    io  0x0000-0x000f [8bit] [16bit]
-+}, {
-+  funcid serial_port
-+  config base 0x900 mask 0x63 last_index 0x27
-+  cftable_entry 0x27
-+    Vcc Vnom 5V
-+    irq mask 0xffff [level]
-+    io  0x0000-0x0007 [8bit]
-+}
---- /dev/null
-+++ b/firmware/cis/src/COMpad2.cis
-@@ -0,0 +1,20 @@
-+#
-+# Replacement CIS for Advantech COMpad-32/85
-+#
-+dev_info
-+  NULL 0ns, 512b
-+vers_1 4.1, "ADVANTECH", "COMpad-32/85", "1.0"
-+funcid serial_port [post]
-+config base 0x0100 mask 0x0003 last_index 0x05
-+cftable_entry 0x01 [default]
-+  [mwait]
-+  io 0x02e8-0x02ef, 0x03e8-0x03ef [lines=10] [8bit] [range]
-+  irq mask 0x9eb8 [level]
-+cftable_entry 0x02
-+  io 0x0330-0x033f [lines=10] [8bit] [range]
-+cftable_entry 0x03
-+  io 0x0340-0x034f [lines=10] [8bit] [range]
-+cftable_entry 0x04
-+  io 0x0350-0x035f [lines=10] [8bit] [range]
-+cftable_entry 0x05
-+  io 0x0360-0x036f [lines=10] [8bit] [range]
---- /dev/null
-+++ b/firmware/cis/src/COMpad4.cis
-@@ -0,0 +1,14 @@
-+#
-+# Replacement CIS for Advantech COMpad-32/85B-4
-+#
-+dev_info
-+  NULL 0ns, 512b
-+vers_1 4.1, "ADVANTECH", "COMpad-32/85B-4"
-+funcid serial_port [post]
-+config base 0x0100 mask 0x0001 last_index 0x02
-+cftable_entry 0x01 [default]
-+  [mwait]
-+  io 0x0240-0x025f [lines=10] [8bit] [range]
-+  irq mask 0x9eb8 [level]
-+cftable_entry 0x02
-+  io 0x0340-0x035f [lines=10] [8bit] [range]
---- /dev/null
-+++ b/firmware/cis/src/DP83903.cis
-@@ -0,0 +1,24 @@
-+#
-+# This CIS is for cards based on the National Semiconductor
-+# DP83903 Multiple Function Interface Chip
-+#
-+vers_1 4.1, "Multifunction Card", "", "", "NSC MF LAN/Modem"
-+manfid 0x0175, 0x0000
-+funcid 0
-+
-+mfc {
-+  funcid network_adapter
-+  config base 0x1020 mask 0x277 last_index 0x17
-+  cftable_entry 0x17
-+    Vcc Vnom 5V
-+    irq mask 0xffff [level]
-+    io  0x0000-0x001f [8bit] [16bit]
-+    memory 0x0000-0x3fff @ 0x0000
-+}, {
-+  funcid serial_port
-+  config base 0x1040 mask 0x0277 last_index 0x07
-+  cftable_entry 0x07
-+    Vcc Vnom 5V
-+    irq mask 0xffff [level]
-+    io  0x0000-0x0007 [8bit]
-+}
---- /dev/null
-+++ b/firmware/cis/src/LA-PCM.cis
-@@ -0,0 +1,44 @@
-+#
-+# Replacement CIS for Allied Telesis LA-PCM
-+#
-+dev_info
-+  fn_specific 100ns, 64kb
-+  FLASH 150ns, 60kb
-+attr_dev_info
-+  FLASH 150ns, 4kb
-+manfid 0xc00f, 0x0002
-+funcid network_adapter [post] [rom]
-+vers_1 4.1, "Allied Telesis,K.K", "Ethernet LAN Card", "CentreCOM", "LA-PCM"
-+config base 0x20000 mask 0x000b last_index 0x10
-+cftable_entry 0x01
-+  io 0x0200-0x021f [8bit] [16bit]
-+cftable_entry 0x02
-+  io 0x0220-0x023f [8bit] [16bit]
-+cftable_entry 0x03
-+  io 0x0240-0x025f [8bit] [16bit]
-+cftable_entry 0x04
-+  io 0x0260-0x027f [8bit] [16bit]
-+cftable_entry 0x05
-+  io 0x0280-0x029f [8bit] [16bit]
-+cftable_entry 0x06
-+  io 0x02a0-0x02bf [8bit] [16bit]
-+cftable_entry 0x07
-+  io 0x02c0-0x02df [8bit] [16bit]
-+cftable_entry 0x08
-+  io 0x02e0-0x02ff [8bit] [16bit]
-+cftable_entry 0x09
-+  io 0x0300-0x031f [8bit] [16bit]
-+cftable_entry 0x0a
-+  io 0x0320-0x033f [8bit] [16bit]
-+cftable_entry 0x0b
-+  io 0x0340-0x035f [8bit] [16bit]
-+cftable_entry 0x0c
-+  io 0x0360-0x037f [8bit] [16bit]
-+cftable_entry 0x0d
-+  io 0x0380-0x039f [8bit] [16bit]
-+cftable_entry 0x0e
-+  io 0x03a0-0x03bf [8bit] [16bit]
-+cftable_entry 0x0f
-+  io 0x03c0-0x03df [8bit] [16bit]
-+cftable_entry 0x10
-+  io 0x03e0-0x03ff [8bit] [16bit]
---- /dev/null
-+++ b/firmware/cis/src/MT5634ZLX.cis
-@@ -0,0 +1,18 @@
-+#
-+# Replacement CIS for Multitech MT5634ZLX modems
-+#
-+dev_info no_info
-+vers_1 4.1, "MultiTech", "PCMCIA 56K DataFax"
-+manfid 0x0200, 0x0001
-+funcid serial_port
-+config base 0xff80 mask 0x0067 last_index 0x27
-+cftable_entry 0x0f [default]
-+  [rdybsy] [audio] [pwrdown]
-+  Vcc Vnom 5V Vpp1 Vnom 5V Vpp2 Vnom 5V
-+  io 0x03f8-0x03ff [lines=10] [8bit]
-+cftable_entry 0x17
-+  io 0x02f8-0x02ff [lines=10] [8bit]
-+cftable_entry 0x1f
-+  io 0x03e8-0x03ef [lines=10] [8bit]
-+cftable_entry 0x27
-+  io 0x02e8-0x02ef [lines=10] [8bit]
---- /dev/null
-+++ b/firmware/cis/src/NE2K.cis
-@@ -0,0 +1,10 @@
-+#
-+# Replacement CIS for various busted NE2000-compatible cards
-+#
-+vers_1 4.1, "PCMCIA", "Ethernet"
-+funcid network_adapter
-+config base 0x03f8 mask 0x03 last_index 0x20
-+cftable_entry 0x20 [default]
-+  Vcc Vnom 5V
-+  irq mask 0xffff [level]
-+  io 0x0000-0x001f [8bit] [16bit]
---- /dev/null
-+++ b/firmware/cis/src/PCMLM28.cis
-@@ -0,0 +1,37 @@
-+#
-+# The on-card CIS says it is MFC-compliant, but it is not
-+#
-+vers_1 4.1, "LINKSYS", "PCMLM28"
-+manfid 0x0143, 0xc0ab
-+funcid 0
-+config base 0x03f8 mask 0x03 last_index 0x2f
-+
-+cftable_entry 0x24 [default]
-+  Vcc Vnom 5V
-+  irq mask 0xffff [level]
-+  io 0x0300-0x031f, 0x02f8-0x02ff [8bit] [16bit]
-+
-+cftable_entry 0x25
-+  io 0x0320-0x033f, 0x02f8-0x02ff [8bit] [16bit]
-+cftable_entry 0x26
-+  io 0x0340-0x035f, 0x02f8-0x02ff [8bit] [16bit]
-+cftable_entry 0x27
-+  io 0x0360-0x037f, 0x02f8-0x02ff [8bit] [16bit]
-+
-+cftable_entry 0x28
-+  io 0x0300-0x031f, 0x03e8-0x03ef [8bit] [16bit]
-+cftable_entry 0x29
-+  io 0x0320-0x033f, 0x03e8-0x03ef [8bit] [16bit]
-+cftable_entry 0x2a
-+  io 0x0340-0x035f, 0x03e8-0x03ef [8bit] [16bit]
-+cftable_entry 0x2b
-+  io 0x0360-0x037f, 0x03e8-0x03ef [8bit] [16bit]
-+
-+cftable_entry 0x2c
-+  io 0x0300-0x031f, 0x02e8-0x02ef [8bit] [16bit]
-+cftable_entry 0x2d
-+  io 0x0320-0x033f, 0x02e8-0x02ef [8bit] [16bit]
-+cftable_entry 0x2e
-+  io 0x0340-0x035f, 0x02e8-0x02ef [8bit] [16bit]
-+cftable_entry 0x2f
-+  io 0x0360-0x037f, 0x02e8-0x02ef [8bit] [16bit]
---- /dev/null
-+++ b/firmware/cis/src/PE-200.cis
-@@ -0,0 +1,11 @@
-+#
-+# Replacement CIS for PE-200 ethernet card
-+#
-+vers_1 4.1, "PMX   ", "PE-200", "ETHERNET", "R01"
-+funcid network_adapter [post] [rom]
-+config base 0x0100 mask 0x0001 last_index 0x01
-+cftable_entry 0x1 [default]
-+  [mwait]
-+  Vcc Vnom 5V
-+  irq mask 0xffff [level]
-+  io 0x0000-0x000f, 0x0010-0x001f [8bit] [16bit]
---- /dev/null
-+++ b/firmware/cis/src/PE520.cis
-@@ -0,0 +1,11 @@
-+#
-+# Replacement CIS for LanPro EP-4000A ethernet card
-+#
-+vers_1 4.1, "KTI", "PE520 PLUS", "PCMCIA Ethernet"
-+manfid 0x0161, 0x0010
-+funcid network_adapter
-+config base 0x0fd0 mask 0x0b last_index 0x01
-+cftable_entry 0x01 [default]
-+  Vcc Vnom 5V
-+  irq mask 0xffff [level]
-+  io 0x0000-0x001f [8bit] [16bit]
---- /dev/null
-+++ b/firmware/cis/src/RS-COM-2P.cis
-@@ -0,0 +1,14 @@
-+#
-+# Replacement CIS for dual-serial-port IO card
-+#
-+vers_1 4.1, "PCMCIA", "RS-COM 2P"
-+funcid serial_port [post]
-+config base 0x0100 mask 0x0001 last_index 0x03
-+cftable_entry 0x01 [default]
-+  [mwait]
-+  io 0x03e8-0x03ef, 0x02e8-0x02ef [lines=10] [8bit] [range]
-+  irq mask 0x9eb8 [level]
-+cftable_entry 0x02
-+  io 0x0250-0x0257, 0x0258-0x025f [lines=10] [8bit] [range]
-+cftable_entry 0x03
-+  io 0x0260-0x0267, 0x0268-0x026f [lines=10] [8bit] [range]
---- /dev/null
-+++ b/firmware/cis/src/tamarack.cis
-@@ -0,0 +1,17 @@
-+#
-+# Replacement CIS for Surecom, Tamarack NE2000 cards
-+#
-+dev_info
-+  fn_specific 100ns, 512b
-+attr_dev_info
-+  EEPROM 250ns, 512b
-+vers_1 4.1, "TAMARACK", "Ethernet", "A", "004743118001"
-+funcid network_adapter
-+config base 0x03f8 mask 0x0003 last_index 0x20
-+cftable_entry 0x20 [default]
-+  [mwait]
-+  Vcc Vnom 5V Vmin 4500mV Vmax 5500mV Istatic 100mA
-+    Iavg 170mA Ipeak 200mA
-+  timing wait 15us
-+  io 0x0000-0x000f, 0x0010-0x001f [lines=5] [8bit] [16bit]
-+  irq mask 0xffff [level]