Commit e57e8cc8 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Peter Korsgaard
Browse files

package/linux-firmware: different iwlwifi3160/7260 firmwares for different kernels 



The firmwares to use for iwlwifi 3160/7260 are different, depending on which
version of the Linux kernel is being used:
  - rev. 7 is for linux 3.10 through 3.12 (both included)
  - rev. 8 is for linux 3.13 onward

Add a config choice to select the appropriate version.

(See cset a0a6eeb in the linux-firmware repository for the details.)

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent cdf2b6f5

package/linux-firmware/Config.in

+28 −0
Original line number Diff line number Diff line
@@ -48,6 +48,34 @@ config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260 
	  Firmware files for the Intel Wifi 7260 devices supported by

	  the iwlwifi kernel driver.



if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160 || \

   BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260



choice

	bool "iwlwifi 3160/7260 revision to use"

	help

	  Use revision 7 for kernel 3.10 to 3.12.

	  Use revision 8 for kernel 3.13 onward.



config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7

	prompt "revision 7"

	help

	  Use revision 7 for kernel 3.10 to 3.12.



config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8

	prompt "revision 8"

	help

	  Use revision 8 for kernel 3.13 onward.



endchoice



config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_REV

	int

	default 7 if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7

	default 8 if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8



endif # iwlwifi 3160/7260



config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8

	bool "Libertas SD 8686 v8"

	help

package/linux-firmware/linux-firmware.mk

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity 
endif



ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160),y)

LINUX_FIRMWARE_FILES += iwlwifi-3160-7.ucode

LINUX_FIRMWARE_FILES += iwlwifi-3160-$(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_REV).ucode

LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware

endif
@@ -141,7 +141,7 @@ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware 
endif



ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260),y)

LINUX_FIRMWARE_FILES += iwlwifi-7260-7.ucode

LINUX_FIRMWARE_FILES += iwlwifi-7260-$(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_REV).ucode

LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware

endif