huawei-warsaw: add firmware package and Wifi functionality (MR 2221)

[ci:skip-build]: already built successfully in CI

device/testing/device-huawei-warsaw/APKBUILD

@@ -2,13 +2,14 @@
 pkgname=device-huawei-warsaw
 pkgdesc="Huawei P10 Lite"
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="postmarketos-base linux-huawei-warsaw mkbootimg mesa-dri-gallium msm-fb-refresher"
 makedepends="devicepkg-dev"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo"
 
 build() {
@@ -19,4 +20,10 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-huawei-warsaw hisi-wlan"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="1d677f67178d34509af45f620a79657ccbe53d5e9e050686be941a62eed47a7b3850f0c5c63cefa45cfa3fda9e8bb2dcda54c8ce26ae1227da0a646d3e20bdcc  deviceinfo"

device/testing/firmware-huawei-warsaw/APKBUILD

@@ -0,0 +1,35 @@
+# Maintainer: Ignacy Kuchciński <ignacykuchcinski@gmail.com>
+pkgname=firmware-huawei-warsaw
+pkgver=1
+pkgrel=0
+pkgdesc="Huawei P10 Lite Firmware"
+url="https://gitlab.com/ignapk/warsaw-firmware"
+arch="aarch64"
+license="proprietary"
+options="!check !strip !archcheck !spdx"
+
+# Source
+_commit="ce27f92d3d2af58150cefe0877cf6940b865dc28"
+_repository="warsaw-firmware"
+_url="https://gitlab.com/ignapk"
+source="$_repository-$_commit.tar.gz::$_url/$_repository/-/archive/$_commit.tar.gz"
+
+package() {
+	# Wifi
+	install -Dm644 "$srcdir/$_repository-$_commit/CPU_RAM_SCHED.bin" \
+		"$pkgdir/lib/firmware/postmarketos/CPU_RAM_SCHED.bin"
+	install -Dm644 "$srcdir/$_repository-$_commit/CPU_RAM_WBS.bin" \
+		"$pkgdir/lib/firmware/postmarketos/CPU_RAM_WBS.bin"
+	install -Dm644 "$srcdir/$_repository-$_commit/bfgx_and_wifi_cfg" \
+		"$pkgdir/lib/firmware/postmarketos/bfgx_and_wifi_cfg"
+	install -Dm644 "$srcdir/$_repository-$_commit/bfgx_cfg" \
+		"$pkgdir/lib/firmware/postmarketos/bfgx_cfg"
+	install -Dm644 "$srcdir/$_repository-$_commit/cr4_asic.bin" \
+		"$pkgdir/lib/firmware/postmarketos/cr4_asic.bin"
+	install -Dm644 "$srcdir/$_repository-$_commit/wifi_cfg" \
+		"$pkgdir/lib/firmware/postmarketos/wifi_cfg"
+}
+
+sha512sums="
+f30151200f1c554445e1dc451cd8c7bfb5a9dbb1c048eb468da714b72d00caea273333ebd749a58e78ad526715782b02691a896c6d9de076bd106bcf41ffaf4a  warsaw-firmware-ce27f92d3d2af58150cefe0877cf6940b865dc28.tar.gz
+"

device/testing/linux-huawei-warsaw/06-change-bfgx-and-wifi-cfg-paths.patch

@@ -0,0 +1,17 @@
+diff --git a/drivers/connectivity/hisi/platform/pm/plat_firmware.c b/drivers/connectivity/hisi/platform/pm/plat_firmware.c
+index 9eb6ad8f3b78..8987eb0e4973 100755
+--- a/drivers/connectivity/hisi/platform/pm/plat_firmware.c
++++ b/drivers/connectivity/hisi/platform/pm/plat_firmware.c
+@@ -60,9 +60,9 @@
+ /*****************************************************************************
+   2 şęś¨Ňĺ
+ *****************************************************************************/
+-#define BFGX_AND_WIFI_CFG_PATH        "/vendor/firmware/bfgx_and_wifi_cfg"
+-#define WIFI_CFG_PATH                 "/vendor/firmware/wifi_cfg"
+-#define BFGX_CFG_PATH                 "/vendor/firmware/bfgx_cfg"
++#define BFGX_AND_WIFI_CFG_PATH        "/lib/firmware/postmarketos/bfgx_and_wifi_cfg"
++#define WIFI_CFG_PATH                 "/lib/firmware/postmarketos/wifi_cfg"
++#define BFGX_CFG_PATH                 "/lib/firmware/postmarketos/bfgx_cfg"
+ #define RAM_CHECK_CFG_PATH            "/vendor/firmware/ram_reg_test_cfg"
+ 
+ #define BFGX_AND_WIFI_CFG_BUILDIN_PATH        "/bfgx_and_wifi_cfg"

device/testing/linux-huawei-warsaw/APKBUILD

@@ -2,7 +2,7 @@
 # Kernel config based on: arch/arm64/configs/merge_hi6250_defconfig
 
 pkgname=linux-huawei-warsaw
-pkgver=4.4.159
+pkgver=4.4.174
 pkgrel=0
 pkgdesc="Huawei P10 Lite kernel fork"
 arch="aarch64"
@@ -26,6 +26,7 @@ source="
 	03_fix_dtc.patch
 	04_make_rdr_hisi_adapter_compileable.patch
 	05-disable-huawei-bfmr.patch
+	06-change-bfgx-and-wifi-cfg-paths.patch
 "
 builddir="$srcdir/$_repository-$_commit"
 _outdir="out"
@@ -45,11 +46,14 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir"
 }
 
