[haiku-commits] r35687 - in haiku/trunk: build/jam src/add-ons/kernel/drivers/network/wlan/iprowifi3945 src/add-ons/kernel/drivers/network/wlan/iprowifi4965 src/add-ons/kernel/drivers/network/wlan/marvell88w8363 src/add-ons/kernel/drivers/network/wlan/ralinkwifi
- From: ingo_weinhold@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 1 Mar 2010 00:57:28 +0100 (CET)
Author: bonefish
Date: 2010-03-01 00:57:28 +0100 (Mon, 01 Mar 2010)
New Revision: 35687
Changeset: http://dev.haiku-os.org/changeset/35687/haiku
Modified:
haiku/trunk/build/jam/HaikuImage
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/Jamfile
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/Jamfile
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/Jamfile
Log:
Patch by Matt Madia:
* Added iprowifi4965 driver to the image.
* Add the firmware for the Wifi drivers that need it to the image.
Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage 2010-02-28 23:45:00 UTC (rev 35686)
+++ haiku/trunk/build/jam/HaikuImage 2010-02-28 23:57:28 UTC (rev 35687)
@@ -180,7 +180,10 @@
usb_ecm usb_asix
# WLAN drivers
- $(X86_ONLY)atheroswifi $(X86_ONLY)iprowifi3945
+ $(X86_ONLY)atheroswifi $(X86_ONLY)iprowifi3945 $(X86_ONLY)iprowifi4965
+ $(X86_ONLY)marvell88w8363 $(X86_ONLY)ralinkwifi
+ $(X86_ONLY)ipw2100 $(X86_ONLY)iprowifi2200
+ $(X86_ONLY)marvell88w8335 $(X86_ONLY)broadcom43xx
;
#SYSTEM_ADD_ONS_DRIVERS_POWER = $(X86_ONLY)acpi_button ;
SYSTEM_ADD_ONS_BUS_MANAGERS = $(ATA_ONLY)ata pci $(X86_ONLY)ps2 $(X86_ONLY)isa
@@ -189,6 +192,14 @@
SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs cdda ext2 fat iso9660 nfs attribute_overlay
write_overlay ntfs reiserfs udf ; #googlefs
+# wifi firmware
+for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) {
+ local package = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_PACKAGE) ] ;
+ local archive = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_ARCHIVE) ] ;
+ if $(archive) {
+ AddWifiFirmwareToHaikuImage $(driver) : $(package) : $(archive)
;
+ }
+}
# modules
AddFilesToHaikuImage system add-ons kernel bus_managers
@@ -306,6 +317,8 @@
AddFilesToHaikuImage system bin : which ;
SEARCH on installoptionalpackage = [ FDirName $(HAIKU_TOP) data bin ] ;
AddFilesToHaikuImage system bin :
installoptionalpackage ;
+SEARCH on install-wifi-firmwares.sh = [ FDirName $(HAIKU_TOP) data bin ] ;
+AddFilesToHaikuImage system bin :
install-wifi-firmwares.sh ;
AddSymlinkToHaikuImage system bin : bash : sh ;
AddSymlinkToHaikuImage system bin : trash : untrash ;
Modified:
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/Jamfile
2010-02-28 23:45:00 UTC (rev 35686)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/Jamfile
2010-02-28 23:57:28 UTC (rev 35687)
@@ -1,6 +1,7 @@
SubDir HAIKU_TOP src add-ons kernel drivers network wlan iprowifi3945 ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] :
true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
+ : true ;
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
UsePrivateHeaders net system ;
UsePrivateKernelHeaders ;
@@ -21,3 +22,7 @@
libfreebsd_wlan.a
libfreebsd_network.a
;
+
+HAIKU_WIFI_FIRMWARE_PACKAGE on iprowifi3945 = iwlwifi-3945-ucode-2.14.1.5 ;
+HAIKU_WIFI_FIRMWARE_ARCHIVE on iprowifi3945 = iwlwifi-3945-ucode-2.14.1.5.tgz ;
+
Modified:
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile
2010-02-28 23:45:00 UTC (rev 35686)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile
2010-02-28 23:57:28 UTC (rev 35687)
@@ -1,6 +1,7 @@
SubDir HAIKU_TOP src add-ons kernel drivers network wlan iprowifi4965 ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] :
true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
+ : true ;
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
UsePrivateHeaders net system ;
UsePrivateKernelHeaders ;
@@ -22,3 +23,7 @@
libfreebsd_wlan.a
libfreebsd_network.a
;
+
+HAIKU_WIFI_FIRMWARE_PACKAGE on iprowifi4965 = iwlwifi-4965-ucode-4.44.1.20 ;
+HAIKU_WIFI_FIRMWARE_ARCHIVE on iprowifi4965 = iwlwifi-4965-ucode-4.44.1.20.tgz
;
+
Modified:
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/Jamfile
2010-02-28 23:45:00 UTC (rev 35686)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/Jamfile
2010-02-28 23:57:28 UTC (rev 35687)
@@ -1,6 +1,7 @@
SubDir HAIKU_TOP src add-ons kernel drivers network wlan marvell88w8363 ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] :
true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
+ : true ;
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
UsePrivateHeaders net system ;
UsePrivateKernelHeaders ;
@@ -25,3 +26,7 @@
libfreebsd_wlan.a
libfreebsd_network.a
;
+
+HAIKU_WIFI_FIRMWARE_PACKAGE on marvell88w8363 = "" ;
+HAIKU_WIFI_FIRMWARE_ARCHIVE on marvell88w8363 = 88w8363-fw-3.6.2.2.zip ;
+
Modified: haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/Jamfile
2010-02-28 23:45:00 UTC (rev 35686)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/Jamfile
2010-02-28 23:57:28 UTC (rev 35687)
@@ -1,6 +1,7 @@
SubDir HAIKU_TOP src add-ons kernel drivers network wlan ralinkwifi ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] :
true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
+ : true ;
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
UsePrivateHeaders net system ;
UsePrivateKernelHeaders ;
@@ -23,3 +24,7 @@
libfreebsd_wlan.a
libfreebsd_network.a
;
+
+HAIKU_WIFI_FIRMWARE_PACKAGE on ralinkwifi = RT61_Firmware_V1.2 ;
+HAIKU_WIFI_FIRMWARE_ARCHIVE on ralinkwifi = RT61_Firmware_V1.2.zip ;
+
Other related posts:
