- use pre-rolled "linux-firmware" tarball as a source for V16 firmware

- keep using old separate tarballs for V22 firmware for now, newer V22
ones from linux-firmware require driver changes (stsp pending diff for
DQA)

- add in newer API firmware from "linux-firmware" to ease future
development and testing
This commit is contained in:
sthen 2019-10-16 09:47:52 +00:00
parent 2ff698054b
commit c574a16851
3 changed files with 57 additions and 30 deletions

View File

@ -1,36 +1,62 @@
# $OpenBSD: Makefile,v 1.8 2017/04/21 11:40:08 sthen Exp $
# $OpenBSD: Makefile,v 1.9 2019/10/16 09:47:52 sthen Exp $
FW_DRIVER= iwm
FW_VER= 0.20170105
FW_VER= 20190923
DISTNAME= linux-firmware-${FW_VER}
EXTRACT_SUFX= .tar.xz
HOMEPAGE= https://wireless.wiki.kernel.org/en/users/Drivers/iwlwifi
MASTER_SITES= https://cdn.kernel.org/pub/linux/kernel/firmware/
# As per the READMEs, the "-16" in the filename reflects an interface/
# architecture version number. It will change only when changes in new
# uCode releases make the new uCode incompatible with earlier drivers.
V16= 16.242414.0
V22= 22.361476.0
DISTFILES= iwlwifi-3160-ucode-${V16}.tgz \
DISTFILES= linux-firmware-${FW_VER}${EXTRACT_SUFX} \
iwlwifi-3168-ucode-${V22}.tgz \
iwlwifi-7260-ucode-${V16}.tgz \
iwlwifi-7265-ucode-${V16}.tgz \
iwlwifi-8000-ucode-${V16}.tgz \
iwlwifi-8265-ucode-${V22}.tgz
WRKDIST= ${WRKDIR}
# use "V16" firmwares from linux-firmware
# ic api
FW+= 3160 16 \
7260 16 \
7265 16 \
7265D 16 \
8000C 16
HOMEPAGE= http://www.intellinuxwireless.org/
MASTER_SITES= https://wireless.wiki.kernel.org/_media/en/users/drivers/ \
http://firmware.openbsd.org/firmware-dist/
# don't use newer versions of "V22" firmwares from linux-firmware,
# stick to the old separate files for now, newer ones require DQA
#FW+= 3168 22 \
# 8265 22 \
# add in new API versions to ease future development and testing,
# not used in the kernel yet
FW+= 3160 17 \
7260 17 \
7265 17 \
7265D 29 \
3168 29 \
8265 36 \
8000C 36
do-install:
.for i in 3160 7260 7265
${INSTALL_DATA} ${WRKSRC}/iwlwifi-$i-ucode-${V16}/iwlwifi-$i-16.ucode ${PREFIX}/firmware/iwm-$i-16
${INSTALL_DATA} ${WRKSRC}/LICENCE.iwlwifi_firmware \
${PREFIX}/firmware/iwm-license
.for device api in ${FW}
${INSTALL_DATA} ${WRKSRC}/iwlwifi-${device}-${api}.ucode \
${PREFIX}/firmware/iwm-${device}-${api}
.endfor
.for i in 3168 8265
${INSTALL_DATA} ${WRKSRC}/iwlwifi-$i-ucode-${V22}/iwlwifi-$i-22.ucode ${PREFIX}/firmware/iwm-$i-22
${INSTALL_DATA} ${WRKDIR}/iwlwifi-$i-ucode-${V22}/iwlwifi-$i-22.ucode ${PREFIX}/firmware/iwm-$i-22
.endfor
${INSTALL_DATA} ${WRKSRC}/iwlwifi-7265-ucode-${V16}/iwlwifi-7265D-16.ucode ${PREFIX}/firmware/iwm-7265D-16
${INSTALL_DATA} ${WRKSRC}/iwlwifi-8000-ucode-${V16}/iwlwifi-8000C-16.ucode ${PREFIX}/firmware/iwm-8000C-16
# Install the most recent license. Only difference is the (C) year.
${INSTALL_DATA} ${WRKSRC}/iwlwifi-8265-ucode-${V22}/LICENSE.iwlwifi-8265.ucode ${PREFIX}/firmware/iwm-license
# also supported by iwlmvm (equivalent to our iwm) on linux:
# Wireless-AC 9560, 9461, 9462: iwlwifi-9000-pu-b0-jf-b0-${api}.ucode
# Wireless-AC 9260: iwlwifi-9260-th-b0-jf-b0-${api}.ucode
# Wi-Fi 6 AX200 160MHz: iwlwifi-cc-a0-${api}.ucode
# "these devices have the same PCI device and subsystem IDs"
# https://www.spinics.net/lists/linux-wireless/msg184271.html
# https://bugs.launchpad.net/hwe-next/+bug/1833065
# Wi-Fi 6 AX201 160MHz: iwlwifi-Qu-??-??-b0-${api}.ucode
# integrated 22000 series ??? iwlwifi-Quz-a0-??-b0-${api}.ucode
.include <bsd.port.mk>

