From 0bc009892fda5c89cc75d4894e86133c22c949d4 Mon Sep 17 00:00:00 2001 From: timbz Date: Sun, 27 Sep 2020 12:40:49 +0200 Subject: [PATCH] samsung-i9100: fix wifi firmware loading for mainline kernel (MR 1598) [ci:skip-build]: already built successfully in CI --- .../testing/firmware-samsung-i9100/APKBUILD | 27 ++++++------------- device/testing/linux-samsung-i9100/APKBUILD | 4 +-- .../config-samsung-i9100.armv7 | 4 +-- 3 files changed, 12 insertions(+), 23 deletions(-) diff --git a/device/testing/firmware-samsung-i9100/APKBUILD b/device/testing/firmware-samsung-i9100/APKBUILD index bade99d63..91fff106e 100644 --- a/device/testing/firmware-samsung-i9100/APKBUILD +++ b/device/testing/firmware-samsung-i9100/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-samsung-i9100 pkgver=1 -pkgrel=2 +pkgrel=3 pkgdesc="Samsung Galaxy S II Firmware" url="https://github.com/TheMuppets/proprietary_vendor_samsung" arch="armv7" @@ -9,14 +9,8 @@ options="!check" # Source _files=" - bcmdhd_apsta.bin - bcmdhd_mfg.bin - bcmdhd_p2p.bin bcmdhd_sta.bin - nvram_mfg.txt - nvram_mfg.txt_murata nvram_net.txt - nvram_net.txt_murata " _commit="a5346c8874d5186c967b74291c2055d902f7a928" _url="https://github.com/TheMuppets/proprietary_vendor_samsung/raw/$_commit/i9100/proprietary/system/etc/wifi" @@ -25,16 +19,11 @@ for _i in $_files; do done package() { - for _i in $_files; do - install -Dm644 "$srcdir/$pkgname-$_commit-$_i" \ - "$pkgdir/lib/firmware/postmarketos/$_i" - done + install -Dm644 "$srcdir/$pkgname-$_commit-bcmdhd_sta.bin" \ + "$pkgdir/lib/firmware/postmarketos/brcm/brcmfmac4330-sdio.bin" + install -Dm644 "$srcdir/$pkgname-$_commit-nvram_net.txt" \ + "$pkgdir/lib/firmware/postmarketos/brcm/brcmfmac4330-sdio.samsung,i9100.txt" } -sha512sums="71ae0d6b87e2541b614fe2d964db239a2d0d158a89b2a96b508195977d7c348ce892717a8b836d5b4cd173430171b81a04b4346968331da1b0eb37cc962de4f3 firmware-samsung-i9100-a5346c8874d5186c967b74291c2055d902f7a928-bcmdhd_apsta.bin -df1a56ce3b4c3e069eaa57251d5e288e330af0525eb0e36e7375e0b675a040995ca2804103446cb0135cc4952eec449dc0a6398ab1fd01c59533484688186873 firmware-samsung-i9100-a5346c8874d5186c967b74291c2055d902f7a928-bcmdhd_mfg.bin -a6d602a768e8748c44b5debf2b7388d42c909919fb2b73c0f511ac2bceadac7d7208c6ba94c2df9aa900c9fb446f35f670b0adc552689f8567fa87ded754a947 firmware-samsung-i9100-a5346c8874d5186c967b74291c2055d902f7a928-bcmdhd_p2p.bin -a6d602a768e8748c44b5debf2b7388d42c909919fb2b73c0f511ac2bceadac7d7208c6ba94c2df9aa900c9fb446f35f670b0adc552689f8567fa87ded754a947 firmware-samsung-i9100-a5346c8874d5186c967b74291c2055d902f7a928-bcmdhd_sta.bin -f8d8ad3c91d5f25cb5b17717d9f27f44b16b20ebe2e41fce1987f48f49f22edbcc7afb0aba2fc0c698538f940507a8156d403c2ac6a6fb6e77ef22264c7ce9cf firmware-samsung-i9100-a5346c8874d5186c967b74291c2055d902f7a928-nvram_mfg.txt -cefb1d2f68594dbfab7ecbef5972e477a6c92c411ea919855276963e5f0870f5a1006d81e8fb235cc9f146959512fd9afecfde74d9720451f94a4409839d40b2 firmware-samsung-i9100-a5346c8874d5186c967b74291c2055d902f7a928-nvram_mfg.txt_murata -4a473740dfb3202e77fdd07c0bfe59c3cd2ea30e3388b7a09c38484408d9253b7e83a96558995e1fce87e00d6a071eec49ee5a10d68c0e05ab6b6a3dd873604e firmware-samsung-i9100-a5346c8874d5186c967b74291c2055d902f7a928-nvram_net.txt -b883699dfdb9d5820f65c79cbef1389ad8f648ef37b3d3d537c067cfe8ea6f6f76e95541c338e046988ce33269692274fae3469142c5ec7e0dc1b35e09deb0b1 firmware-samsung-i9100-a5346c8874d5186c967b74291c2055d902f7a928-nvram_net.txt_murata" + +sha512sums="a6d602a768e8748c44b5debf2b7388d42c909919fb2b73c0f511ac2bceadac7d7208c6ba94c2df9aa900c9fb446f35f670b0adc552689f8567fa87ded754a947 firmware-samsung-i9100-a5346c8874d5186c967b74291c2055d902f7a928-bcmdhd_sta.bin +4a473740dfb3202e77fdd07c0bfe59c3cd2ea30e3388b7a09c38484408d9253b7e83a96558995e1fce87e00d6a071eec49ee5a10d68c0e05ab6b6a3dd873604e firmware-samsung-i9100-a5346c8874d5186c967b74291c2055d902f7a928-nvram_net.txt" diff --git a/device/testing/linux-samsung-i9100/APKBUILD b/device/testing/linux-samsung-i9100/APKBUILD index 1d380bb4e..57cc78870 100644 --- a/device/testing/linux-samsung-i9100/APKBUILD +++ b/device/testing/linux-samsung-i9100/APKBUILD @@ -3,7 +3,7 @@ pkgname=linux-samsung-i9100 pkgver=3.0.101 -pkgrel=15 +pkgrel=16 pkgdesc="Samsung Galaxy SII kernel fork" arch="armv7" _carch="arm" @@ -68,7 +68,7 @@ package() { } sha512sums="285ffd2c82d0444b99da583573d19443b73de22d7382aae54413af229a28bebf4ea32ecbe248ae54ae64bbbc0af7d722b1ef86d5dd099e2990dcc6284fb195fa linux-samsung-i9100-349a3e91e76d17e67ef6213e1f6712e700695631.tar.gz -1df0e59757b8cdb4f6fc33c7dfa68320ee867888ba2f5d0d24613606c3ed94efe5448d96f691a61f42de10d27231238b544a920f50648c42b75934489283fc73 config-samsung-i9100.armv7 +95c68aa4b62e997c5f13a38912cb7f31769a2360d3ec49dc6352bef14b6607833129b94cea95b08b5bba890da8999047fd900cb70be222c1eb8516e35165d140 config-samsung-i9100.armv7 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7 gcc7-give-up-on-ilog2-const-optimizations.patch 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch dd4094d5f4ec281d32f12af88cb22a782e497c8e52f69cf60b73ac7d6171fc95f1f8040b3d0ad2ff3f016d22ac1d91c5b522e5d03203534a76742bc55a082af5 init" diff --git a/device/testing/linux-samsung-i9100/config-samsung-i9100.armv7 b/device/testing/linux-samsung-i9100/config-samsung-i9100.armv7 index e6c55895f..ac1afd6be 100644 --- a/device/testing/linux-samsung-i9100/config-samsung-i9100.armv7 +++ b/device/testing/linux-samsung-i9100/config-samsung-i9100.armv7 @@ -1417,8 +1417,8 @@ CONFIG_BCM4330=y # CONFIG_BCM4354 is not set # CONFIG_BCM43241 is not set CONFIG_BROADCOM_WIFI=y -CONFIG_BCMDHD_FW_PATH="/lib/firmware/postmarketos/bcmdhd_sta.bin" -CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/postmarketos/nvram_net.txt" +CONFIG_BCMDHD_FW_PATH="/lib/firmware/postmarketos/brcm/brcmfmac4330-sdio.bin" +CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/postmarketos/brcm/brcmfmac4330-sdio.samsung,i9100.txt" CONFIG_BROADCOM_WIFI_RESERVED_MEM=y CONFIG_WLAN_REGION_CODE=100 # CONFIG_HOSTAP is not set