From nobody Sun Jan 21 17:01:55 2024 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 4TJ04z2ZGSz57pBf; Sun, 21 Jan 2024 17:01:55 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJ04z1mJnz46yP; Sun, 21 Jan 2024 17:01:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705856515; 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=DX2NgjaemQDx3Vy5kj1qHBY/Jwx2pk0R8Vk7ohwommg=; b=dXtmj5RSc1JJExIIWLfQFyyc2bEE+I43MGmUM+UPw8TghzhN0qkHtENXxopiyh3QUEQp8+ k9KKUMKYeoWFSDF4MeZi2Xuri/aXY6H6RmXVnwlCetX6XPE4yrbZy1ZZnvf2+SGzqPbHyL loc6Zfi/67Ay8B7fXxrvQ7hOvG+NGz8WJuLqUPf7UQx/u9Ji1v1GchuqNkm71mOk5oAooe 0JMPtiOJrXYyQi5pm9QLo0xevgwvnX7/uMyH3sYOf2+/nVlOYvF3zmwVycZb3lCCIO943F jAw+lFAq1ufEzP4Nm4b0Kb1QDk+s+zMXtArQIjWyA+dIb6DuFEbCUhi+95a/Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705856515; 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=DX2NgjaemQDx3Vy5kj1qHBY/Jwx2pk0R8Vk7ohwommg=; b=CPcG7yHkQvz267BGTpfoYuvBQYVPm8uzFamD5afT2ZMDcH2YxNmxwAZMMrMW4pyQt24nZJ FzEA2jOLu31homxPwSAgMbmMM36GY0qduajjAquvQdRgps0F8Dykf3IaNvPi1oARjIKm2f 44gITynpsmI8iHlNU+YQvhoC+4qbahJJTaLW2LivDVvu7qhLVpEPXdZILMrCR0YP1EQNcC NeULYBBc3EZ3Yz7vJjvpAm1N4qxvShaOPAYTHELOmqXHeMv1SqMSU5ZCZsZusu5dSWmZLg G1dh3YQyBB+Hi4Ksemj4GyR5K8BZToug0guMdZB0WVUaXoAG/pa0bl+7ZxiLCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705856515; a=rsa-sha256; cv=none; b=w6e+DL3kfhlvAkV8mbzgl5WuIHR6ylmafPem7BzvZINj0DnEreYS231rURnJRjDINo33zJ u5mOTro0xC7p2CkW2uK0rS6UfSojWJoBCGND30xspl16RQALUzKzMu9QzJWWgFYjcqb60K o30FhZ39EC9zoV6+YYRW+5oNC00wEpzX+OGk0gZCuEF6Akrqtbyu1PHNLr66Pn9EsSirML F7uhX7A2I/BoOvPUMDVr4t53Om0DEbx7orsf32lLN95KaS2LkA7urwj5cMfjWOsIaH2Pfo ttF1HgtEflt3F7lrHRuPRHJRQ9M2OJd7lwJc4DQqMlFAQtID/+1e1WOw4Uhr1w== 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 4TJ04z0s5dzQ7H; Sun, 21 Jan 2024 17:01:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40LH1tUZ029601; Sun, 21 Jan 2024 17:01:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40LH1tXZ029598; Sun, 21 Jan 2024 17:01:55 GMT (envelope-from git) Date: Sun, 21 Jan 2024 17:01:55 GMT Message-Id: <202401211701.40LH1tXZ029598@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 5a1af07a045a - main - firmware(9): Update example 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a1af07a045ae2f2d5af0e5939facd454e962897 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5a1af07a045ae2f2d5af0e5939facd454e962897 commit 5a1af07a045ae2f2d5af0e5939facd454e962897 Author: Warner Losh AuthorDate: 2024-01-20 04:32:16 +0000 Commit: Warner Losh CommitDate: 2024-01-21 16:20:53 +0000 firmware(9): Update example Update the example to include a firmware module in the kernel from npe to iwn. Npe was deleted 6 years ago so makes a poor example of how to embed firmware in the kernel. Sponsored by: Netflix --- share/man/man9/firmware.9 | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/share/man/man9/firmware.9 b/share/man/man9/firmware.9 index af869b6fa593..1ee2cd655002 100644 --- a/share/man/man9/firmware.9 +++ b/share/man/man9/firmware.9 @@ -21,7 +21,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd January 27, 2021 +.Dd January 19, 2024 .Dt FIRMWARE 9 .Os .Sh NAME @@ -252,26 +252,24 @@ colon-separated tuples indicating the image_file's to be embedded in the module, the imagename and version of each firmware image. .Pp If you need to embed firmware images into a system, you should write -appropriate entries in the file, e.g. this example is +appropriate entries in the or file, e.g. this example is from -.Nm sys/arm/xscale/ixp425/files.ixp425 : +.Nm sys/conf/files .Bd -literal -ixp425_npe_fw.c optional npe_fw \\ - compile-with "${AWK} -f $S/tools/fw_stub.awk \\ - IxNpeMicrocode.dat:npe_fw -mnpe -c${.TARGET}" \\ - no-implicit-rule before-depend local \\ - clean "ixp425_npe_fw.c" +iwn1000fw.c optional iwn1000fw | iwnfw \\ + compile-with "${AWK} -f $S/tools/fw_stub.awk iwn1000.fw:iwn1000fw -miwn1000fw -c${.TARGET}" \\ + no-ctfconvert no-implicit-rule before-depend local \\ + clean "iwn1000fw.c" # # NB: ld encodes the path in the binary symbols generated for the # firmware image so link the file to the object directory to # get known values for reference in the _fw.c file. # -IxNpeMicrocode.fwo optional npe_fw \\ - dependency "IxNpeMicrocode.dat" \\ - compile-with "${LD} -b binary -d -warn-common \\ - -r -d -o ${.TARGET} IxNpeMicrocode.dat" \\ - no-implicit-rule \\ - clean "IxNpeMicrocode.fwo" +iwn1000fw.fwo optional iwn1000fw | iwnfw \\ + dependency "iwn1000.fw" \\ + compile-with "${NORMAL_FWO}" \\ + no-implicit-rule \\ + clean "iwn1000fw.fwo" .Ed .Pp Firmware was previously committed to the source tree as uuencoded files,