From 9c2ce7b1a19dcaca59a6e82a68a75d9e98736e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20=C3=82ngelo?= Date: Sun, 3 Mar 2019 18:59:11 +0000 Subject: [PATCH] asus-grouper: update kernel wifi firmware path (!252) [ci:skip-build]: already built successfully in CI --- device/device-asus-grouper/APKBUILD | 6 +++--- device/linux-asus-grouper/APKBUILD | 4 ++-- device/linux-asus-grouper/config-asus-grouper.armhf | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/device/device-asus-grouper/APKBUILD b/device/device-asus-grouper/APKBUILD index b7b8f2678..fee06e550 100644 --- a/device/device-asus-grouper/APKBUILD +++ b/device/device-asus-grouper/APKBUILD @@ -25,9 +25,9 @@ package() { } nonfree_firmware() { - pkgdesc="Google Nexus 7 (2012) wifi firmware" - depends="firmware-aosp-broadcom-wlan" - mkdir "$subpkgdir" + pkgdesc="Google Nexus 7 (2012) wifi firmware" + depends="firmware-aosp-broadcom-wlan" + mkdir "$subpkgdir" install -D -m644 "$srcdir"/nvram.txt \ "$subpkgdir"/lib/firmware/postmarketos/bcmdhd/bcm4330/fw_bcm4330_bg.txt } diff --git a/device/linux-asus-grouper/APKBUILD b/device/linux-asus-grouper/APKBUILD index 1bd2f453c..84b6ec425 100644 --- a/device/linux-asus-grouper/APKBUILD +++ b/device/linux-asus-grouper/APKBUILD @@ -21,7 +21,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=10 +pkgrel=11 arch="armhf" pkgdesc="Nexus 7 (2012) kernel from LineageOS" url="https://github.com/LineageOS/android_kernel_asus_grouper" @@ -100,6 +100,6 @@ package() { } sha512sums="11ba20986552a0b913de2a7d756d31ad9f4f67561cb88988737bba07997f00b7574604d1c19f6d890502208f12a21d48d4044edc5a8db5174b2a49d4a87573e3 linux-asus-grouper-953e26f2709dfe0c185c3c99c50b0c9d56d473a4.tar.gz -a9614499186eb0f7a7b37d07a99b1a8fa5b093370bed2c0d4f7b978b49a47ac858c6cabfa4ec97ca6fec1f579bd342c38722ef930de120ecda78be0341e41411 config-asus-grouper.armhf +769a9b12dc1f42f0e625852875b3f094a1c618a1de7e6b1a2e55a223a8289f204f8181dc3cb4a75bde1e5102db0e6e2d132a31ede0641510c12e6f4eb3335542 config-asus-grouper.armhf d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h 9b15bf1f6cb66f54c785b0af6c9db8a7d63257e6fa3eeb0cbf47284334166aa6a7ff93e1b64ab69206c8047d64641199c0f5fcbc257bbe039263252fff45118e duplicate-return-address-definition.patch" diff --git a/device/linux-asus-grouper/config-asus-grouper.armhf b/device/linux-asus-grouper/config-asus-grouper.armhf index 12a67bef4..27d2f140f 100644 --- a/device/linux-asus-grouper/config-asus-grouper.armhf +++ b/device/linux-asus-grouper/config-asus-grouper.armhf @@ -1231,8 +1231,8 @@ CONFIG_USB_NET_RNDIS_WLAN=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_NVRAM_PATH="/system/etc/nvram.txt" +CONFIG_BCMDHD_FW_PATH="/lib/firmware/postmarketos/bcmdhd/bcm4330/fw_bcm4330_bg.bin" +CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/postmarketos/bcmdhd/bcm4330/fw_bcm4330_bg.txt" # CONFIG_DHD_USE_STATIC_BUF is not set CONFIG_DHD_USE_SCHED_SCAN=y CONFIG_DHD_ENABLE_P2P=y