From 22db466194021d8f40b86a12280bfbb91f0a9db5 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Wed, 17 Dec 2014 12:02:39 +0100 Subject: [PATCH] wifi_drv: adapt wifi.run for iwl7260 Fixes #1317. --- repos/dde_linux/run/wifi.run | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/repos/dde_linux/run/wifi.run b/repos/dde_linux/run/wifi.run index 88f151298..d1220be19 100644 --- a/repos/dde_linux/run/wifi.run +++ b/repos/dde_linux/run/wifi.run @@ -125,14 +125,21 @@ append config { install_config $config -if {![file exists bin/iwlwifi-6000-6.ucode] || - ![file exists bin/iwlwifi-6000g2a-6.ucode] || - ![file exists bin/iwlwifi-6000g2b-6.ucode]} { - puts "" - puts "The iwlwifi driver needs specific firmware images to work. Please download" - puts "the firmware from http://wireless.kernel.org/en/users/Drivers/iwlwifi and put" - puts "the appropiate firmware into './bin'." - exit 1 +set firmware_modules { + iwlwifi-6000-6.ucode + iwlwifi-6000g2a-6.ucode + iwlwifi-6000g2b-6.ucode + iwlwifi-7260-8.ucode +} + +foreach f $firmware_modules { + if ![file exists bin/$f] { + puts "" + puts "The iwlwifi driver needs the following list of firmware images to work." + puts " $firmware_modules" + puts "Please download the images from http://wireless.kernel.org/en/users/Drivers/iwlwifi into './bin'." + exit 1 + } } @@ -150,12 +157,10 @@ set boot_modules { wifi_drv test-lwip_httpsrv lwip.lib.so - - iwlwifi-6000-6.ucode - iwlwifi-6000g2a-6.ucode - iwlwifi-6000g2b-6.ucode } +append boot_modules $firmware_modules + lappend_if [have_spec acpi] boot_modules acpi_drv lappend_if [have_spec pci] boot_modules pci_drv lappend_if [have_spec nova] boot_modules pci_device_pd @@ -165,4 +170,5 @@ lappend_if [have_spec gpio] boot_modules gpio_drv build_boot_image $boot_modules run_genode_until forever + # vi: set ft=tcl :