i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch by Matt Madia:

Browse Source 
* Added iprowifi4965 driver to the image.
* Add the firmware for the Wifi drivers that need it to the image.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35687 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2010-02-28 23:57:28 +00:00
parent e82b595ac6
commit b7fd1cf61c
5 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+14 -1
View File
@@ -180,7 +180,10 @@ SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x
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_BUS_MANAGERS = $(ATA_ONLY)ata pci $(X86_ONLY)ps2 $(X86_ONLY)isa
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 @@ SEARCH on which = [ FDirName $(HAIKU_TOP) data bin ] ;
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 ;
src/add-ons/kernel/drivers/network/wlan/iprowifi3945/Jamfile
+6 -1
View File
@@ -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 @@ KernelAddon iprowifi3945 :
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 ;
src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile
+6 -1
View File
@@ -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 @@ KernelAddon iprowifi4965 :
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 ;
src/add-ons/kernel/drivers/network/wlan/marvell88w8363/Jamfile
+6 -1
View File
@@ -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 @@ KernelAddon marvell88w8363 :
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 ;
src/add-ons/kernel/drivers/network/wlan/ralinkwifi/Jamfile
+6 -1
View File
@@ -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 @@ KernelAddon ralinkwifi :
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 ;