From 0e9a49d1cf4a7e402029fc99d83f25b37fc55e2b Mon Sep 17 00:00:00 2001 From: Benjamin Lamowski Date: Mon, 7 Nov 2022 11:49:59 +0100 Subject: [PATCH] wifi/pc: add firmware for the Intel AX211 Lenovo Thinkpads with 12th gen Intel i7 CPUs such as the X1 Nano G2 may contain such a wifi card. Issue #4663 --- repos/dde_linux/ports/linux-firmware.hash | 2 +- repos/dde_linux/ports/linux-firmware.port | 4 ++-- repos/gems/src/app/sculpt_manager/runtime/wifi_drv.cc | 2 ++ repos/pc/src/lib/wifi/firmware.cc | 2 ++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/repos/dde_linux/ports/linux-firmware.hash b/repos/dde_linux/ports/linux-firmware.hash index b9ccede6ce..946b3f2507 100644 --- a/repos/dde_linux/ports/linux-firmware.hash +++ b/repos/dde_linux/ports/linux-firmware.hash @@ -1 +1 @@ -7531725735ef90f88369aafe8e930c43f2daf2ec +e9fdf82a31f0106cd2604a644685e7c080a12d09 diff --git a/repos/dde_linux/ports/linux-firmware.port b/repos/dde_linux/ports/linux-firmware.port index 2f83c4b756..981d16a09f 100644 --- a/repos/dde_linux/ports/linux-firmware.port +++ b/repos/dde_linux/ports/linux-firmware.port @@ -2,7 +2,7 @@ LICENSE := mixed VERSION := 1 DOWNLOADS := fw.archive -FW_REV := e71a9b96ee6acc9fd6ec97ed92fb7152fa721671 +FW_REV := cbd51e5ee647ec834c30a3987225cae2341753b0 URL(fw) := https://github.com/cnuke/dde_linux_firmware/archive/$(FW_REV).tar.gz -SHA(fw) := 7e613822fca17453260bafbb99da62f5eb0aedaa839b1569ca7bc7eb3eb8e23f +SHA(fw) := 486e3e4cc3022acca2b134c11feb8d3bbc4bd07a588a7c56e6fc07174bf3d573 DIR(fw) := firmware 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 a72dd1af9f..073fdf502e 100644 --- a/repos/gems/src/app/sculpt_manager/runtime/wifi_drv.cc +++ b/repos/gems/src/app/sculpt_manager/runtime/wifi_drv.cc @@ -88,6 +88,8 @@ void Sculpt::gen_wifi_drv_start_content(Xml_generator &xml) gen_parent_rom_route(xml, "iwlwifi-9000-pu-b0-jf-b0-46.ucode"); gen_parent_rom_route(xml, "iwlwifi-QuZ-a0-hr-b0-63.ucode"); gen_parent_rom_route(xml, "iwlwifi-so-a0-hr-b0-64.ucode"); + gen_parent_rom_route(xml, "iwlwifi-so-a0-gf-a0-64.ucode"); + gen_parent_rom_route(xml, "iwlwifi-so-a0-gf-a0.pnvm"); gen_parent_rom_route(xml, "regulatory.db"); gen_parent_rom_route(xml, "regulatory.db.p7s"); gen_parent_route (xml); diff --git a/repos/pc/src/lib/wifi/firmware.cc b/repos/pc/src/lib/wifi/firmware.cc index 03676e1f61..195cdc56e7 100644 --- a/repos/pc/src/lib/wifi/firmware.cc +++ b/repos/pc/src/lib/wifi/firmware.cc @@ -46,6 +46,8 @@ Firmware_list fw_list[] = { { "iwlwifi-QuZ-a0-hr-b0-63.ucode", 1334804, nullptr }, { "iwlwifi-QuZ-a0-hr-b0-64.ucode", 1334804, "iwlwifi-QuZ-a0-hr-b0-63.ucode" }, { "iwlwifi-so-a0-hr-b0-64.ucode", 1427384, nullptr }, + { "iwlwifi-so-a0-gf-a0-64.ucode", 1515812, nullptr }, + { "iwlwifi-so-a0-gf-a0.pnvm", 41808, nullptr }, };