aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Config.in.legacy23
-rw-r--r--package/linux-firmware/Config.in20
-rw-r--r--package/linux-firmware/linux-firmware.mk4
3 files changed, 37 insertions, 10 deletions
diff --git a/Config.in.legacy b/Config.in.legacy
index 5b1460cc5e..f7bde7fcd3 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -99,6 +99,29 @@ comment "----------------------------------------------------"
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"
config BR2_PACKAGE_LIBELF
diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
index 7a1c40fd90..dc07a965cc 100644
--- a/package/linux-firmware/Config.in
+++ b/package/linux-firmware/Config.in
@@ -46,6 +46,7 @@ config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX
config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160
bool "Intel iwlwifi 3160"
+ select BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_NEED_REV
help
Firmware files for the Intel Wifi 3160 devices supported by
the iwlwifi kernel driver.
@@ -58,35 +59,38 @@ config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000
config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260
bool "Intel iwlwifi 7260"
+ select BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_NEED_REV
help
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
+config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_NEED_REV
+ bool
+
+if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_NEED_REV
choice
- bool "iwlwifi 3160/7260 revision to use"
+ bool "iwlwifi 3160/726x 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
+config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_7
prompt "revision 7"
help
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"
help
Use revision 8 for kernel 3.13 onward.
endchoice
-config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_REV
+config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV
int
- default 7 if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7
- default 8 if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8
+ default 7 if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_7
+ default 8 if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_8
endif # iwlwifi 3160/7260
diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index a7e1329f7f..46e07d62ac 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -159,7 +159,7 @@ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity
endif
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
endif
@@ -173,7 +173,7 @@ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
endif
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
endif