From c5706e8f4a9f4e5cd3960eac6f659895147fc9b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= Date: Mon, 23 Sep 2019 17:24:34 +0200 Subject: [PATCH] wifi_drv: enable loading of 5000 series FW Fixes #3502. --- repos/dde_linux/ports/dde_linux.hash | 2 +- repos/dde_linux/ports/dde_linux.port | 4 ++-- repos/dde_linux/recipes/pkg/wifi/runtime | 1 + repos/dde_linux/src/lib/wifi/firmware.cc | 1 + repos/gems/src/app/sculpt_manager/runtime/wifi_drv.cc | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/repos/dde_linux/ports/dde_linux.hash b/repos/dde_linux/ports/dde_linux.hash index 914809fc3b..5e6365938c 100644 --- a/repos/dde_linux/ports/dde_linux.hash +++ b/repos/dde_linux/ports/dde_linux.hash @@ -1 +1 @@ -aa28d681fc4c5c74f8e287608db1aedcb5cc35fc +ad00f3043d0fc14484e5e972393f7417cadbcb18 diff --git a/repos/dde_linux/ports/dde_linux.port b/repos/dde_linux/ports/dde_linux.port index ac25d38e62..125d19b6d7 100644 --- a/repos/dde_linux/ports/dde_linux.port +++ b/repos/dde_linux/ports/dde_linux.port @@ -133,9 +133,9 @@ DIR(wpa_supplicant) := src/app/wpa_supplicant # # Firmware images # -FW_REV := f92004aacf48a9e60c9d90f7e972bc3bb5184fb3 +FW_REV := 83f7aa92f405048d4502e80c5390a9cbbd91a14f URL(fw) := https://github.com/cnuke/dde_linux_firmware/archive/$(FW_REV).tar.gz -SHA(fw) := b927a83c4a5a20c9cc3f8bfb453f07278e222f84da4f17a44ab26f362eebad38 +SHA(fw) := 507711b75436f9b46ce126c9cfb043e2404b266517ec51061939618de1758c98 DIR(fw) := firmware # diff --git a/repos/dde_linux/recipes/pkg/wifi/runtime b/repos/dde_linux/recipes/pkg/wifi/runtime index e2324eefd6..97ee43f813 100644 --- a/repos/dde_linux/recipes/pkg/wifi/runtime +++ b/repos/dde_linux/recipes/pkg/wifi/runtime @@ -28,6 +28,7 @@ + diff --git a/repos/dde_linux/src/lib/wifi/firmware.cc b/repos/dde_linux/src/lib/wifi/firmware.cc index d2797b87f9..42b199805b 100644 --- a/repos/dde_linux/src/lib/wifi/firmware.cc +++ b/repos/dde_linux/src/lib/wifi/firmware.cc @@ -25,6 +25,7 @@ Firmware_list fw_list[] = { { "iwlwifi-1000-5.ucode", 337520, nullptr }, { "iwlwifi-3160-17.ucode", 918268, nullptr }, + { "iwlwifi-5000-5.ucode", 340696, nullptr }, { "iwlwifi-6000-4.ucode", 454608, nullptr }, { "iwlwifi-6000-6.ucode", 454608, "iwlwifi-6000-4.ucode" }, { "iwlwifi-6000g2a-6.ucode", 677296, nullptr }, diff --git a/repos/gems/src/app/sculpt_manager/runtime/wifi_drv.cc b/repos/gems/src/app/sculpt_manager/runtime/wifi_drv.cc index 4c055ca23d..a19d911840 100644 --- a/repos/gems/src/app/sculpt_manager/runtime/wifi_drv.cc +++ b/repos/gems/src/app/sculpt_manager/runtime/wifi_drv.cc @@ -58,6 +58,7 @@ void Sculpt::gen_wifi_drv_start_content(Xml_generator &xml) gen_parent_rom_route(xml, "iwlwifi-1000-5.ucode"); gen_parent_rom_route(xml, "iwlwifi-3160-17.ucode"); gen_parent_rom_route(xml, "iwlwifi-3168-17.ucode"); + gen_parent_rom_route(xml, "iwlwifi-5000-5.ucode"); gen_parent_rom_route(xml, "iwlwifi-6000-4.ucode"); gen_parent_rom_route(xml, "iwlwifi-6000g2a-6.ucode"); gen_parent_rom_route(xml, "iwlwifi-6000g2b-6.ucode");