View File

@ -1,12 +1,6 @@
SHA256 (firmware/iwlwifi-3160-ucode-16.242414.0.tgz) = 6i8nL0C3p2/eBJRJgTpdbjI3ae/WA6zTA9HppODleCA=
SHA256 (firmware/iwlwifi-3168-ucode-22.361476.0.tgz) = vJoBzIcTlNG0F42Q5xyLjtlm0q77gNtvR4KsOwjag4c=
SHA256 (firmware/iwlwifi-7260-ucode-16.242414.0.tgz) = O/ECzT6opyC++J3KEgyUql/zS8x1ZBP8WYKjlhNkHYQ=
SHA256 (firmware/iwlwifi-7265-ucode-16.242414.0.tgz) = LVmbCR+oG2aj4sseYH4GCo6C0XjSbzB3FGzlSD15jWU=
SHA256 (firmware/iwlwifi-8000-ucode-16.242414.0.tgz) = gC10BjVAFrmNG0hfBEa1oWxKx5UngxWlWnuQGyI8uHE=
SHA256 (firmware/iwlwifi-8265-ucode-22.361476.0.tgz) = uG57oD4+aCFWA2SMB0CTnZR0I3p8qpXFq8IJ8WOBzvE=
SIZE (firmware/iwlwifi-3160-ucode-16.242414.0.tgz) = 467156
SHA256 (firmware/linux-firmware-20190923.tar.xz) = MDDjyCcLuUs9TnBanTE26a13cya/Wfo3oZW/hlUVOLs=
SIZE (firmware/iwlwifi-3168-ucode-22.361476.0.tgz) = 421691
SIZE (firmware/iwlwifi-7260-ucode-16.242414.0.tgz) = 494594
SIZE (firmware/iwlwifi-7265-ucode-16.242414.0.tgz) = 1103203
SIZE (firmware/iwlwifi-8000-ucode-16.242414.0.tgz) = 931690
SIZE (firmware/iwlwifi-8265-ucode-22.361476.0.tgz) = 725548
SIZE (firmware/linux-firmware-20190923.tar.xz) = 83662624

View File

@ -1,9 +1,16 @@
@comment $OpenBSD: PLIST,v 1.5 2017/04/21 11:40:08 sthen Exp $
@comment $OpenBSD: PLIST,v 1.6 2019/10/16 09:47:52 sthen Exp $
firmware/iwm-3160-16
firmware/iwm-3160-17
firmware/iwm-3168-22
firmware/iwm-3168-29
firmware/iwm-7260-16
firmware/iwm-7260-17
firmware/iwm-7265-16
firmware/iwm-7265-17
firmware/iwm-7265D-16
firmware/iwm-7265D-29
firmware/iwm-8000C-16
firmware/iwm-8000C-36
firmware/iwm-8265-22
firmware/iwm-8265-36
firmware/iwm-license