Changeset 27252


Ignore:
Timestamp:
2011-06-21T22:50:10+02:00 (7 years ago)
Author:
hauke
Message:

mac80211: use firmware from linux-firmware git

Use the firmware from linux-firmware git where possible.

Update some firmware files in that process and check for missing firmware files for some modules.

  • update Ralink firmwares
  • update ath9k_htc firmware
  • add firmware for mwl8k
  • add more firmware files for libertas-sd and libertas-usb
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/Makefile

    r27251 r27252  
    105105endef 
    106106 
     107PKG_LINUX_FIRMWARE_NAME:=linux-firmware 
     108PKG_LINUX_FIRMWARE_VERSION:=97649b1e5449029c845ebf7500e780a8867c3e89 
     109PKG_LINUX_FIRMWARE_SOURCE:=$(PKG_LINUX_FIRMWARE_NAME)-$(PKG_LINUX_FIRMWARE_VERSION).tar.bz2 
     110PKG_LINUX_FIRMWARE_PROTO:=git 
     111PKG_LINUX_FIRMWARE_SOURCE_URL:=git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git 
     112PKG_LINUX_FIRMWARE_SUBDIR:=$(PKG_LINUX_FIRMWARE_NAME)-$(PKG_LINUX_FIRMWARE_VERSION) 
     113 
     114define Download/linux-firmware 
     115  FILE:=$(PKG_LINUX_FIRMWARE_SOURCE) 
     116  URL:=$(PKG_LINUX_FIRMWARE_SOURCE_URL) 
     117  MD5SUM:=$(PKG_LINUX_FIRMWARE_MD5SUM) 
     118  PROTO:=$(PKG_LINUX_FIRMWARE_PROTO) 
     119  VERSION:=$(PKG_LINUX_FIRMWARE_VERSION) 
     120  SUBDIR:=$(PKG_LINUX_FIRMWARE_SUBDIR) 
     121endef 
     122$(eval $(call Download,linux-firmware)) 
     123 
    107124# Prism54 drivers 
    108125P54PCIFW:=2.13.12.0.arm 
     
    179196  AUTOLOAD:=$(call AutoLoad,31,p54spi) 
    180197endef 
    181  
    182 # Ralink rt2x00 drivers 
    183 RT61FW:=RT61_Firmware_V1.2.zip 
    184 RT71FW:=RT71W_Firmware_V1.8.zip 
    185 RT2860FW:=RT2860_Firmware_V11.zip 
    186 RT2870FW:=RT2870_Firmware_V8.zip 
    187  
    188 define Download/rt61 
    189   FILE:=$(RT61FW) 
    190   URL:=http://www.ralinktech.com.tw/data/ 
    191   MD5SUM:=d4c690c93b470bc9a681297c2adc6281 
    192 endef 
    193 $(eval $(call Download,rt61)) 
    194  
    195 define Download/rt71w 
    196   FILE:=$(RT71FW) 
    197   URL:=http://www.ralinktech.com.tw/data/ 
    198   MD5SUM:=1e7a5dc574e0268574fcda3fd5cf52f7 
    199 endef 
    200 $(eval $(call Download,rt71w)) 
    201  
    202 define Download/rt2860 
    203   FILE:=$(RT2860FW) 
    204   URL:=http://www.ralinktech.com.tw/data/drivers 
    205   MD5SUM:=440a81756a52c53528f16faa41c40124 
    206 endef 
    207 $(eval $(call Download,rt2860)) 
    208  
    209 define Download/rt2870 
    210   FILE:=$(RT2870FW) 
    211   URL:=http://www.ralinktech.com.tw/data/drivers 
    212   MD5SUM:=a7aae1d8cfd68e4d86a73000df0b6584 
    213 endef 
    214 $(eval $(call Download,rt2870)) 
    215198 
    216199NEED_RT2X00_LIB_CRYPTO:=y 
     
    458441endef 
    459442 
    460 AR7010FW:=ar7010.fw 
    461 AR7010_1_1_FW:=ar7010_1_1.fw 
    462 AR9271FW:=ar9271.fw 
    463  
    464 define Download/ar9271 
    465   FILE:=$(AR9271FW) 
    466   URL:=http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=blob_plain;f=ar9271.fw;h=d0ee74a1c8dccb7cc21f5be90f1d4048fa9dbf9e;hb=HEAD;? 
    467   MD5SUM:=2e6f5045ec4c5a42bb93ced242bad0ba 
    468 endef 
    469 $(eval $(call Download,ar9271)) 
    470  
    471 define Download/ar7010 
    472   FILE:=$(AR7010FW) 
    473   URL:=http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=blob_plain;f=ar7010.fw;h=840005d0f0c81838c581b8cd5d76c8dd3843731c;hb=HEAD;? 
    474   MD5SUM:=59823b82b1f72bed9b044e8cc78ad65c 
    475 endef 
    476 $(eval $(call Download,ar7010)) 
    477  
    478 define Download/ar7010_1_1 
    479   FILE:=$(AR7010_1_1_FW) 
    480   URL:=http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=blob_plain;f=ar7010_1_1.fw;h=684d4cd1a8cac4f58305589e31f9d856d03a8ef0;hb=HEAD;? 
    481   MD5SUM:=544fcbe5a93cfa53c7e6d3ded2b05347 
    482 endef 
    483 $(eval $(call Download,ar7010_1_1)) 
    484  
    485443define KernelPackage/ath9k-htc 
    486444  $(call KernelPackage/mac80211/Default) 
     
    511469endef 
    512470 
    513  
    514 USB8388FW_NAME:=usb8388 
    515 USB8388FW_VERSION:=5.110.22.p23 
    516  
    517 define Download/usb8388 
    518   URL:=http://dev.laptop.org/pub/firmware/libertas/ 
    519   FILE:=$(USB8388FW_NAME)-$(USB8388FW_VERSION).bin 
    520   MD5SUM=5e38f55719df3d0c58dd3bd02575a09c 
    521 endef 
    522 $(eval $(call Download,usb8388)) 
    523  
    524 SD8686FW_NAME:=sd8686 
    525 SD8686FW_VERSION:=9.70.7.p0 
    526  
    527 define Download/sd8686 
    528   URL:=http://dev.laptop.org/pub/firmware/libertas/ 
    529   FILE:=$(SD8686FW_NAME)-$(SD8686FW_VERSION).bin 
    530   MD5SUM=b4f8be61e19780a14836f146c538c5dd 
    531 endef 
    532 $(eval $(call Download,sd8686)) 
    533  
    534 SD8686HELPER_NAME:=sd8686_helper 
    535  
    536 define Download/sd8686_helper 
    537   URL:=http://dev.laptop.org/pub/firmware/libertas/ 
    538   FILE:=$(SD8686HELPER_NAME).bin 
    539   MD5SUM=2a4d8f4df198ce949c350df5674f4ac6 
    540 endef 
    541 $(eval $(call Download,sd8686_helper)) 
    542  
    543471define KernelPackage/libertas-usb 
    544472  $(call KernelPackage/mac80211/Default) 
     
    677605 Kernel modules for Hermes based PCMCIA adaptors 
    678606endef 
    679  
    680 IWL3945_NAME:=iwlwifi-3945-ucode 
    681 IWL3945_VERSION:=15.32.2.9 
    682 IWL3945_MD5SUM:=d99a75ab1305d1532a09471b2f9a547a 
    683 IWL4965_NAME:=iwlwifi-4965-ucode 
    684 IWL4965_VERSION:=228.61.2.24 
    685 IWL4965_MD5SUM:=2531028773cfc22aca5539c734f2a241 
    686 IWL5000_NAME:=iwlwifi-5000-ucode 
    687 IWL5000_VERSION:=8.83.5.1 
    688 IWL5000_MD5SUM:=da82465019b3c7d1ee5156474ab4931d 
    689 IWL5150_NAME:=iwlwifi-5150-ucode 
    690 IWL5150_VERSION:=8.24.2.2 
    691 IWL5150_MD5SUM:=f9cee16e455e8046b1bf62c93f882d5d 
    692 IWL1000_NAME:=iwlwifi-1000-ucode 
    693 IWL1000_VERSION:=39.31.5.1 
    694 IWL1000_MD5SUM:=8098503cb2abcdeffffb3ddd2d8d6f60 
    695 IWL6000_NAME:=iwlwifi-6000-ucode 
    696 IWL6000_VERSION:=9.221.4.1 
    697 IWL6000_MD5SUM:=c132a4c1946a9dbc0c36b41696e5c793 
    698 IWL6050_NAME:=iwlwifi-6050-ucode 
    699 IWL6050_VERSION:=41.28.5.1 
    700 IWL6050_MD5SUM:=cb484a65b9139666d4ddebf60598a87b 
    701 IWL6005_NAME:=iwlwifi-6000g2a-ucode 
    702 IWL6005_VERSION:=17.168.5.2 
    703 IWL6005_MD5SUM:=0b9579f4b8faf51c955295607a8e79a8 
    704 IWL6030_NAME:=iwlwifi-6000g2b-ucode 
    705 IWL6030_VERSION:=17.168.5.2 
    706 IWL6030_MD5SUM:=d87411296b4eeda0c91322228e9f8437 
    707 IWL100_NAME:=iwlwifi-100-ucode 
    708 IWL100_VERSION:=39.31.5.1 
    709 IWL100_MD5SUM:=b686f0ab94888ccca3ce74d2d6ee1133 
    710  
    711  
    712 define Download/iwl-fw/Default 
    713   URL:=http://intellinuxwireless.org/iwlwifi/downloads/ 
    714 endef 
    715  
    716 define Download/iwl3945-fw 
    717   $(call Download/iwl-fw/Default) 
    718   FILE:=$(IWL3945_NAME)-$(IWL3945_VERSION).tgz 
    719   MD5SUM:=$(IWL3945_MD5SUM) 
    720 endef 
    721 $(eval $(call Download,iwl3945-fw)) 
    722  
    723 define Download/iwl4965-fw 
    724   $(call Download/iwl-fw/Default) 
    725   FILE:=$(IWL4965_NAME)-$(IWL4965_VERSION).tgz 
    726   MD5SUM:=$(IWL4965_MD5SUM) 
    727 endef 
    728 $(eval $(call Download,iwl4965-fw)) 
    729  
    730 define Download/iwl5000-fw 
    731   $(call Download/iwl-fw/Default) 
    732   FILE:=$(IWL5000_NAME)-$(IWL5000_VERSION).tgz 
    733   MD5SUM:=$(IWL5000_MD5SUM) 
    734 endef 
    735 $(eval $(call Download,iwl5000-fw)) 
    736  
    737 define Download/iwl5150-fw 
    738   $(call Download/iwl-fw/Default) 
    739   FILE:=$(IWL5150_NAME)-$(IWL5150_VERSION).tgz 
    740   MD5SUM:=$(IWL5150_MD5SUM) 
    741 endef 
    742 $(eval $(call Download,iwl5150-fw)) 
    743  
    744 define Download/iwl1000-fw 
    745   $(call Download/iwl-fw/Default) 
    746   FILE:=$(IWL1000_NAME)-$(IWL1000_VERSION).tgz 
    747   MD5SUM:=$(IWL1000_MD5SUM) 
    748 endef 
    749 $(eval $(call Download,iwl1000-fw)) 
    750  
    751 define Download/iwl6000-fw 
    752   $(call Download/iwl-fw/Default) 
    753   FILE:=$(IWL6000_NAME)-$(IWL6000_VERSION).tgz 
    754   MD5SUM:=$(IWL6000_MD5SUM) 
    755 endef 
    756 $(eval $(call Download,iwl6000-fw)) 
    757  
    758 define Download/iwl6050-fw 
    759   $(call Download/iwl-fw/Default) 
    760   FILE:=$(IWL6050_NAME)-$(IWL6050_VERSION).tgz 
    761   MD5SUM:=$(IWL6050_MD5SUM) 
    762 endef 
    763 $(eval $(call Download,iwl6050-fw)) 
    764  
    765 define Download/iwl6005-fw 
    766   $(call Download/iwl-fw/Default) 
    767   FILE:=$(IWL6005_NAME)-$(IWL6005_VERSION).tgz 
    768   MD5SUM:=$(IWL6005_MD5SUM) 
    769 endef 
    770 $(eval $(call Download,iwl6005-fw)) 
    771  
    772 define Download/iwl6030-fw 
    773   $(call Download/iwl-fw/Default) 
    774   FILE:=$(IWL6030_NAME)-$(IWL6030_VERSION).tgz 
    775   MD5SUM:=$(IWL6030_MD5SUM) 
    776 endef 
    777 $(eval $(call Download,iwl6030-fw)) 
    778  
    779 define Download/iwl100-fw 
    780   $(call Download/iwl-fw/Default) 
    781   FILE:=$(IWL100_NAME)-$(IWL100_VERSION).tgz 
    782   MD5SUM:=$(IWL100_MD5SUM) 
    783 endef 
    784 $(eval $(call Download,iwl100-fw)) 
    785607 
    786608define KernelPackage/iwlagn 
     
    13391161        $(PKG_UNPACK) 
    13401162        $(Build/Patch) 
    1341         unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(RT61FW) 
    1342         unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(RT71FW) 
    1343         -unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(RT2860FW) 
    1344         -unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(RT2870FW) 
    13451163        $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IPW2100_NAME)-$(IPW2100_VERSION).tgz 
    13461164        $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IPW2200_NAME)-$(IPW2200_VERSION).tgz 
    1347         $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL3945_NAME)-$(IWL3945_VERSION).tgz 
    1348         $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL4965_NAME)-$(IWL4965_VERSION).tgz 
    1349         $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL5000_NAME)-$(IWL5000_VERSION).tgz 
    1350         $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL5150_NAME)-$(IWL5150_VERSION).tgz 
    1351         $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL1000_NAME)-$(IWL1000_VERSION).tgz 
    1352         $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL6000_NAME)-$(IWL6000_VERSION).tgz 
    1353         $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL6050_NAME)-$(IWL6050_VERSION).tgz 
    1354         $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL6005_NAME)-$(IWL6005_VERSION).tgz 
    1355         $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL6030_NAME)-$(IWL6030_VERSION).tgz 
    1356         $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL100_NAME)-$(IWL100_VERSION).tgz 
    13571165        $(TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(ZD1211FW_NAME)-$(ZD1211FW_VERSION).tar.bz2 
     1166        $(TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(PKG_LINUX_FIRMWARE_SOURCE) 
    13581167        rm -rf $(PKG_BUILD_DIR)/include/linux/ssb 
    13591168        rm -f $(PKG_BUILD_DIR)/include/net/ieee80211.h 
     
    13831192define KernelPackage/libertas-usb/install 
    13841193        $(INSTALL_DIR) $(1)/lib/firmware 
    1385         $(INSTALL_DATA) $(DL_DIR)/$(USB8388FW_NAME)-$(USB8388FW_VERSION).bin $(1)/lib/firmware/$(USB8388FW_NAME).bin 
     1194        $(INSTALL_DATA) \ 
     1195                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/usb8388_v9.bin \ 
     1196                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/usb8388_v5.bin \ 
     1197                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/usb8682.bin \ 
     1198                $(1)/lib/firmware/ 
    13861199endef 
    13871200 
    13881201define KernelPackage/libertas-sd/install 
    1389         echo "Libertas install: $(CONFIG_PACKAGE_kmod-libertas-sd)" 
    13901202        $(INSTALL_DIR) $(1)/lib/firmware 
    1391         $(INSTALL_DATA) $(DL_DIR)/$(SD8686FW_NAME)-$(SD8686FW_VERSION).bin $(1)/lib/firmware/$(SD8686FW_NAME).bin 
    1392         $(INSTALL_DATA) $(DL_DIR)/$(SD8686HELPER_NAME).bin $(1)/lib/firmware/$(SD8686HELPER_NAME).bin 
     1203        $(INSTALL_DATA) \ 
     1204                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8385_helper.bin \ 
     1205                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8385.bin \ 
     1206                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8686_v9_helper.bin \ 
     1207                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8686_v9.bin \ 
     1208                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8686_v8_helper.bin \ 
     1209                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8686_v8.bin \ 
     1210                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8688_helper.bin \ 
     1211                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8688.bin \ 
     1212                $(1)/lib/firmware/ 
    13931213endef 
    13941214 
     
    14151235define KernelPackage/rt61-pci/install 
    14161236        $(INSTALL_DIR) $(1)/lib/firmware 
    1417         $(INSTALL_DATA) $(PKG_BUILD_DIR)/rt2?61*.bin $(1)/lib/firmware/ 
     1237        $(INSTALL_DATA) \ 
     1238                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rt2561.bin \ 
     1239                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rt2561s.bin \ 
     1240                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rt2661.bin \ 
     1241                $(1)/lib/firmware/ 
    14181242endef 
    14191243 
    14201244define KernelPackage/rt73-usb/install 
    14211245        $(INSTALL_DIR) $(1)/lib/firmware 
    1422         $(INSTALL_DATA) $(PKG_BUILD_DIR)/rt73.bin $(1)/lib/firmware/ 
     1246        $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rt73.bin $(1)/lib/firmware/ 
    14231247endef 
    14241248 
    14251249define KernelPackage/rt2800-pci/install 
    14261250        $(INSTALL_DIR) $(1)/lib/firmware 
    1427         $(INSTALL_DATA) $(PKG_BUILD_DIR)/rt2860.bin $(1)/lib/firmware/ 
     1251        $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rt2860.bin $(1)/lib/firmware/ 
    14281252endef 
    14291253 
    14301254define KernelPackage/rt2800-usb/install 
    14311255        $(INSTALL_DIR) $(1)/lib/firmware 
    1432         $(INSTALL_DATA) $(PKG_BUILD_DIR)/rt2870.bin $(1)/lib/firmware/ 
     1256        $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rt2870.bin $(1)/lib/firmware/ 
    14331257endef 
    14341258 
     
    14411265        $(INSTALL_DIR) $(1)/lib/firmware 
    14421266        $(INSTALL_DATA) \ 
    1443                 $(DL_DIR)/$(AR9271FW) \ 
    1444                 $(DL_DIR)/$(AR7010FW) \ 
    1445                 $(DL_DIR)/$(AR7010_1_1_FW) \ 
     1267                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ar9271.fw \ 
     1268                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ar7010.fw \ 
     1269                $(1)/lib/firmware/ 
     1270endef 
     1271 
     1272define KernelPackage/mwl8k/install 
     1273        $(INSTALL_DIR) $(1)/lib/firmware 
     1274        $(INSTALL_DATA) \ 
     1275                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/fmimage_8366_ap-2.fw \ 
     1276                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/fmimage_8366.fw \ 
     1277                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/helper_8366.fw \ 
     1278                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/fmimage_8687.fw \ 
     1279                $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/helper_8687.fw \ 
    14461280                $(1)/lib/firmware/ 
    14471281endef 
     
    14601294        $(INSTALL_DIR) $(1)/lib/firmware 
    14611295ifneq ($(CONFIG_IWL5000_FW),) 
    1462         $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL5000_NAME)-$(IWL5000_VERSION)/iwlwifi-5000-*.ucode $(1)/lib/firmware 
     1296        $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-5000-5.ucode $(1)/lib/firmware 
    14631297endif 
    14641298ifneq ($(CONFIG_IWL5150_FW),) 
    1465         $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL5150_NAME)-$(IWL5150_VERSION)/iwlwifi-5150-*.ucode $(1)/lib/firmware 
     1299        $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-5150-2.ucode $(1)/lib/firmware 
    14661300endif 
    14671301ifneq ($(CONFIG_IWL1000_FW),) 
    1468         $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL1000_NAME)-$(IWL1000_VERSION)/iwlwifi-1000-*.ucode $(1)/lib/firmware 
     1302        $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-1000-5.ucode $(1)/lib/firmware 
    14691303endif 
    14701304ifneq ($(CONFIG_IWL6000_FW),) 
    1471         $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL6000_NAME)-$(IWL6000_VERSION)/iwlwifi-6000-*.ucode $(1)/lib/firmware 
     1305        $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-6000-4.ucode $(1)/lib/firmware 
    14721306endif 
    14731307ifneq ($(CONFIG_IWL6050_FW),) 
    1474         $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL6050_NAME)-$(IWL6050_VERSION)/iwlwifi-6050-*.ucode $(1)/lib/firmware 
     1308        $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-6050-5.ucode $(1)/lib/firmware 
    14751309endif 
    14761310ifneq ($(CONFIG_IWL6005_FW),) 
    1477         $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL6005_NAME)-$(IWL6005_VERSION)/iwlwifi-6000g2a-*.ucode $(1)/lib/firmware 
     1311        $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-6000g2a-5.ucode $(1)/lib/firmware 
    14781312endif 
    14791313ifneq ($(CONFIG_IWL6030_FW),) 
    1480         $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL6030_NAME)-$(IWL6030_VERSION)/iwlwifi-6000g2b-*.ucode $(1)/lib/firmware 
     1314        $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-6000g2b-5.ucode $(1)/lib/firmware 
    14811315endif 
    14821316ifneq ($(CONFIG_IWL100_FW),) 
    1483         $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL100_NAME)-$(IWL100_VERSION)/iwlwifi-100-*.ucode $(1)/lib/firmware 
     1317        $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-100-5.ucode $(1)/lib/firmware 
    14841318endif 
    14851319endef 
     
    14871321define KernelPackage/iwl3945/install 
    14881322        $(INSTALL_DIR) $(1)/lib/firmware 
    1489         $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL3945_NAME)-$(IWL3945_VERSION)/iwlwifi-3945-*.ucode $(1)/lib/firmware 
     1323        $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-3945-2.ucode $(1)/lib/firmware 
    14901324endef 
    14911325 
    14921326define KernelPackage/iwl4965/install 
    14931327        $(INSTALL_DIR) $(1)/lib/firmware 
    1494         $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL4965_NAME)-$(IWL4965_VERSION)/iwlwifi-4965-*.ucode $(1)/lib/firmware 
     1328        $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-4965-2.ucode $(1)/lib/firmware 
    14951329endef 
    14961330 
Note: See TracChangeset for help on using the changeset viewer.