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>

diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index 67587fe9e358f0c395b743c364b9f12317e0d5fe..3696a4b6547bd78ab86bdc98fa67ea348e946b52 100644 (file)
--- 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 9c2d19452d0bf08a4c3642c7596d6056a8456797..44b3aae66b84d53bb900d5f1997fae9495fa390e 100644 (file)
--- 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 ae5f8a47f2920751e2c8b5760e6050b3e6e7fd55..1d3936c2e2f7308562c20e0637c784d3b0306113 100644 (file)
--- 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
similarity index 100%
rename from firmware/bnx2x-e1-5.2.13.0.fw.ihex
rename to 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
similarity index 100%
rename from firmware/bnx2x-e1h-5.2.13.0.fw.ihex
rename to firmware/bnx2x/bnx2x-e1h-5.2.13.0.fw.ihex