From nobody Mon Jan 06 07:32:34 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YRQr26d31z5k5cL; Mon, 06 Jan 2025 07:32:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YRQr25lhSz441X; Mon, 6 Jan 2025 07:32:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736148754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=48V4NJZVvky7T+19gOmEhrfG6zp9/in7HGaAaLtN90g=; b=xmJF2r8eDDftUF/YZ8VUEgIidH9sWo0REDgPJH/bSl7KPAbcXBFq7JKw5Cniam8lYzb9cM GeSWVKJU3UTd2ppQsxE6iWBaepLKat83fRjl9vEujUgGHK/4/Kb0GNsAU384LOs305B/0f 27KVwC03OV2ElOJFI/Rq7rBk8iTevwuy/3BuccPwsLEyqUkzIbG20owrtuK0GmP9iaRsBl IA1QGpGd6a0SsqbGHWa7lkS7V2wwDkvYJQyPZScyES7gzmjr195kn8turMB4E94azVJ3zF xnEf6fMibxPd08S+H3g8gy3W6pFtuWpLsp2avHm+O9op9Ah6wJm9+qQw3FDpuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736148754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=48V4NJZVvky7T+19gOmEhrfG6zp9/in7HGaAaLtN90g=; b=ZBAEzk1UhFRc+zKgXI8sGBPv8gBb8ZDxGjrxsZvL/anRMgfzAGM9s+fY1H/zg7z8IxQbd/ QLN7C3s6gRIBQouGR8x51d0JJlfYVWaFPKkuo6uS/wgTlb1CC/q/sUBdilMfau1FrSXr7R GATtMU/g0eAk5N9ZJz79YH9JJWanxp/z27nTOKrdv4HS5pX+gMQ69wN/6lXukspawNzZg4 QuYnIfWZpxqgnY5y23TUyowyKEBytKWWq3Gnp03aES+IudrWA2TK55nH8+IyYgSsFtWRe5 M34dZTS2ZWCYa6KDnj8dapL1JPkSr5ex4EK+RhrPevhbFZO+W9Q2mviS3/5LHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736148754; a=rsa-sha256; cv=none; b=WDR0S7sNfujbvuYDzdu6Nk5uR8FN8B/uqy5072a+qdy8re0lS4GRLt6V7MN0YnfZkic5rI gFM6XjIxcGGew/xXTfR/xcmoNfpv31yevd5JuXO5p+z6xBWqHAgH9+mlwpfEMpzmAOkU3H v8yW551Su2ojYs21D7/YZOkDOcmP8pCB6RxvXw81GIDAR9/rkYSdfErycCd7rjvxq7K6o5 iUUXELq6JoUrd9Dd8uJwArUH5sJmybwDTwxHCZksK+4xrZehqrUGWvoess6jnbrY44qi1j 5l/konRytV88xJP1O+qVauhbwOD0Pvef4jjuWV9SuR8ia8xWXV9r3p+xHnv0LQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YRQr25MtHzq1; Mon, 06 Jan 2025 07:32:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5067WYLb026959; Mon, 6 Jan 2025 07:32:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5067WYuu026955; Mon, 6 Jan 2025 07:32:34 GMT (envelope-from git) Date: Mon, 6 Jan 2025 07:32:34 GMT Message-Id: <202501060732.5067WYuu026955@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: a0f06dfb0d18 - main - loader: Add a list of firmware name mapping List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0f06dfb0d188966bee7265ec7d9f20093186bb6 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=a0f06dfb0d188966bee7265ec7d9f20093186bb6 commit a0f06dfb0d188966bee7265ec7d9f20093186bb6 Author: Emmanuel Vadot AuthorDate: 2025-01-06 07:34:02 +0000 Commit: Emmanuel Vadot CommitDate: 2025-01-06 07:34:02 +0000 loader: Add a list of firmware name mapping Since we started to ship raw firmware for iwm(4), users who loads the driver from loader are having problems as loader don't know that the firmwares are now raw files and not kernel modules anymore. Start a list of default entry for iwm(4) firmwares name mapping so it will still works when loaded from loader. Differential Revision: https://reviews.freebsd.org/D48211 Reviewed by: bz, imp, kevans Sponsored by: Beckhoff Automation GmbH & Co. KG --- stand/defaults/loader.conf | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/stand/defaults/loader.conf b/stand/defaults/loader.conf index d266c240955a..b1e87520a2d4 100644 --- a/stand/defaults/loader.conf +++ b/stand/defaults/loader.conf @@ -109,7 +109,7 @@ kernels_autodetect="YES" # Auto-detect kernel directories in /boot #comconsole_speed="115200" # Set the current serial console speed #console="vidconsole" # A comma separated list of console(s) #currdev="disk1s1a" # Set the current device -module_path="/boot/modules;/boot/dtb;/boot/dtb/overlays" # Set the module search path +module_path="/boot/modules;/boot/firmware;/boot/dtb;/boot/dtb/overlays" # Set the module search path module_blacklist="drm drm2 radeonkms i915kms amdgpu" # Loader module blacklist #prompt="\\${interpret}" # Set the command prompt #root_disk_unit="0" # Force the root disk unit number @@ -182,3 +182,14 @@ module_blacklist="drm drm2 radeonkms i915kms amdgpu" # Loader module blacklist #module_before="cmd" # executes "cmd" before loading the module #module_after="cmd" # executes "cmd" after loading the module #module_error="cmd" # executes "cmd" if load fails + +### Firmware names mapping list +iwm3160fw_type="firmware" +iwm7260fw_type="firmware" +iwm7265fw_type="firmware" +iwm8265fw_type="firmware" +iwm9260fw_type="firmware" +iwm3168fw_type="firmware" +iwm7265Dfw_type="firmware" +iwm8000C_type="firmware" +iwm9000fw_type="firmware"