[pve-devel] r5178 - pve-kernel-2.6.32/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-09-20 09:19:53 +0000 (Mon, 20 Sep 2010)
New Revision: 5178

Modified:
   pve-kernel-2.6.32/trunk/Makefile
   pve-kernel-2.6.32/trunk/changelog.firmware
   pve-kernel-2.6.32/trunk/fwlist-2.6.32-3-pve
Log:
revert previous change top firmeware package - increase kernel API


Modified: pve-kernel-2.6.32/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32/trunk/Makefile	2010-09-20 09:07:37 UTC (rev 5177)
+++ pve-kernel-2.6.32/trunk/Makefile	2010-09-20 09:19:53 UTC (rev 5178)
@@ -4,7 +4,7 @@
 KERNEL_DEB_REL=22
 
 PKGREL=19
-KREL=3
+KREL=4
 
 EXTRAVERSION=-${KREL}-pve
 KVNAME=${KERNEL_VER}${EXTRAVERSION}
@@ -250,13 +250,14 @@
 linux-firmware-from-kernel.git/WHENCE:
 	git clone git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware-from-kernel.git linux-firmware-from-kernel.git
 
-${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE linux-firmware-from-kernel.git/WHENCE changelog.firmware fwlist-2.6.18-2-pve fwlist-2.6.24-12-pve fwlist-${KVNAME}
+${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE linux-firmware-from-kernel.git/WHENCE changelog.firmware fwlist-2.6.18-2-pve fwlist-2.6.24-12-pve fwlist-2.6.32-3-pve fwlist-${KVNAME}
 	rm -rf fwdata
 	mkdir -p fwdata/lib/firmware
 	./assemble-firmware.pl fwlist-${KVNAME} fwdata/lib/firmware
 	# include any files from older kernels here
 	./assemble-firmware.pl fwlist-2.6.24-12-pve fwdata/lib/firmware
 	./assemble-firmware.pl fwlist-2.6.18-2-pve fwdata/lib/firmware
+	./assemble-firmware.pl fwlist-2.6.32-3-pve fwdata/lib/firmware
 	install -d fwdata/usr/share/doc/pve-firmware
 	cp linux-firmware.git/WHENCE fwdata/usr/share/doc/pve-firmware/README
 	install -d fwdata/usr/share/doc/pve-firmware/licenses

Modified: pve-kernel-2.6.32/trunk/changelog.firmware
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.firmware	2010-09-20 09:07:37 UTC (rev 5177)
+++ pve-kernel-2.6.32/trunk/changelog.firmware	2010-09-20 09:19:53 UTC (rev 5178)
@@ -1,10 +1,3 @@
-pve-firmware (1.0-9) unstable; urgency=low
-
-  * remove bnx2 firmware files (the driver from broadcom include the
-    firmware)
-
- -- Proxmox Support Team <support at proxmox.com>  Mon, 20 Sep 2010 11:06:51 +0200
-
 pve-firmware (1.0-8) unstable; urgency=low
 
   * include phanfw.bin (netxen_nic.ko)

Modified: pve-kernel-2.6.32/trunk/fwlist-2.6.32-3-pve
===================================================================
--- pve-kernel-2.6.32/trunk/fwlist-2.6.32-3-pve	2010-09-20 09:07:37 UTC (rev 5177)
+++ pve-kernel-2.6.32/trunk/fwlist-2.6.32-3-pve	2010-09-20 09:19:53 UTC (rev 5178)
@@ -236,6 +236,11 @@
 adaptec/starfire_tx.bin kernel/drivers/net/starfire.ko
 adaptec/starfire_rx.bin kernel/drivers/net/starfire.ko
 3com/typhoon.bin kernel/drivers/net/typhoon.ko
+bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw kernel/drivers/net/bnx2.ko
+bnx2/bnx2-rv2p-09-5.0.0.j3.fw kernel/drivers/net/bnx2.ko
+bnx2/bnx2-mips-09-5.0.0.j3.fw kernel/drivers/net/bnx2.ko
+bnx2/bnx2-rv2p-06-5.0.0.j3.fw kernel/drivers/net/bnx2.ko
+bnx2/bnx2-mips-06-5.0.0.j3.fw kernel/drivers/net/bnx2.ko
 lbtf_usb.bin kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
 FW10 kernel/drivers/net/wireless/b43legacy/b43legacy.ko
 sd8688.bin kernel/drivers/net/wireless/libertas/libertas_sdio.ko
@@ -321,6 +326,8 @@
 e100/d101s_ucode.bin kernel/drivers/net/e100.ko
 e100/d101m_ucode.bin kernel/drivers/net/e100.ko
 tehuti/firmware.bin kernel/drivers/net/tehuti.ko
+bnx2x-e1h-5.0.21.0.fw kernel/drivers/net/bnx2x.ko
+bnx2x-e1-5.0.21.0.fw kernel/drivers/net/bnx2x.ko
 kaweth/trigger_code_fix.bin kernel/drivers/net/usb/kaweth.ko
 kaweth/trigger_code.bin kernel/drivers/net/usb/kaweth.ko
 kaweth/new_code_fix.bin kernel/drivers/net/usb/kaweth.ko