From 411aa5d8e58c3d722e684e39aa41207fdf6f8a7d Mon Sep 17 00:00:00 2001 From: skrll Date: Sat, 20 Jan 2024 08:09:13 +0000 Subject: [PATCH] risc-v: Add bwfm(4) firmware files to release image Create the correct link for beagle,beaglev-starlight-jh7100-r0.txt NVRAM config file. --- distrib/sets/lists/base/md.riscv | 22 ++++++++++++++++++++++ external/broadcom/bwfm/Makefile | 13 +++++++++++-- share/mk/bsd.own.mk | 3 ++- 3 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 distrib/sets/lists/base/md.riscv diff --git a/distrib/sets/lists/base/md.riscv b/distrib/sets/lists/base/md.riscv new file mode 100644 index 000000000000..e30fb8ff9eb8 --- /dev/null +++ b/distrib/sets/lists/base/md.riscv @@ -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 diff --git a/external/broadcom/bwfm/Makefile b/external/broadcom/bwfm/Makefile index 6bfd8628acd0..883d7a774e38 100644 --- a/external/broadcom/bwfm/Makefile +++ b/external/broadcom/bwfm/Makefile @@ -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.raspberrypi,3-model-b-plus.txt \ ${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 .include diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 5400e637e652..fb44756e19d3 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -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