Module Name: src
Committed By: skrll
Date: Sat Jan 20 08:09:13 UTC 2024
Modified Files:
src/external/broadcom/bwfm: Makefile
src/share/mk: bsd.own.mk
Added Files:
src/distrib/sets/lists/base: md.riscv
Log Message:
risc-v: Add bwfm(4) firmware files to release image
Create the correct link for beagle,beaglev-starlight-jh7100-r0.txt NVRAM
config file.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/base/md.riscv
cvs rdiff -u -r1.9 -r1.10 src/external/broadcom/bwfm/Makefile
cvs rdiff -u -r1.1362 -r1.1363 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/broadcom/bwfm/Makefile
diff -u src/external/broadcom/bwfm/Makefile:1.9 src/external/broadcom/bwfm/Makefile:1.10
--- src/external/broadcom/bwfm/Makefile:1.9 Tue Feb 9 11:57:20 2021
+++ src/external/broadcom/bwfm/Makefile Sat Jan 20 08:09:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/02/09 11:57:20 yamt Exp $
+# $NetBSD: Makefile,v 1.10 2024/01/20 08:09:13 skrll Exp $
NOMAN= # define
@@ -6,7 +6,8 @@ NOMAN= # define
# Only install the SDIO firmware binaries on platforms where it will
# be useful.
-.if ${MACHINE} == "evbarm"
+.if (${MACHINE} == "evbarm" || \
+ ${MACHINE} == "riscv")
BWFM_WANT_SDIO_FIRMWARE= yes
.endif
@@ -83,5 +84,13 @@ LINKS+= ${FILESDIR}/brcmfmac43455-sdio.r
${FILESDIR}/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt
.endif
+# Platform-specific configuration files
+.if ${MACHINE} == "riscv"
+# Boards that share the common AP6212 nvram config are listed here.
+FILES+= dist/brcmfmac43430-sdio.AP6212.txt
+LINKS+= ${FILESDIR}/brcmfmac43430-sdio.AP6212.txt \
+ ${FILESDIR}/brcmfmac43430-sdio.beagle,beaglev-starlight-jh7100-r0.txt
+.endif
+
.include <bsd.links.mk>
.include <bsd.files.mk>
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1362 src/share/mk/bsd.own.mk:1.1363
--- src/share/mk/bsd.own.mk:1.1362 Wed Jan 3 02:59:00 2024
+++ src/share/mk/bsd.own.mk Sat Jan 20 08:09:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1362 2024/01/03 02:59:00 thorpej Exp $
+# $NetBSD: bsd.own.mk,v 1.1363 2024/01/20 08:09:13 skrll Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1289,6 +1289,7 @@ MKFIRMWARE.hppa= yes
MKFIRMWARE.i386= yes
MKFIRMWARE.mac68k= yes
MKFIRMWARE.macppc= yes
+MKFIRMWARE.riscv= yes
MKFIRMWARE.sandpoint= yes
MKFIRMWARE.sparc64= yes
Added files:
Index: src/distrib/sets/lists/base/md.riscv
diff -u /dev/null src/distrib/sets/lists/base/md.riscv:1.1
--- /dev/null Sat Jan 20 08:09:13 2024
+++ src/distrib/sets/lists/base/md.riscv Sat Jan 20 08:09:13 2024
@@ -0,0 +1,22 @@
+# $NetBSD: md.riscv,v 1.1 2024/01/20 08:09:13 skrll Exp $
+./libdata/firmware/if_bwfm/brcmfmac43143-sdio.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac43241b0-sdio.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac43241b4-sdio.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac43241b5-sdio.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac4329-sdio.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac4330-sdio.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac4334-sdio.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac43340-sdio.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac4335-sdio.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac43362-sdio.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac4339-sdio.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac43430-sdio.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac43430a0-sdio.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac43455-sdio.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac43456-sdio.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac43456-sdio.clm_blob base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac4354-sdio.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac4356-sdio.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac4373-sdio.bin base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac43430-sdio.AP6212.txt base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac43430-sdio.beagle,beaglev-starlight-jh7100-r0.txt base-firmware-root firmware
