device/htc-leo: enable wifi (MR 1767)

device/testing/device-htc-leo/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=device-htc-leo
 pkgdesc="HTC HD2"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -18,4 +18,10 @@ build() {
 package() {
 	devicepkg_package $startdir $pkgname
 }
+
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-aosp-broadcom-wlan"
+	mkdir "$subpkgdir"
+}
 sha512sums="be7a9638313f9376460bc3f5b6b35038ecdb16e37369cec32771e457c0a081a1b9dff699adcdff317d3f47ebfc04d4563800b390fae3e5807bd350efbba4acd9  deviceinfo"

device/testing/linux-htc-leo/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=linux-htc-leo
 pkgver=3.0.4
-pkgrel=0
+pkgrel=1
 pkgdesc="HTC HD2 kernel fork"
 arch="armv7"
 _carch="arm"
@@ -49,5 +49,5 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir"
 }
 sha512sums="5f324b69ff30284c0aabf16f9580726470eb54ce7edf6066e22d41d92e8be05085f9fb38fddeceee9cec4fb30cd68dda51585ff73ffbd4d52b154956aa81603e  linux-htc-leo-fb2ba086ea96647f38539664ebf0aa6eca61d7bb.tar.gz
-b4e0b06f16c1a950e9b95296b647a234cba5edc55701cd74297dd92d12c309d7a8b681022edd8e8e2fed739412a2af1b81210ccfcaa90090c3a83f017e41f760  config-htc-leo.armv7
+0dad1c7347d45885a54aae5781045d991b094e61e8cd78809897154aae89f1c0de2efed5238279eff5aa9fa204ee50196509ac5857594a244423173e1aa6d58f  config-htc-leo.armv7
 4166bdd725a00577c1319f1103ad802fc4699da3b5aae247c77b035880d21925d16c4faece72e93f59c933774dd912fc08082b07af03a90b664b7fa2865a61bc  01-fix-compiler-path.patch"

device/testing/linux-htc-leo/config-htc-leo.armv7

@@ -1376,7 +1376,7 @@ CONFIG_BCMDHD_GOOGLE=y
 # CONFIG_ATH_COMMON is not set
 # CONFIG_BCM4329 is not set
 CONFIG_BCMDHD=y
-CONFIG_BCMDHD_FW_PATH="/system/vendor/firmware/fw_bcmdhd.bin"
+CONFIG_BCMDHD_FW_PATH="/lib/firmware/postmarketos/bcmdhd/bcm4329/fw_bcm4329.bin"
 CONFIG_BCMDHD_NVRAM_PATH="/proc/calibration"
 CONFIG_DHD_USE_STATIC_BUF=y
 # CONFIG_DHD_USE_SCHED_SCAN is not set