samsung-herolte: fix wifi firmware path (!316)

This patches the path that the kernel tries to load the Wifi chip's
firmware from. If someone with an Galaxy S7 Edge would test this -
although I have no reason to believe that it would not work on the Edge
- then this patch could also be applied to the linux-samsung-hero2lte
package.

[ci:skip-build]: already built successfully in CI
This commit is contained in:
Alexander Polynomdivision 2019-04-13 12:57:00 +02:00 committed by Oliver Smith
parent 1031ff82a6
commit 8a58003d56
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
3 changed files with 29 additions and 5 deletions

View file

@ -0,0 +1,22 @@
--- a/drivers/net/wireless/bcmdhd4359/dhd.h 2019-01-28 13:51:47.000000000 +0100
+++ b/drivers/net/wireless/bcmdhd4359/dhd.h 2019-04-13 12:22:40.501393213 +0200
@@ -2126,18 +2126,7 @@ extern uint dhd_pktgen_len;
extern char fw_path2[MOD_PARAM_PATHLEN];
#endif
-#if defined(ANDROID_PLATFORM_VERSION)
-#if (ANDROID_PLATFORM_VERSION < 7)
-#define DHD_LEGACY_FILE_PATH
-#define VENDOR_PATH "/system"
-#elif (ANDROID_PLATFORM_VERSION == 7)
-#define VENDOR_PATH "/system"
-#elif (ANDROID_PLATFORM_VERSION >= 8)
-#define VENDOR_PATH "/vendor"
-#endif /* ANDROID_PLATFORM_VERSION < 7 */
-#else
-#define VENDOR_PATH ""
-#endif /* ANDROID_PLATFORM_VERSION */
+#define VENDOR_PATH "/lib/firmware/postmarketos"
#ifdef DHD_LEGACY_FILE_PATH
#define PLATFORM_PATH "/data/"

View file

@ -3,7 +3,7 @@
pkgname="linux-samsung-herolte"
pkgver=3.18.133
pkgrel=0
pkgrel=1
pkgdesc="Samsung Galaxy S7 kernel fork"
arch="aarch64"
_carch="arm64"
@ -26,6 +26,7 @@ source="
$_config
01-remove-android-defines.patch
02-fix-dtbtool.patch
03-fix-wifi-firmware-path.patch
"
builddir="$srcdir/${_repository}-${_commit}"
@ -66,6 +67,7 @@ package() {
}
sha512sums="59c128754698259ad7f759def8a82b3f0756404bfe8b474df375c6af0a45b9875ba9a00acca5605b8dcebff4fa5ca1cd20d84d3f398999fe38c3f5837690848c linux-samsung-herolte-24b577569468748591f7be6435af67e17b532886.tar.gz
ee0057fa8996ca62fbb93f76e9220ee6a17aa28abe1280eb215a483a5b31dfec8b69d49eb1f012952d96ec5cd2cb3ce6475ad98f91ea019f66f4e465906b8ea2 config-samsung-herolte.aarch64
59389d636795aca954dc5c263bbcb9c244309fab79f7088818a412b18e893526b5e13138db3b1ae35ea677c74d091e008ec8d057b0752894a620278e98d08c65 config-samsung-herolte.aarch64
66e27a174e12d56f5b77932985f0001b551c834d68b2a1bcc1d0b7d04e555757fc9137c182bd4cf5ffd57bf2cb0918d758dfe153a6140b77f02e7b9f33ecfb2c 01-remove-android-defines.patch
59b7151edece9fec879c12fe53fa4a7d34563c9b7ed45fa5e96036bde7616cac0976adeef54a5f36d883d51747831881b2586ac02ac47db4123c399cf98e93d8 02-fix-dtbtool.patch"
59b7151edece9fec879c12fe53fa4a7d34563c9b7ed45fa5e96036bde7616cac0976adeef54a5f36d883d51747831881b2586ac02ac47db4123c399cf98e93d8 02-fix-dtbtool.patch
ffef99094b44893d07aedf3bbf12b03f2c26fb93be4eb179ade9552ae82be6680daca06b6fc0f95064ef08fd94ef4a0b192a94f5065314a4608de8b8c413d86e 03-fix-wifi-firmware-path.patch"

View file

@ -1688,8 +1688,8 @@ CONFIG_BCM4359=y
# CONFIG_BCM43455 is not set
# CONFIG_BCM4334W is not set
# CONFIG_BCM43454 is not set
CONFIG_BCMDHD_FW_PATH="/vendor/etc/wifi/bcmdhd_sta.bin"
CONFIG_BCMDHD_NVRAM_PATH="/vendor/etc/wifi/nvram_net.txt"
CONFIG_BCMDHD_FW_PATH="/bcmdhd_sta.bin"
CONFIG_BCMDHD_NVRAM_PATH="/nvram_net.txt"
CONFIG_BROADCOM_WIFI_RESERVED_MEM=y
# CONFIG_WIFI_BROADCOM_COB is not set
CONFIG_WLAN_REGION_CODE=100