-sha512sums="457975f60727cb0d6e0a62a2706fc37431480f47635b8deed178843d71a8ae9f0893f33e84b0b41dbfe33e47c7b4b05aa99efbc57fa4411bdbf48395b3340f3e  linux-huawei-warsaw-f148d781c3d6bad4bae8d1c4073e233abeca9c96.tar.gz
+sha512sums="
+457975f60727cb0d6e0a62a2706fc37431480f47635b8deed178843d71a8ae9f0893f33e84b0b41dbfe33e47c7b4b05aa99efbc57fa4411bdbf48395b3340f3e  linux-huawei-warsaw-f148d781c3d6bad4bae8d1c4073e233abeca9c96.tar.gz
 512b7ed7bfc40198317a84f233d77f41420e7a467349c280994cf5e8a29e9b3cd5a08540da1793f3a060139442fef36038409aa94955ee83a8332a0e70b6cc1e  config-huawei-warsaw.aarch64
 eaf2e61fcb508cdd239b8fed209d2a09ecac77287f6b46d003918fdf1c6fa2ee63f7390f3ff7c49029b8ed6cbcdd81c7e9a4b1ece9f5060b6fc84e322bd47f41  linux4.2-gcc10-extern_YYLOC_global_declaration.patch
 e72fdbde8746f29af60065b765a75e5475ba859bf545e2074609a075aebb6700024fe289ed56ab49bd8f55cb3597ea8e01b465b85d51675b1f45db88a8ebd9ae  01_remove_wireguard.patch
 03df93e697a1a63bb6003af569850f7bb54749127b8cef8d9c0aa9be1487b9e33e5454d258454d01d8e70ad776e8b4730569549390d327f0cf0d50a5334b8f7e  02_fix_undeclared_AID_INET.patch
 3c7120bf70cdf508f2d5c919d1e0fa9e716882e3774e146ab953e9708f353d0e71af5325e0e9c881601aa90d6f131892b2f7e8b9bd774b4f993d17da189e5141  03_fix_dtc.patch
 cdc60b6c829df3b014226b9cb506ed71cf005cf5fec8d4339b54a23f052465501aaa4983ec00f33ef301db2e6a70b24a30439b3f6ce8f7c00348c05d3132ec3f  04_make_rdr_hisi_adapter_compileable.patch
-6e420722576111a7ba49f265a66de632631c13d1bdb67553916d2156149226526daedc8298d83a38115c0a7189497cdb92b0daa0a263a92e6093f575e855a6e5  05-disable-huawei-bfmr.patch"
+6e420722576111a7ba49f265a66de632631c13d1bdb67553916d2156149226526daedc8298d83a38115c0a7189497cdb92b0daa0a263a92e6093f575e855a6e5  05-disable-huawei-bfmr.patch
+ebba6534c200dd174e0ea8915c88e7fe4cf5a5ffb59b21ab4dcf25a64bfd3ba8b9be027e1c29f7c39aa86f659431e1819371fe7d3bd78ccbd8aab82ff164671f  06-change-bfgx-and-wifi-cfg-paths.patch
+"