From: Nolen Johnson <johnsonnolen@gmail.com>
Date: Fri, 2 Feb 2024 06:58:22 +0000 (-0500)
Subject: sabrina-fw: sabrina_prod_stable-user 12 STTL.231114.004 11218674 release-keys
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b81ae7af125af6646246fa7b9c2b617d8ac91524;p=GitHub%2FLineageOS%2FG12%2Fandroid_hardware_amlogic_kernel-modules_dhd-driver.git

sabrina-fw: sabrina_prod_stable-user 12 STTL.231114.004 11218674 release-keys

Change-Id: I3c2fd9be32ec8c266559a5883b57251fd005db9b
---

diff --git a/firmware/bluetooth/bcm4359c0/sabrina/BCM4359C0.hcd b/firmware/bluetooth/bcm4359c0/sabrina/BCM4359C0.hcd
index 6568a3c..bbc758e 100644
Binary files a/firmware/bluetooth/bcm4359c0/sabrina/BCM4359C0.hcd and b/firmware/bluetooth/bcm4359c0/sabrina/BCM4359C0.hcd differ
diff --git a/firmware/wifi/bcm4359c0_ag/sabrina/config.txt b/firmware/wifi/bcm4359c0_ag/sabrina/config.txt
new file mode 100644
index 0000000..d4ae36f
--- /dev/null
+++ b/firmware/wifi/bcm4359c0_ag/sabrina/config.txt
@@ -0,0 +1,26 @@
+country_list= \
+    WW:WW/68, \
+    EU:EU/68, \
+    US:US/68, \
+    CA:CA/68, \
+    JP:JP/68, \
+    GB:GB/68, \
+    IE:IE/68, \
+    DE:DE/68, \
+    FR:FR/68, \
+    NL:NL/68, \
+    BE:BE/68, \
+    AT:AT/68, \
+    CH:CH/68, \
+    NO:NO/68, \
+    FI:FI/68, \
+    SE:SE/68, \
+    DK:DK/68, \
+    IT:IT/68, \
+    ES:ES/68, \
+    AU:AU/68, \
+    NZ:NZ/68, \
+    KR:KR/68, \
+    BR:BR/68
+ccode=US
+wl_dbg_level=1
diff --git a/firmware/wifi/bcm4359c0_ag/sabrina/config_bcm4359c0_ag.txt b/firmware/wifi/bcm4359c0_ag/sabrina/config_bcm4359c0_ag.txt
deleted file mode 100644
index 262296d..0000000
--- a/firmware/wifi/bcm4359c0_ag/sabrina/config_bcm4359c0_ag.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-country_list= \
-    WW:WW/68, \
-    EU:EU/68, \
-    US:US/68, \
-    CA:CA/68, \
-    JP:JP/68, \
-    GB:GB/68, \
-    IE:IE/68, \
-    DE:DE/68, \
-    FR:FR/68, \
-    NL:NL/68, \
-    BE:BE/68, \
-    AT:AT/68, \
-    CH:CH/68, \
-    NO:NO/68, \
-    FI:FI/68, \
-    SE:SE/68, \
-    DK:DK/68, \
-    IT:IT/68, \
-    ES:ES/68, \
-    AU:AU/68, \
-    NZ:NZ/68, \
-    KR:KR/68
-ccode=WW
-wl_dbg_level=1
diff --git a/firmware/wifi/bcm4359c0_ag/sabrina/fw_bcm4359c0_ag.bin b/firmware/wifi/bcm4359c0_ag/sabrina/fw_bcm4359c0_ag.bin
index e1215e1..9795a52 100644
Binary files a/firmware/wifi/bcm4359c0_ag/sabrina/fw_bcm4359c0_ag.bin and b/firmware/wifi/bcm4359c0_ag/sabrina/fw_bcm4359c0_ag.bin differ
diff --git a/firmware/wifi/bcm4359c0_ag/sabrina/nvram_ap6398s.txt b/firmware/wifi/bcm4359c0_ag/sabrina/nvram_ap6398s.txt
index 3380fe5..c7a8c2a 100644
--- a/firmware/wifi/bcm4359c0_ag/sabrina/nvram_ap6398s.txt
+++ b/firmware/wifi/bcm4359c0_ag/sabrina/nvram_ap6398s.txt
@@ -177,7 +177,7 @@ rssi_delta_2g_c1=-2,-1,-2,-1
 muxenab=0x10
 cck_onecore_tx=1
 #avs_enab=1
-ocl=1
+ocl=0
 # ###########  BTC Dynctl profile params  ############
 # flags:bit0 - dynctl enabled, bit1 dynamic desense, bit2 dynamic mode
 btcdyn_flags=0x0
diff --git a/firmware/wifi/wifi.mk b/firmware/wifi/wifi.mk
index 910d258..d1abbd8 100644
--- a/firmware/wifi/wifi.mk
+++ b/firmware/wifi/wifi.mk
@@ -38,7 +38,7 @@ PRODUCT_COPY_FILES += \
 # bcm4359c0_ag ap6398s
 ifneq ($(filter %sabrina,$(TARGET_PRODUCT)),)
 PRODUCT_COPY_FILES += \
-    $(WIFI_FIRMWARE_PATH)/bcm4359c0_ag/sabrina/config_bcm4359c0_ag.txt:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/buildin/config_bcm4359c0_ag.txt \
+    $(WIFI_FIRMWARE_PATH)/bcm4359c0_ag/sabrina/config.txt:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/buildin/config.txt \
     $(WIFI_FIRMWARE_PATH)/bcm4359c0_ag/sabrina/fw_bcm4359c0_ag.bin:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/buildin/fw_bcm4359c0_ag.bin \
     $(WIFI_FIRMWARE_PATH)/bcm4359c0_ag/sabrina/nvram_ap6398s.txt:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/buildin/nvram_ap6398s.txt
 else