diff options
| author | Dmitry Kravkov <dmitry@broadcom.com> | 2010-10-06 03:18:47 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-06 14:09:25 -0700 |
| commit | 560131f313ea9b9439742138289b6f68d61531ec (patch) | |
| tree | 51a4ff30dddceb13da8409c079dec3283ca1fd4d | |
| parent | 541a78103f097cd5120e55aaba56d099a64f153c (diff) | |
| download | linux-3.10-560131f313ea9b9439742138289b6f68d61531ec.tar.gz linux-3.10-560131f313ea9b9439742138289b6f68d61531ec.tar.bz2 linux-3.10-560131f313ea9b9439742138289b6f68d61531ec.zip | |
bnx2x: create folder for bnx2x firmware files
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_main.c | 4 | ||||
| -rw-r--r-- | firmware/Makefile | 3 | ||||
| -rw-r--r-- | firmware/WHENCE | 4 | ||||
| -rw-r--r-- | firmware/bnx2x/bnx2x-e1-5.2.13.0.fw.ihex (renamed from firmware/bnx2x-e1-5.2.13.0.fw.ihex) | 0 | ||||
| -rw-r--r-- | firmware/bnx2x/bnx2x-e1h-5.2.13.0.fw.ihex (renamed from firmware/bnx2x-e1h-5.2.13.0.fw.ihex) | 0 |
5 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c index 67587fe9e35..3696a4b6547 100644 --- a/drivers/net/bnx2x/bnx2x_main.c +++ b/drivers/net/bnx2x/bnx2x_main.c @@ -66,8 +66,8 @@ __stringify(BCM_5710_FW_MINOR_VERSION) "." \ __stringify(BCM_5710_FW_REVISION_VERSION) "." \ __stringify(BCM_5710_FW_ENGINEERING_VERSION) -#define FW_FILE_NAME_E1 "bnx2x-e1-" FW_FILE_VERSION ".fw" -#define FW_FILE_NAME_E1H "bnx2x-e1h-" FW_FILE_VERSION ".fw" +#define FW_FILE_NAME_E1 "bnx2x/bnx2x-e1-" FW_FILE_VERSION ".fw" +#define FW_FILE_NAME_E1H "bnx2x/bnx2x-e1h-" FW_FILE_VERSION ".fw" /* Time in jiffies before concluding the transmitter is hung */ #define TX_TIMEOUT (5*HZ) diff --git a/firmware/Makefile b/firmware/Makefile index 9c2d19452d0..44b3aae66b8 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -32,7 +32,8 @@ 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-e1-5.2.13.0.fw bnx2x-e1h-5.2.13.0.fw +fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-5.2.13.0.fw \ + bnx2x/bnx2x-e1h-5.2.13.0.fw fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-5.0.0.j15.fw \ bnx2/bnx2-rv2p-09-5.0.0.j10.fw \ bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw \ diff --git a/firmware/WHENCE b/firmware/WHENCE index ae5f8a47f29..1d3936c2e2f 100644 --- a/firmware/WHENCE +++ b/firmware/WHENCE @@ -679,8 +679,8 @@ Found in hex form in kernel source. Driver: bnx2x: Broadcom Everest -File: bnx2x-e1-5.2.13.0.fw -File: bnx2x-e1h-5.2.13.0.fw +File: bnx2x/bnx2x-e1-5.2.13.0.fw +File: bnx2x/bnx2x-e1h-5.2.13.0.fw License: Copyright (c) 2007-2010 Broadcom Corporation diff --git a/firmware/bnx2x-e1-5.2.13.0.fw.ihex b/firmware/bnx2x/bnx2x-e1-5.2.13.0.fw.ihex index 651f4346d89..651f4346d89 100644 --- a/firmware/bnx2x-e1-5.2.13.0.fw.ihex +++ b/firmware/bnx2x/bnx2x-e1-5.2.13.0.fw.ihex diff --git a/firmware/bnx2x-e1h-5.2.13.0.fw.ihex b/firmware/bnx2x/bnx2x-e1h-5.2.13.0.fw.ihex index ea3e254335b..ea3e254335b 100644 --- a/firmware/bnx2x-e1h-5.2.13.0.fw.ihex +++ b/firmware/bnx2x/bnx2x-e1h-5.2.13.0.fw.ihex |