7 files changed, 62 insertions, 2 deletions
diff --git a/firmware/Makefile b/firmware/Makefile
index 5ea80b19785b..a6c7c3e47e42 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -67,10 +67,13 @@ 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
+fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis cis/PCMLM28.cis \
+                                     cis/DP83903.cis cis/NE2K.cis \
+                                     cis/tamarack.cis
 fw-shipped-$(CONFIG_PCMCIA_3C589) += cis/3CXEM556.cis
 fw-shipped-$(CONFIG_PCMCIA_3C574) += cis/3CCFEM556.cis
-fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis
+fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis \
+                                       cis/COMpad2.cis cis/COMpad4.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
diff --git a/firmware/WHENCE b/firmware/WHENCE
index 3f8c4f6bc43f..c437e14f0b11 100644
--- a/firmware/WHENCE
+++ b/firmware/WHENCE
@@ -597,6 +597,9 @@ Driver: PCMCIA_PCNET - NE2000 compatible PCMCIA adapter
 File: cis/LA-PCM.cis
      cis/PCMLM28.cis
+      cis/DP83903.cis
+      cis/NE2K.cis
+      cis/tamarack.cis
 Licence: GPL
@@ -628,6 +631,8 @@ Driver: SERIAL_8250_CS - Serial PCMCIA adapter
 File: cis/MT5634ZLX.cis
      cis/RS-COM-2P.cis
+      cis/COMpad2.cis
+      cis/COMpad4.cis
 Licence: GPL
diff --git a/firmware/cis/COMpad2.cis.ihex b/firmware/cis/COMpad2.cis.ihex
new file mode 100644
index 000000000000..1671c5e48caa
--- /dev/null
+++ b/firmware/cis/COMpad2.cis.ihex
@@ -0,0 +1,11 @@
+:1000000001030000FF151F0401414456414E5445B1
+:10001000434800434F4D7061642D33322F38350013
+:10002000312E300000FF210202011A0501050001F6
+:10003000031B0EC18118AA61E80207E8030730B864
+:100040009E1B08820108AA6030030F1B0883010869
+:10005000AA6040030F1B08840108AA6050030F1B0D
+:0D00600008850108AA6060030F1400FF006E
+:00000001FF
+#
+# Replacement CIS for Advantech COMpad-32/85
+#
diff --git a/firmware/cis/COMpad4.cis.ihex b/firmware/cis/COMpad4.cis.ihex
new file mode 100644
index 000000000000..27bbec1921b3
--- /dev/null
+++ b/firmware/cis/COMpad4.cis.ihex
@@ -0,0 +1,9 @@
+:1000000001030000FF151F0401414456414E5445B1
+:10001000434800434F4D7061642D33322F383542D1
+:100020002D34000000FF210202011A050102000127
+:10003000011B0BC18118AA6040021F30B89E1B082B
+:0C004000820108AA6040031F1400FF00AA
+:00000001FF
+#
+# Replacement CIS for Advantech COMpad-32/85B-4
+#
diff --git a/firmware/cis/DP83903.cis.ihex b/firmware/cis/DP83903.cis.ihex
new file mode 100644
index 000000000000..6d73ea3cf1b8
--- /dev/null
+++ b/firmware/cis/DP83903.cis.ihex
@@ -0,0 +1,14 @@
+:1000000001030000FF152904014D756C74696675C4
+:100010006E6374696F6E20436172640000004E531A
+:1000200043204D46204C414E2F4D6F64656D00FFBF
+:1000300020047501000021020000060B02004900A7
+:100040000000006A000000FF00130343495321022F
+:1000500006001A060517201077021B0C970179017C
+:10006000556530FFFF284000FF001303434953212B
+:100070000202001A060507401077021B09870119C2
+:0800800001552330FFFFFF00D2
+:00000001FF
+#
+# This CIS is for cards based on the National Semiconductor
+# DP83903 Multiple Function Interface Chip
+#
diff --git a/firmware/cis/NE2K.cis.ihex b/firmware/cis/NE2K.cis.ihex
new file mode 100644
index 000000000000..1bb40fc4759f
--- /dev/null
+++ b/firmware/cis/NE2K.cis.ihex
@@ -0,0 +1,8 @@
+:1000000001030000FF1515040150434D4349410011
+:1000100045746865726E6574000000FF2102060079
+:100020001A050120F803031B09E001190155653089
+:06003000FFFF1400FF00B9
+:00000001FF
+#
+# Replacement CIS for various busted NE2000-compatible cards
+#
diff --git a/firmware/cis/tamarack.cis.ihex b/firmware/cis/tamarack.cis.ihex
new file mode 100644
index 000000000000..1e86547fb361
--- /dev/null
+++ b/firmware/cis/tamarack.cis.ihex
@@ -0,0 +1,10 @@
+:100000000103D400FF17034100FF152404015441EC
+:100010004D415241434B0045746865726E657400F2
+:10002000410030303437343331313830303100FF33
+:10003000210206001A050120F803031B14E08119B0
+:100040003F554D5D06864626E551000F100F30FFE7
+:05005000FF1400FF0099
+:00000001FF
+#
+# Replacement CIS for Surecom, Tamarack NE2000 cards
+#

