From owner-svn-ports-all@freebsd.org Thu May 5 22:50:23 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6B392B2E4DF; Thu, 5 May 2016 22:50:23 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 46AFA10FD; Thu, 5 May 2016 22:50:23 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u45MoMqO099916; Thu, 5 May 2016 22:50:22 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u45MoMJr099912; Thu, 5 May 2016 22:50:22 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201605052250.u45MoMJr099912@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Thu, 5 May 2016 22:50:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414669 - head/net/bwn-firmware-kmod X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 May 2016 22:50:23 -0000 Author: adrian (src committer) Date: Thu May 5 22:50:22 2016 New Revision: 414669 URL: https://svnweb.freebsd.org/changeset/ports/414669 Log: [bwn] Initial support for the v5 firmware This is just to support the initial v5 firmware for one of the PHY-N NICs I'm going to do some development. It only pulls out the specific v5 mimo firmware for the BCM4312 NIC I am playing with; I'm adding it so we at least have the framework to pull things out of the v5 firmware. The existing NICs still use v4 firmware and I don't plan on changing that for some time as bwn(4) doesn't yet support the newer firmware API and descriptor layouts. Modified: head/net/bwn-firmware-kmod/Makefile head/net/bwn-firmware-kmod/distinfo head/net/bwn-firmware-kmod/pkg-plist Modified: head/net/bwn-firmware-kmod/Makefile ============================================================================== --- head/net/bwn-firmware-kmod/Makefile Thu May 5 21:44:53 2016 (r414668) +++ head/net/bwn-firmware-kmod/Makefile Thu May 5 22:50:22 2016 (r414669) @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= bwn-firmware -PORTVERSION= 0.1.0 +PORTVERSION= 0.1.1 CATEGORIES= net MASTER_SITES= http://downloads.openwrt.org/sources/ \ http://mirror2.openwrt.org/sources/ PKGNAMESUFFIX= -kmod -DISTFILES= ${FWFILE} ${FWFILE_LP} +DISTFILES= ${FWFILE} ${FWFILE_LP} ${FWFILE_N} EXTRACT_ONLY= MAINTAINER= swhetzel@gmail.com @@ -33,17 +33,30 @@ FIRMWARES_LP= \ lp0bsinitvals14 lp0bsinitvals15 \ n0bsinitvals11 +FIRMWARES_N= \ + ucode16_mimo \ + n0initvals16 n0initvals24 \ + n0bsinitvals16 n0bsinitvals24 \ + WRKSRC= ${WRKDIR} FWNAME= bwn_v4 FWFILE= broadcom-wl-${FWVERSION}.tar.bz2 FWVERSION= 4.150.10.5 KMODNAME= ${FWNAME}_ucode + FWNAME_LP= bwn_v4_lp FWFILE_LP= broadcom-wl-${FWVERSION_LP}.tar.bz2 FWVERSION_LP= 4.178.10.4 KMODNAME_LP= ${FWNAME_LP}_ucode + +FWNAME_N= bwn_v4_n +FWFILE_N= broadcom-wl-${FWVERSION_N}.tar.bz2 +FWVERSION_N= 5.100.138 +KMODNAME_N= ${FWNAME_N}_ucode + PLIST_SUB= KMODNAME="${KMODNAME}" \ - KMODNAME_LP="${KMODNAME_LP}" + KMODNAME_LP="${KMODNAME_LP}" \ + KMODNAME_N="${KMODNAME_N}" NO_PACKAGE= this is a modified version of a restricted firmware @@ -75,8 +88,22 @@ do-build: @${ECHO_CMD} ".include " >> ${WRKSRC}/lp/v4/Makefile @cd ${WRKSRC}/lp/v4; make all + cd ${WRKSRC} && \ + tar xjf ${DISTDIR}/${FWFILE_N} + mkdir -p ${WRKSRC}/n + b43-fwcutter -w ${WRKSRC}/n \ + ${WRKSRC}/broadcom-wl-${FWVERSION_N}/linux/wl_apsta.o + ${TOUCH} ${WRKSRC}/n/v4/ucode.fw + @${ECHO_CMD} "KMOD= ${KMODNAME_N}" > ${WRKSRC}/n/v4/Makefile + @${ECHO_CMD} "FIRMWS= ${FIRMWARES_N:C/.*/&.fw:${FWNAME}_&/}" >> \ + ${WRKSRC}/n/v4/Makefile + @${ECHO_CMD} ".include " >> ${WRKSRC}/n/v4/Makefile + @cd ${WRKSRC}/n/v4; make all + + do-install: @cd ${WRKSRC}/bg/v4; ${SETENV} ${MAKE_ENV} KMODDIR="${STAGEDIR}${KMODDIR}" make install @cd ${WRKSRC}/lp/v4; ${SETENV} ${MAKE_ENV} KMODDIR="${STAGEDIR}${KMODDIR}" make install + @cd ${WRKSRC}/n/v4; ${SETENV} ${MAKE_ENV} KMODDIR="${STAGEDIR}${KMODDIR}" make install .include Modified: head/net/bwn-firmware-kmod/distinfo ============================================================================== --- head/net/bwn-firmware-kmod/distinfo Thu May 5 21:44:53 2016 (r414668) +++ head/net/bwn-firmware-kmod/distinfo Thu May 5 22:50:22 2016 (r414669) @@ -2,3 +2,5 @@ SHA256 (broadcom-wl-4.150.10.5.tar.bz2) SIZE (broadcom-wl-4.150.10.5.tar.bz2) = 3888794 SHA256 (broadcom-wl-4.178.10.4.tar.bz2) = 32f6ad98facbb9045646fdc8b54bb03086d204153253f9c65d0234a5d90ae53f SIZE (broadcom-wl-4.178.10.4.tar.bz2) = 5986780 +SHA256 (broadcom-wl-5.100.138.tar.bz2) = f1e7067aac5b62b67b8b6e4c517990277804339ac16065eb13c731ff909ae46f +SIZE (broadcom-wl-5.100.138.tar.bz2) = 13514651 Modified: head/net/bwn-firmware-kmod/pkg-plist ============================================================================== --- head/net/bwn-firmware-kmod/pkg-plist Thu May 5 21:44:53 2016 (r414668) +++ head/net/bwn-firmware-kmod/pkg-plist Thu May 5 22:50:22 2016 (r414669) @@ -1,2 +1,3 @@ /%%KMODDIR%%/%%KMODNAME%%.ko /%%KMODDIR%%/%%KMODNAME_LP%%.ko +/%%KMODDIR%%/%%KMODNAME_N%%.ko