Skip to content

Commit

Permalink
Staging: slicoss: add binary firmware to firmware directory
Browse files Browse the repository at this point in the history
Adds the firmware to the firmware directory in ihex format so it can be
installed when doing make firmware_install.

Also update the firmware location in the driver code so it can locate
the files in the right place.

This should conclude the move to request_firmware().

Signed-off-by: Lior Dotan <liodot@gmail.com>
Cc: Christopher Harrer <charrer@alacritech.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Lior Dotan authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 9d93833 commit a390c47
Show file tree
Hide file tree
Showing 8 changed files with 16,742 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/staging/slicoss/slicoss.c
Original file line number Diff line number Diff line change
Expand Up @@ -2189,10 +2189,10 @@ static int slic_card_download_gbrcv(struct adapter *adapter)

switch (adapter->devid) {
case SLIC_2GB_DEVICE_ID:
file = "oasisrcvucode.sys";
file = "slicoss/oasisrcvucode.sys";
break;
case SLIC_1GB_DEVICE_ID:
file = "gbrcvucode.sys";
file = "slicoss/gbrcvucode.sys";
break;
default:
ASSERT(0);
Expand Down Expand Up @@ -2270,10 +2270,10 @@ static int slic_card_download(struct adapter *adapter)

switch (adapter->devid) {
case SLIC_2GB_DEVICE_ID:
file = "oasisdownload.sys";
file = "slicoss/oasisdownload.sys";
break;
case SLIC_1GB_DEVICE_ID:
file = "gbdownload.sys";
file = "slicoss/gbdownload.sys";
break;
default:
ASSERT(0);
Expand Down
4 changes: 4 additions & 0 deletions firmware/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ 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_SLICOSS) += slicoss/gbdownload.sys slicoss/gbrcvucode.sys \
slicoss/oasisdbgdownload.sys \
slicoss/oasisdownload.sys \
slicoss/oasisrcvucode.sys
fw-shipped-$(CONFIG_SND_YMFPCI) += yamaha/ds1_ctrl.fw yamaha/ds1_dsp.fw \
yamaha/ds1e_ctrl.fw
fw-shipped-$(CONFIG_TEHUTI) += tehuti/bdx.bin
Expand Down
14 changes: 14 additions & 0 deletions firmware/WHENCE
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,20 @@ Found in hex form in kernel source.

--------------------------------------------------------------------------

Driver: SLICOSS - Alacritech IS-NIC products

File: slicoss/gbdownload.sys.ihex
File: slicoss/gbrcvucode.sys.ihex
File: slicoss/oasisdbgdownload.sys.ihex
File: slicoss/oasisdownload.sys.ihex
File: slicoss/oasisrcvucode.sys.ihex

Licence: Unknown

Found in hex form in kernel source.

--------------------------------------------------------------------------

Driver: cxgb3 - Chelsio Terminator 3 1G/10G Ethernet adapter

File: cxgb3/t3b_psram-1.1.0.bin.ihex
Expand Down
Loading

0 comments on commit a390c47

Please sign in to comment.