Enable bnx2x, using firmware-split patches from net-next and mirroring
the per-subarch config settings used for bnx2 svn path=/dists/trunk/linux-2.6/; revision=13688
This commit is contained in:
parent
38089f9c30
commit
d7faa0e6d3
|
@ -50,6 +50,10 @@ linux-2.6 (2.6.30~rc7-1~experimental.1) UNRELEASED; urgency=low
|
||||||
* [i386] Disable PentiumPro errata workaround.
|
* [i386] Disable PentiumPro errata workaround.
|
||||||
* [i386] Enable support for big SMP systems.
|
* [i386] Enable support for big SMP systems.
|
||||||
|
|
||||||
|
[ dann frazier ]
|
||||||
|
* Enable bnx2x, using firmware-split patches from net-next and mirroring
|
||||||
|
the per-subarch config settings used for bnx2
|
||||||
|
|
||||||
-- maximilian attems <maks@debian.org> Mon, 30 Mar 2009 14:40:26 +0200
|
-- maximilian attems <maks@debian.org> Mon, 30 Mar 2009 14:40:26 +0200
|
||||||
|
|
||||||
linux-2.6 (2.6.29-5) unstable; urgency=low
|
linux-2.6 (2.6.29-5) unstable; urgency=low
|
||||||
|
|
|
@ -646,6 +646,7 @@ CONFIG_NE2K_PCI=m
|
||||||
# CONFIG_VIA_VELOCITY is not set
|
# CONFIG_VIA_VELOCITY is not set
|
||||||
# CONFIG_TIGON3 is not set
|
# CONFIG_TIGON3 is not set
|
||||||
# CONFIG_BNX2 is not set
|
# CONFIG_BNX2 is not set
|
||||||
|
# CONFIG_BNX2X is not set
|
||||||
# CONFIG_FDDI is not set
|
# CONFIG_FDDI is not set
|
||||||
# CONFIG_HIPPI is not set
|
# CONFIG_HIPPI is not set
|
||||||
# CONFIG_PLIP is not set
|
# CONFIG_PLIP is not set
|
||||||
|
|
|
@ -328,6 +328,7 @@ CONFIG_NETDEV_1000=y
|
||||||
# CONFIG_VIA_VELOCITY is not set
|
# CONFIG_VIA_VELOCITY is not set
|
||||||
# CONFIG_TIGON3 is not set
|
# CONFIG_TIGON3 is not set
|
||||||
# CONFIG_BNX2 is not set
|
# CONFIG_BNX2 is not set
|
||||||
|
# CONFIG_BNX2X is not set
|
||||||
CONFIG_MV643XX_ETH=m
|
CONFIG_MV643XX_ETH=m
|
||||||
# CONFIG_QLA3XXX is not set
|
# CONFIG_QLA3XXX is not set
|
||||||
# CONFIG_ATL1 is not set
|
# CONFIG_ATL1 is not set
|
||||||
|
|
|
@ -275,6 +275,7 @@ CONFIG_NETDEV_1000=y
|
||||||
# CONFIG_IP1000 is not set
|
# CONFIG_IP1000 is not set
|
||||||
# CONFIG_TIGON3 is not set
|
# CONFIG_TIGON3 is not set
|
||||||
# CONFIG_BNX2 is not set
|
# CONFIG_BNX2 is not set
|
||||||
|
# CONFIG_BNX2X is not set
|
||||||
# CONFIG_NETDEV_10000 is not set
|
# CONFIG_NETDEV_10000 is not set
|
||||||
# CONFIG_FDDI is not set
|
# CONFIG_FDDI is not set
|
||||||
# CONFIG_HIPPI is not set
|
# CONFIG_HIPPI is not set
|
||||||
|
|
|
@ -345,6 +345,7 @@ CONFIG_NETDEV_1000=y
|
||||||
# CONFIG_VIA_VELOCITY is not set
|
# CONFIG_VIA_VELOCITY is not set
|
||||||
# CONFIG_TIGON3 is not set
|
# CONFIG_TIGON3 is not set
|
||||||
# CONFIG_BNX2 is not set
|
# CONFIG_BNX2 is not set
|
||||||
|
# CONFIG_BNX2X is not set
|
||||||
CONFIG_MV643XX_ETH=m
|
CONFIG_MV643XX_ETH=m
|
||||||
# CONFIG_QLA3XXX is not set
|
# CONFIG_QLA3XXX is not set
|
||||||
# CONFIG_ATL1 is not set
|
# CONFIG_ATL1 is not set
|
||||||
|
|
|
@ -1269,6 +1269,7 @@ CONFIG_SKY2=m
|
||||||
CONFIG_VIA_VELOCITY=m
|
CONFIG_VIA_VELOCITY=m
|
||||||
CONFIG_TIGON3=m
|
CONFIG_TIGON3=m
|
||||||
CONFIG_BNX2=m
|
CONFIG_BNX2=m
|
||||||
|
CONFIG_BNX2X=m
|
||||||
CONFIG_QLA3XXX=m
|
CONFIG_QLA3XXX=m
|
||||||
CONFIG_ATL1=m
|
CONFIG_ATL1=m
|
||||||
CONFIG_ATL1E=m
|
CONFIG_ATL1E=m
|
||||||
|
|
|
@ -405,6 +405,7 @@ CONFIG_E100=m
|
||||||
# CONFIG_SKY2 is not set
|
# CONFIG_SKY2 is not set
|
||||||
# CONFIG_TIGON3 is not set
|
# CONFIG_TIGON3 is not set
|
||||||
# CONFIG_BNX2 is not set
|
# CONFIG_BNX2 is not set
|
||||||
|
# CONFIG_BNX2X is not set
|
||||||
# CONFIG_CHELSIO_T1 is not set
|
# CONFIG_CHELSIO_T1 is not set
|
||||||
# CONFIG_IXGB is not set
|
# CONFIG_IXGB is not set
|
||||||
# CONFIG_S2IO is not set
|
# CONFIG_S2IO is not set
|
||||||
|
|
|
@ -510,6 +510,7 @@ CONFIG_VIA_RHINE=m
|
||||||
# CONFIG_VIA_VELOCITY is not set
|
# CONFIG_VIA_VELOCITY is not set
|
||||||
# CONFIG_TIGON3 is not set
|
# CONFIG_TIGON3 is not set
|
||||||
# CONFIG_BNX2 is not set
|
# CONFIG_BNX2 is not set
|
||||||
|
# CONFIG_BNX2X is not set
|
||||||
# CONFIG_CHELSIO_T1 is not set
|
# CONFIG_CHELSIO_T1 is not set
|
||||||
# CONFIG_IXGB is not set
|
# CONFIG_IXGB is not set
|
||||||
# CONFIG_S2IO is not set
|
# CONFIG_S2IO is not set
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,30 @@
|
||||||
|
From cf0ee91376694cdf023b75c41ed1b1c8c4518479 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Vladislav Zolotarov <vladz@broadcom.com>
|
||||||
|
Date: Mon, 27 Apr 2009 03:28:25 -0700
|
||||||
|
Subject: [PATCH 2/2] bnx2x: driver version 1.48.105-1
|
||||||
|
|
||||||
|
Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
|
||||||
|
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
|
||||||
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
|
---
|
||||||
|
drivers/net/bnx2x_main.c | 4 ++--
|
||||||
|
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
|
||||||
|
index cdc80e0..a669bb7 100644
|
||||||
|
--- a/drivers/net/bnx2x_main.c
|
||||||
|
+++ b/drivers/net/bnx2x_main.c
|
||||||
|
@@ -56,8 +56,8 @@
|
||||||
|
#include "bnx2x_init_ops.h"
|
||||||
|
#include "bnx2x_dump.h"
|
||||||
|
|
||||||
|
-#define DRV_MODULE_VERSION "1.48.105"
|
||||||
|
-#define DRV_MODULE_RELDATE "2009/03/02"
|
||||||
|
+#define DRV_MODULE_VERSION "1.48.105-1"
|
||||||
|
+#define DRV_MODULE_RELDATE "2009/04/22"
|
||||||
|
#define BNX2X_BC_VER 0x040200
|
||||||
|
|
||||||
|
#include <linux/firmware.h>
|
||||||
|
--
|
||||||
|
1.6.2.3
|
||||||
|
|
|
@ -32,3 +32,7 @@
|
||||||
+ features/arm/kirkwood-cpu-idle.patch
|
+ features/arm/kirkwood-cpu-idle.patch
|
||||||
+ bugfix/sparc/arch-zimage-target.patch
|
+ bugfix/sparc/arch-zimage-target.patch
|
||||||
+ bugfix/all/mvsdio-ignore-high-speed.patch
|
+ bugfix/all/mvsdio-ignore-high-speed.patch
|
||||||
|
+ features/all/bnx2x-Separated-FW-from-the-source.patch
|
||||||
|
+ features/all/bnx2x-driver-version-1.48.105-1.patch
|
||||||
|
- debian/dfsg/drivers-net-bnx2x-disable.patch
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue