From 5f087421017b0218e62640a4313aa4751dd73b87 Mon Sep 17 00:00:00 2001 From: Dmitry Kravkov Date: Wed, 6 Oct 2010 03:18:47 +0000 Subject: [PATCH] --- yaml --- r: 214938 b: refs/heads/master c: 560131f313ea9b9439742138289b6f68d61531ec h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/bnx2x/bnx2x_main.c | 4 ++-- trunk/firmware/Makefile | 3 ++- trunk/firmware/WHENCE | 4 ++-- trunk/firmware/{ => bnx2x}/bnx2x-e1-5.2.13.0.fw.ihex | 0 trunk/firmware/{ => bnx2x}/bnx2x-e1h-5.2.13.0.fw.ihex | 0 6 files changed, 7 insertions(+), 6 deletions(-) rename trunk/firmware/{ => bnx2x}/bnx2x-e1-5.2.13.0.fw.ihex (100%) rename trunk/firmware/{ => bnx2x}/bnx2x-e1h-5.2.13.0.fw.ihex (100%) diff --git a/[refs] b/[refs] index 0041d4111be1..b034629a5de8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 541a78103f097cd5120e55aaba56d099a64f153c +refs/heads/master: 560131f313ea9b9439742138289b6f68d61531ec diff --git a/trunk/drivers/net/bnx2x/bnx2x_main.c b/trunk/drivers/net/bnx2x/bnx2x_main.c index 67587fe9e358..3696a4b6547b 100644 --- a/trunk/drivers/net/bnx2x/bnx2x_main.c +++ b/trunk/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/trunk/firmware/Makefile b/trunk/firmware/Makefile index 9c2d19452d0b..44b3aae66b84 100644 --- a/trunk/firmware/Makefile +++ b/trunk/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/trunk/firmware/WHENCE b/trunk/firmware/WHENCE index ae5f8a47f292..1d3936c2e2f7 100644 --- a/trunk/firmware/WHENCE +++ b/trunk/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/trunk/firmware/bnx2x-e1-5.2.13.0.fw.ihex b/trunk/firmware/bnx2x/bnx2x-e1-5.2.13.0.fw.ihex similarity index 100% rename from trunk/firmware/bnx2x-e1-5.2.13.0.fw.ihex rename to trunk/firmware/bnx2x/bnx2x-e1-5.2.13.0.fw.ihex diff --git a/trunk/firmware/bnx2x-e1h-5.2.13.0.fw.ihex b/trunk/firmware/bnx2x/bnx2x-e1h-5.2.13.0.fw.ihex similarity index 100% rename from trunk/firmware/bnx2x-e1h-5.2.13.0.fw.ihex rename to trunk/firmware/bnx2x/bnx2x-e1h-5.2.13.0.fw.ihex