gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

package/linux-firmware: prepare new firmware and new revision for iwlwifi

Browse Source 
There is an upcoming new firmware file for a new chipset supported by
iwlwifi, as well as a new revision of the iwlwifi firmware.

The patch only prepares the iwlwifi entries so it is easier to add them.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Yann E. MORIN 2014-09-21 20:38:09 +02:00 committed by Thomas Petazzoni
parent 64982ce4fa
commit 120136ee96
3 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Config.in.legacy
View File

@ -98,6 +98,29 @@ comment "build, or run, in unpredictable ways. "
comment "----------------------------------------------------" comment "----------------------------------------------------"
endif endif
###############################################################################
comment "Legacy options removed in 2014.11"
config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7
bool "BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7 has been renamed"
help
The option BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7 was
renamed to BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_7. You must
select it in:
Target packages -> Hardware handling ->
Firmware -> linux-firmware -> WiFi firmware ->
iwlwifi 3160/726x revision to use (revision 7)
config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8
bool "BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8 has been renamed"
help
The option BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8 was
renamed to BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_8. You must
select it in:
Target packages -> Hardware handling ->
Firmware -> linux-firmware -> WiFi firmware ->
iwlwifi 3160/726x revision to use (revision 8)
############################################################################### ###############################################################################
comment "Legacy options removed in 2014.08" comment "Legacy options removed in 2014.08"

20
package/linux-firmware/Config.in
View File

@ -46,6 +46,7 @@ config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX
config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160 config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160
bool "Intel iwlwifi 3160" bool "Intel iwlwifi 3160"
select BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_NEED_REV
help help
Firmware files for the Intel Wifi 3160 devices supported by Firmware files for the Intel Wifi 3160 devices supported by
the iwlwifi kernel driver. the iwlwifi kernel driver.
@ -58,35 +59,38 @@ config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000
config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260 config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260
bool "Intel iwlwifi 7260" bool "Intel iwlwifi 7260"
select BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_NEED_REV
help help
Firmware files for the Intel Wifi 7260 devices supported by Firmware files for the Intel Wifi 7260 devices supported by
the iwlwifi kernel driver. the iwlwifi kernel driver.
if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160 || \ config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_NEED_REV
BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260 bool
if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_NEED_REV
choice choice
bool "iwlwifi 3160/7260 revision to use" bool "iwlwifi 3160/726x revision to use"
help help
Use revision 7 for kernel 3.10 to 3.12. Use revision 7 for kernel 3.10 to 3.12.
Use revision 8 for kernel 3.13 onward. Use revision 8 for kernel 3.13 onward.
config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7 config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_7
prompt "revision 7" prompt "revision 7"
help help
Use revision 7 for kernel 3.10 to 3.12. Use revision 7 for kernel 3.10 to 3.12.
config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8 config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_8
prompt "revision 8" prompt "revision 8"
help help
Use revision 8 for kernel 3.13 onward. Use revision 8 for kernel 3.13 onward.
endchoice endchoice
config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_REV config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV
int int
default 7 if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7 default 7 if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_7
default 8 if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8 default 8 if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_8
endif # iwlwifi 3160/7260 endif # iwlwifi 3160/7260

4
package/linux-firmware/linux-firmware.mk
View File

@ -159,7 +159,7 @@ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity
endif endif
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160),y) ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160),y)
LINUX_FIRMWARE_FILES += iwlwifi-3160-$(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_REV).ucode LINUX_FIRMWARE_FILES += iwlwifi-3160-$(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV).ucode
LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
endif endif
@ -173,7 +173,7 @@ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
endif endif
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260),y) ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260),y)
LINUX_FIRMWARE_FILES += iwlwifi-7260-$(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_REV).ucode LINUX_FIRMWARE_FILES += iwlwifi-7260-$(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV).ucode
LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
endif endif