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

Change-Id: I25a72f923f2842f3e76bd7f355c41b63b922c57e

diff --git a/firmware/wifi/bcm4359c0_ag/sabrina/config.txt b/firmware/wifi/bcm4359c0_ag/sabrina/config.txt
deleted file mode 100644 (file)
index d4ae36f..0000000
--- a/firmware/wifi/bcm4359c0_ag/sabrina/config.txt
+++ /dev/null
@@ -1,26 +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, \
-    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
new file mode 100644 (file)
index 0000000..d4ae36f
--- /dev/null
+++ b/firmware/wifi/bcm4359c0_ag/sabrina/config_bcm4359c0_ag.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/wifi.mk b/firmware/wifi/wifi.mk
index c87cb7e45d128066ad259e8bd6e79b0ae51224c1..e83c5f44b01b3577e21f816bdefc1d022a79682a 100644 (file)
--- 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.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/wifi/config.txt \
+    $(WIFI_FIRMWARE_PATH)/bcm4359c0_ag/sabrina/config_bcm4359c0_ag.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/wifi/config_bcm4359c0_ag.txt \
     $(WIFI_FIRMWARE_PATH)/bcm4359c0_ag/sabrina/fw_bcm4359c0_ag.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/wifi/fw_bcm4359c0_ag.bin \
     $(WIFI_FIRMWARE_PATH)/bcm4359c0_ag/sabrina/nvram_ap6398s.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/wifi/nvram_ap6398s.txt
 else