Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Outsource most WiFi firmwares.

Browse Source 
Some are still in-tree and need to be removed, but this takes care
of all recent Intel, Realtek, and also the old Ralink chips.

This cuts down the size of haiku.hpkg by close to 10MB.
This commit is contained in:
Augustin Cavalier 2021-09-30 19:23:22 -04:00
parent e8a8e39533
commit 7fd8b4addd
10 changed files with 27 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/add-ons/kernel/drivers/network/wlan/idualwifi7260/Jamfile
View File

@ -40,15 +40,3 @@ KernelAddon idualwifi7260 :
freebsd_wlan.a
libfreebsd_network.a
;
HAIKU_WIFI_FIRMWARE_PACKAGES on idualwifi7260 =
iwm-3160-ucode-17 iwm-3168-ucode-22
iwm-7260-ucode-17 iwm-7265-ucode-17 iwm-7265D-ucode-22
iwm-8000C-ucode-22 iwm-8265-ucode-22
iwm-9000-ucode-34 iwm-9260-ucode-34 ;
HAIKU_WIFI_FIRMWARE_ARCHIVES on idualwifi7260 =
iwm-3160-ucode-17.tgz iwm-3168-ucode-22.tgz
iwm-7260-ucode-17.tgz iwm-7265-ucode-17.tgz iwm-7265D-ucode-22.tgz
iwm-8000C-ucode-22.tgz iwm-8265-ucode-22.tgz
iwm-9000-ucode-34.tgz iwm-9260-ucode-34.tgz ;
HAIKU_WIFI_FIRMWARE_DO_EXTRACT on idualwifi7260 = true ;

5
src/add-ons/kernel/drivers/network/wlan/iprowifi3945/Jamfile
View File

@ -22,8 +22,3 @@ KernelAddon iprowifi3945 :
freebsd_wlan.a
libfreebsd_network.a
;
HAIKU_WIFI_FIRMWARE_PACKAGE on iprowifi3945 = iwlwifi-3945-ucode-15.32.2.9 ;
HAIKU_WIFI_FIRMWARE_ARCHIVE on iprowifi3945 = iwlwifi-3945-ucode-15.32.2.9.tgz ;
HAIKU_WIFI_FIRMWARE_DO_EXTRACT on iprowifi3945 = true ;

2
src/add-ons/kernel/drivers/network/wlan/iprowifi3945/glue.c
View File

@ -25,7 +25,7 @@ NO_HAIKU_FBSD_MII_DRIVER();
NO_HAIKU_REENABLE_INTERRUPTS();
HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_WLAN);
HAIKU_FIRMWARE_VERSION(2144);
HAIKU_FIRMWARE_NAME_MAP({{"wpifw", "iwlwifi-3945-2.ucode"}});
HAIKU_FIRMWARE_NAME_MAP({{"wpifw", "iwlwifi-3945-15.ucode"}});
int

20
src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile
View File

@ -22,23 +22,3 @@ KernelAddon iprowifi4965 :
freebsd_wlan.a
libfreebsd_network.a
;
HAIKU_WIFI_FIRMWARE_PACKAGES on iprowifi4965 =
iwlwifi-100-ucode-39.31.5.1
iwlwifi-105-ucode-18.168.6.1 iwlwifi-135-ucode-18.168.6.1
iwlwifi-1000-ucode-39.31.5.1
iwlwifi-2000-ucode-18.168.6.1 iwlwifi-2030-ucode-18.168.6.1
iwlwifi-4965-ucode-228.61.2.24
iwlwifi-5000-ucode-8.83.5.1 iwlwifi-5150-ucode-8.24.2.2
iwlwifi-6000-ucode-9.221.4.1 iwlwifi-6000g2a-ucode-18.168.6.1
iwlwifi-6000g2b-ucode-18.168.6.1 iwlwifi-6050-ucode-41.28.5.1 ;
HAIKU_WIFI_FIRMWARE_ARCHIVES on iprowifi4965 =
iwlwifi-100-ucode-39.31.5.1.tgz
iwlwifi-105-ucode-18.168.6.1.tgz iwlwifi-135-ucode-18.168.6.1.tgz
iwlwifi-1000-ucode-39.31.5.1.tgz
iwlwifi-2000-ucode-18.168.6.1.tgz iwlwifi-2030-ucode-18.168.6.1.tgz
iwlwifi-4965-ucode-228.61.2.24.tgz
iwlwifi-5000-ucode-8.83.5.1.tgz iwlwifi-5150-ucode-8.24.2.2.tgz
iwlwifi-6000-ucode-9.221.4.1.tgz iwlwifi-6000g2a-ucode-18.168.6.1.tgz
iwlwifi-6000g2b-ucode-18.168.6.1.tgz iwlwifi-6050-ucode-41.28.5.1.tgz ;
HAIKU_WIFI_FIRMWARE_DO_EXTRACT on iprowifi4965 = true ;

26
src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c
View File

