Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 21 Jan 2024 17:01:55 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 5a1af07a045a - main - firmware(9): Update example
Message-ID:  <202401211701.40LH1tXZ029598@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=5a1af07a045ae2f2d5af0e5939facd454e962897

commit 5a1af07a045ae2f2d5af0e5939facd454e962897
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-01-20 04:32:16 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
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 <files.arch> file, e.g. this example is
+appropriate entries in the <files.arch> or <files> 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,



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401211701.40LH1tXZ029598>