diff --git a/firmware/Makefile b/firmware/Makefile index 5ea80b19785b..a6c7c3e47e42 100644 --- a/firmware/Makefile +++ b/firmware/Makefile
@@ -67,10 +67,13 @@ fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin
67	fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \	67	fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \
68	e100/d102e_ucode.bin	68	e100/d102e_ucode.bin
69	fw-shipped-$(CONFIG_MYRI_SBUS) += myricom/lanai.bin	69	fw-shipped-$(CONFIG_MYRI_SBUS) += myricom/lanai.bin
70	fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis cis/PCMLM28.cis	70	fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis cis/PCMLM28.cis \
		71	cis/DP83903.cis cis/NE2K.cis \
		72	cis/tamarack.cis
71	fw-shipped-$(CONFIG_PCMCIA_3C589) += cis/3CXEM556.cis	73	fw-shipped-$(CONFIG_PCMCIA_3C589) += cis/3CXEM556.cis
72	fw-shipped-$(CONFIG_PCMCIA_3C574) += cis/3CCFEM556.cis	74	fw-shipped-$(CONFIG_PCMCIA_3C574) += cis/3CCFEM556.cis
73	fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis	75	fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis \
		76	cis/COMpad2.cis cis/COMpad4.cis
74	fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin	77	fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin
75	fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \	78	fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \
76	advansys/3550.bin advansys/38C0800.bin	79	advansys/3550.bin advansys/38C0800.bin


diff --git a/firmware/WHENCE b/firmware/WHENCE index 3f8c4f6bc43f..c437e14f0b11 100644 --- a/firmware/WHENCE +++ b/firmware/WHENCE
@@ -597,6 +597,9 @@ Driver: PCMCIA_PCNET - NE2000 compatible PCMCIA adapter
597		597
598	File: cis/LA-PCM.cis	598	File: cis/LA-PCM.cis
599	cis/PCMLM28.cis	599	cis/PCMLM28.cis
		600	cis/DP83903.cis
		601	cis/NE2K.cis
		602	cis/tamarack.cis
600		603
601	Licence: GPL	604	Licence: GPL
602		605
@@ -628,6 +631,8 @@ Driver: SERIAL_8250_CS - Serial PCMCIA adapter
628		631
629	File: cis/MT5634ZLX.cis	632	File: cis/MT5634ZLX.cis
630	cis/RS-COM-2P.cis	633	cis/RS-COM-2P.cis
		634	cis/COMpad2.cis
		635	cis/COMpad4.cis
631		636
632	Licence: GPL	637	Licence: GPL
633		638