@ -27,19 +27,19 @@ NO_HAIKU_REENABLE_INTERRUPTS();
HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_WLAN);
HAIKU_FIRMWARE_VERSION(44417);
HAIKU_FIRMWARE_NAME_MAP({
{"iwn100fw", "iwlwifi-100-5.ucode"},
{"iwn105fw", "iwlwifi-105-6.ucode"},
{"iwn135fw", "iwlwifi-135-6.ucode"},
{"iwn1000fw", "iwlwifi-1000-5.ucode"},
{"iwn2000fw", "iwlwifi-2000-6.ucode"},
{"iwn2030fw", "iwlwifi-2030-6.ucode"},
{"iwn4965fw", "iwlwifi-4965-2.ucode"},
{"iwn5000fw", "iwlwifi-5000-5.ucode"},
{"iwn5150fw", "iwlwifi-5150-2.ucode"},
{"iwn6000fw", "iwlwifi-6000-4.ucode"},
{"iwn6000g2afw", "iwlwifi-6000g2a-6.ucode"},
{"iwn6000g2bfw", "iwlwifi-6000g2b-6.ucode"},
{"iwn6050fw", "iwlwifi-6050-5.ucode"}
{"iwn100fw", "iwlwifi-100-39.ucode"},
{"iwn105fw", "iwlwifi-105-6-18.ucode"},
{"iwn135fw", "iwlwifi-135-6-18.ucode"},
{"iwn1000fw", "iwlwifi-1000-39.ucode"},
{"iwn2000fw", "iwlwifi-2000-18.ucode"},
{"iwn2030fw", "iwlwifi-2030-18.ucode"},
{"iwn4965fw", "iwlwifi-4965-228.ucode"},
{"iwn5000fw", "iwlwifi-5000-8.ucode"},
{"iwn5150fw", "iwlwifi-5150-8.ucode"},
{"iwn6000fw", "iwlwifi-6000-9.ucode"},
{"iwn6000g2afw", "iwlwifi-6000g2a-18.ucode"},
{"iwn6000g2bfw", "iwlwifi-6000g2b-18.ucode"},
{"iwn6050fw", "iwlwifi-6050-41.ucode"}
});

7
src/add-ons/kernel/drivers/network/wlan/ralinkwifi/Jamfile
View File

@ -25,10 +25,3 @@ KernelAddon ralinkwifi :
freebsd_wlan.a
libfreebsd_network.a
;
HAIKU_WIFI_FIRMWARE_PACKAGES on ralinkwifi = RT61_Firmware_V1.2
RT2860_Firmware_V26 ;
HAIKU_WIFI_FIRMWARE_ARCHIVES on ralinkwifi = RT61_Firmware_V1.2.zip
RT2860_Firmware_V26.zip ;
HAIKU_WIFI_FIRMWARE_DO_EXTRACT on ralinkwifi = true ;

8
src/add-ons/kernel/drivers/network/wlan/ralinkwifi/glue.c
View File

@ -29,10 +29,10 @@ HAIKU_FBSD_WLAN_DRIVER_GLUE(ralinkwifi, ral, pci)
HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE | FBSD_WLAN);
HAIKU_FIRMWARE_VERSION(0);
HAIKU_FIRMWARE_NAME_MAP({
{"rt2561fw", "rt2561.bin"},
{"rt2561sfw", "rt2561s.bin"},
{"rt2661fw", "rt2661.bin"},
{"rt2860fw", "rt2860.bin"}
{"rt2561fw", "rt2561.ucode"},
{"rt2561sfw", "rt2561s.ucode"},
{"rt2661fw", "rt2661.ucode"},
{"rt2860fw", "rt2860.ucode"}
});
NO_HAIKU_FBSD_MII_DRIVER();

6
src/add-ons/kernel/drivers/network/wlan/realtekwifi/Jamfile
View File

@ -81,9 +81,3 @@ KernelAddon realtekwifi :
freebsd_wlan.a
libfreebsd_network.a
;
HAIKU_WIFI_FIRMWARE_PACKAGES on realtekwifi =
rtwn-rtl8188fw rtwn-rtl8192cfw ;
HAIKU_WIFI_FIRMWARE_ARCHIVES on realtekwifi =
rtwn-rtl8188fw.tgz rtwn-rtl8192cfw.tgz ;
HAIKU_WIFI_FIRMWARE_DO_EXTRACT on realtekwifi = true ;

6
src/add-ons/kernel/drivers/network/wlan/realtekwifi/glue.c
View File

@ -25,9 +25,9 @@ HAIKU_FBSD_WLAN_DRIVER_GLUE(realtekwifi, rtwn_pci, pci)
HAIKU_DRIVER_REQUIREMENTS(FBSD_WLAN);
HAIKU_FIRMWARE_VERSION(0);
HAIKU_FIRMWARE_NAME_MAP({
{"rtwn-rtl8188eefw", "rtl8188eefw.ucode"},
{"rtwn-rtl8192cfwE", "rtl8192cfwE.ucode"},
{"rtwn-rtl8192cfwE_B", "rtl8192cfwE_B.ucode"},
{"rtwn-rtl8188eefw", "rtwn-rtl8188eefw.ucode"},
{"rtwn-rtl8192cfwE", "rtwn-rtl8192cfwE.ucode"},
{"rtwn-rtl8192cfwE_B", "rtwn-rtl8192cfwE_B.ucode"},
});
NO_HAIKU_FBSD_MII_DRIVER();

6
src/data/package_infos/generic/haiku
View File

@ -64,6 +64,12 @@ requires {
noto_sans_cjk_jp
#endif
#ifdef HAIKU_REGULAR_BUILD
intel_wifi_firmwares
ralink_wifi_firmwares
realtek_wifi_firmwares
#endif
coreutils
cmd:sh
#ifdef HAIKU_REGULAR_BUILD