drivers: mtk: connectivity: move wifi firmware to /vendor/firmware

5 files changed, 12 insertions, 12 deletions

diff --git a/drivers/misc/mediatek/connectivity/common/combo/core/include/wmt_conf.h b/drivers/misc/mediatek/connectivity/common/combo/core/include/wmt_conf.h
index cf9d1bc44..80e36f9f2 100644
--- a/drivers/misc/mediatek/connectivity/common/combo/core/include/wmt_conf.h
+++ b/drivers/misc/mediatek/connectivity/common/combo/core/include/wmt_conf.h
@@ -19,7 +19,7 @@
 ********************************************************************************
 */
 #define CUST_CFG_WMT "WMT.cfg"
-#define CUST_CFG_WMT_PREFIX "/system/etc/firmware/"
+#define CUST_CFG_WMT_PREFIX "/system/vendor/firmware/"
 
 /*******************************************************************************
 *                    E X T E R N A L   R E F E R E N C E S
diff --git a/drivers/misc/mediatek/connectivity/common/conn_soc/core/include/wmt_conf.h b/drivers/misc/mediatek/connectivity/common/conn_soc/core/include/wmt_conf.h
index 4c64b6b5e..f42b03b26 100644
--- a/drivers/misc/mediatek/connectivity/common/conn_soc/core/include/wmt_conf.h
+++ b/drivers/misc/mediatek/connectivity/common/conn_soc/core/include/wmt_conf.h
@@ -31,7 +31,7 @@
 ********************************************************************************
 */
 #define CUST_CFG_WMT "WMT_SOC.cfg"
-#define CUST_CFG_WMT_PREFIX "/system/etc/firmware/"
+#define CUST_CFG_WMT_PREFIX "/system/vendor/firmware/"
 
 /*******************************************************************************
 *                    E X T E R N A L   R E F E R E N C E S
diff --git a/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/gl_kal.c b/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/gl_kal.c
index 42828efe7..32529a49d 100644
--- a/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/gl_kal.c
+++ b/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/gl_kal.c
@@ -822,33 +822,33 @@ WLAN_STATUS kalFirmwareOpen(IN P_GLUE_INFO_T prGlueInfo)
 	case WMTHWVER_MT6620_E3:
 	case WMTHWVER_MT6620_E4:
 	case WMTHWVER_MT6620_E5:
-		filp = filp_open("/etc/firmware/" CFG_FW_FILENAME, O_RDONLY, 0);
+		filp = filp_open("/vendor/firmware/" CFG_FW_FILENAME, O_RDONLY, 0);
 		break;
 
 	case WMTHWVER_MT6620_E6:
 	default:
-		filp = filp_open("/etc/firmware/" CFG_FW_FILENAME "_E6", O_RDONLY, 0);
+		filp = filp_open("/vendor/firmware/" CFG_FW_FILENAME "_E6", O_RDONLY, 0);
 		break;
 	}
 #elif defined(MT6628)
-/* filp = filp_open("/etc/firmware/"CFG_FW_FILENAME"_MT6628", O_RDONLY, 0); */
-/* filp = filp_open("/etc/firmware/"CFG_FW_FILENAME"_MT6582", O_RDONLY, 0); */
+/* filp = filp_open("/vendor/firmware/"CFG_FW_FILENAME"_MT6628", O_RDONLY, 0); */
+/* filp = filp_open("/vendor/firmware/"CFG_FW_FILENAME"_MT6582", O_RDONLY, 0); */
 #if 0				/* new wifi ram code mechanism, waiting firmware ready, then we can enable these code */
 	kalMemZero(aucFilePath, sizeof(aucFilePath));
-	kalMemCopy(aucFilePath, "/etc/firmware/" CFG_FW_FILENAME "_AD", sizeof("/etc/firmware/" CFG_FW_FILENAME "_AD"));
+	kalMemCopy(aucFilePath, "/vendor/firmware/" CFG_FW_FILENAME "_AD", sizeof("/vendor/firmware/" CFG_FW_FILENAME "_AD"));
 	filp = filp_open(aucFilePath, O_RDONLY, 0);
 	if (!IS_ERR(filp))
 		goto open_success;
 #endif
 	kalMemZero(aucFilePath, sizeof(aucFilePath));
-	kalMemCopy(aucFilePath, "/etc/firmware/" CFG_FW_FILENAME "_", strlen("/etc/firmware/" CFG_FW_FILENAME "_"));
-	glGetChipInfo(prGlueInfo, &aucFilePath[strlen("/etc/firmware/" CFG_FW_FILENAME "_")]);
+	kalMemCopy(aucFilePath, "/vendor/firmware/" CFG_FW_FILENAME "_", strlen("/vendor/firmware/" CFG_FW_FILENAME "_"));
+	glGetChipInfo(prGlueInfo, &aucFilePath[strlen("/vendor/firmware/" CFG_FW_FILENAME "_")]);
 
 	DBGLOG(INIT, INFO, "open file: %s\n", aucFilePath);
 
 	filp = filp_open(aucFilePath, O_RDONLY, 0);
 #else
-	filp = filp_open("/etc/firmware/" CFG_FW_FILENAME, O_RDONLY, 0);
+	filp = filp_open("/vendor/firmware/" CFG_FW_FILENAME, O_RDONLY, 0);
 #endif
 	if (IS_ERR(filp)) {
 		DBGLOG(INIT, ERROR, "Open FW image: %s failed\n", CFG_FW_FILENAME);
diff --git a/drivers/misc/mediatek/connectivity/wlan/gen3/os/linux/gl_kal.c b/drivers/misc/mediatek/connectivity/wlan/gen3/os/linux/gl_kal.c
index 3dee82f9b..39a6a733a 100644
--- a/drivers/misc/mediatek/connectivity/wlan/gen3/os/linux/gl_kal.c
+++ b/drivers/misc/mediatek/connectivity/wlan/gen3/os/linux/gl_kal.c
@@ -890,7 +890,7 @@ static mm_segment_t orgfs;
 
 static PUINT_8 apucFwPath[] = {
 	(PUINT_8) "/storage/sdcard0/",
-	(PUINT_8) "/etc/firmware/",
+	(PUINT_8) "/vendor/firmware/",
 	NULL
 };
 
diff --git a/drivers/misc/mediatek/wmt_ccci/wmt_cfg_parser.h b/drivers/misc/mediatek/wmt_ccci/wmt_cfg_parser.h
index 54aea826d..0aab3c60b 100644
--- a/drivers/misc/mediatek/wmt_ccci/wmt_cfg_parser.h
+++ b/drivers/misc/mediatek/wmt_ccci/wmt_cfg_parser.h
@@ -56,7 +56,7 @@ extern unsigned int wmtCcciLogLvl;
 #endif
 
 #define WMT_CFG_FILE "WMT_SOC.cfg"
-#define WMT_CFG_FILE_PREFIX "/system/etc/firmware/"
+#define WMT_CFG_FILE_PREFIX "/system/vendor/firmware/"
 
 /*******************************************************************************
 *                             D A T A   T Y P E S