diff --git a/firmware/cis/COMpad2.cis.ihex b/firmware/cis/COMpad2.cis.ihex new file mode 100644 index 000000000000..1671c5e48caa --- /dev/null +++ b/firmware/cis/COMpad2.cis.ihex
@@ -0,0 +1,11 @@
		1	:1000000001030000FF151F0401414456414E5445B1
		2	:10001000434800434F4D7061642D33322F38350013
		3	:10002000312E300000FF210202011A0501050001F6
		4	:10003000031B0EC18118AA61E80207E8030730B864
		5	:100040009E1B08820108AA6030030F1B0883010869
		6	:10005000AA6040030F1B08840108AA6050030F1B0D
		7	:0D00600008850108AA6060030F1400FF006E
		8	:00000001FF
		9	#
		10	# Replacement CIS for Advantech COMpad-32/85
		11	#


diff --git a/firmware/cis/COMpad4.cis.ihex b/firmware/cis/COMpad4.cis.ihex new file mode 100644 index 000000000000..27bbec1921b3 --- /dev/null +++ b/firmware/cis/COMpad4.cis.ihex
@@ -0,0 +1,9 @@
		1	:1000000001030000FF151F0401414456414E5445B1
		2	:10001000434800434F4D7061642D33322F383542D1
		3	:100020002D34000000FF210202011A050102000127
		4	:10003000011B0BC18118AA6040021F30B89E1B082B
		5	:0C004000820108AA6040031F1400FF00AA
		6	:00000001FF
		7	#
		8	# Replacement CIS for Advantech COMpad-32/85B-4
		9	#


diff --git a/firmware/cis/DP83903.cis.ihex b/firmware/cis/DP83903.cis.ihex new file mode 100644 index 000000000000..6d73ea3cf1b8 --- /dev/null +++ b/firmware/cis/DP83903.cis.ihex
@@ -0,0 +1,14 @@
		1	:1000000001030000FF152904014D756C74696675C4
		2	:100010006E6374696F6E20436172640000004E531A
		3	:1000200043204D46204C414E2F4D6F64656D00FFBF
		4	:1000300020047501000021020000060B02004900A7
		5	:100040000000006A000000FF00130343495321022F
		6	:1000500006001A060517201077021B0C970179017C
		7	:10006000556530FFFF284000FF001303434953212B
		8	:100070000202001A060507401077021B09870119C2
		9	:0800800001552330FFFFFF00D2
		10	:00000001FF
		11	#
		12	# This CIS is for cards based on the National Semiconductor
		13	# DP83903 Multiple Function Interface Chip
		14	#


diff --git a/firmware/cis/NE2K.cis.ihex b/firmware/cis/NE2K.cis.ihex new file mode 100644 index 000000000000..1bb40fc4759f --- /dev/null +++ b/firmware/cis/NE2K.cis.ihex
@@ -0,0 +1,8 @@
		1	:1000000001030000FF1515040150434D4349410011
		2	:1000100045746865726E6574000000FF2102060079
		3	:100020001A050120F803031B09E001190155653089
		4	:06003000FFFF1400FF00B9
		5	:00000001FF
		6	#
		7	# Replacement CIS for various busted NE2000-compatible cards
		8	#


diff --git a/firmware/cis/tamarack.cis.ihex b/firmware/cis/tamarack.cis.ihex new file mode 100644 index 000000000000..1e86547fb361 --- /dev/null +++ b/firmware/cis/tamarack.cis.ihex
@@ -0,0 +1,10 @@
		1	:100000000103D400FF17034100FF152404015441EC
		2	:100010004D415241434B0045746865726E657400F2
		3	:10002000410030303437343331313830303100FF33
		4	:10003000210206001A050120F803031B14E08119B0
		5	:100040003F554D5D06864626E551000F100F30FFE7
		6	:05005000FF1400FF0099
		7	:00000001FF
		8	#
		9	# Replacement CIS for Surecom, Tamarack NE2000 cards
		10	#