diff options
12 files changed, 23 insertions, 23 deletions
diff --git a/drivers/misc/mediatek/c2k_ccci/modem_sdio.h b/drivers/misc/mediatek/c2k_ccci/modem_sdio.h index c506f51e7..ebda4f3fe 100644 --- a/drivers/misc/mediatek/c2k_ccci/modem_sdio.h +++ b/drivers/misc/mediatek/c2k_ccci/modem_sdio.h @@ -387,7 +387,7 @@ enum { // Image type and header defination part //================================================================================= -#define C2K_IMG_PATH "/etc/firmware/modem_3_3g_n.img" +#define C2K_IMG_PATH "/vendor/etc/firmware/modem_3_3g_n.img" typedef enum{ MD_BOOTING = 0, 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 80e36f9f2..9d8062bb7 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/vendor/firmware/" +#define CUST_CFG_WMT_PREFIX "/vendor/etc/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 f42b03b26..0eebded99 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/vendor/firmware/" +#define CUST_CFG_WMT_PREFIX "/vendor/etc/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_init.c b/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/gl_init.c index 6a8b2a588..104789d47 100644 --- a/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/gl_init.c +++ b/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/gl_init.c @@ -2902,9 +2902,9 @@ static INT_32 wlanProbe(PVOID pvData) } else if (kalReadToFile("/data/misc/wifi/wifi.cfg", pucConfigBuf, WLAN_CFG_FILE_BUF_SIZE, &u4ConfigReadLen) == 0) { DBGLOG(INIT, LOUD, "CFG_FILE: Read /data/misc/wifi/wifi.cfg\n"); - } else if (kalReadToFile("/etc/firmware/wifi.cfg", + } else if (kalReadToFile("/vendor/etc/firmware/wifi.cfg", pucConfigBuf, WLAN_CFG_FILE_BUF_SIZE, &u4ConfigReadLen) == 0) { - DBGLOG(INIT, LOUD, "CFG_FILE: Read /etc/firmware/wifi.cfg\n"); + DBGLOG(INIT, LOUD, "CFG_FILE: Read /vendor/etc/firmware/wifi.cfg\n"); } if (pucConfigBuf[0] != '\0' && u4ConfigReadLen > 0) 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 32529a49d..78f3facda 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("/vendor/firmware/" CFG_FW_FILENAME, O_RDONLY, 0); + filp = filp_open("/vendor/etc/firmware/" CFG_FW_FILENAME, O_RDONLY, 0); break; case WMTHWVER_MT6620_E6: default: - filp = filp_open("/vendor/firmware/" CFG_FW_FILENAME "_E6", O_RDONLY, 0); + filp = filp_open("/vendor/etc/firmware/" CFG_FW_FILENAME "_E6", O_RDONLY, 0); break; } #elif defined(MT6628) -/* filp = filp_open("/vendor/firmware/"CFG_FW_FILENAME"_MT6628", O_RDONLY, 0); */ -/* filp = filp_open("/vendor/firmware/"CFG_FW_FILENAME"_MT6582", O_RDONLY, 0); */ +/* filp = filp_open("/vendor/etc/firmware/"CFG_FW_FILENAME"_MT6628", O_RDONLY, 0); */ +/* filp = filp_open("/vendor/etc/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, "/vendor/firmware/" CFG_FW_FILENAME "_AD", sizeof("/vendor/firmware/" CFG_FW_FILENAME "_AD")); + kalMemCopy(aucFilePath, "/vendor/etc/firmware/" CFG_FW_FILENAME "_AD", sizeof("/vendor/etc/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, "/vendor/firmware/" CFG_FW_FILENAME "_", strlen("/vendor/firmware/" CFG_FW_FILENAME "_")); - glGetChipInfo(prGlueInfo, &aucFilePath[strlen("/vendor/firmware/" CFG_FW_FILENAME "_")]); + kalMemCopy(aucFilePath, "/vendor/etc/firmware/" CFG_FW_FILENAME "_", strlen("/vendor/etc/firmware/" CFG_FW_FILENAME "_")); + glGetChipInfo(prGlueInfo, &aucFilePath[strlen("/vendor/etc/firmware/" CFG_FW_FILENAME "_")]); DBGLOG(INIT, INFO, "open file: %s\n", aucFilePath); filp = filp_open(aucFilePath, O_RDONLY, 0); #else - filp = filp_open("/vendor/firmware/" CFG_FW_FILENAME, O_RDONLY, 0); + filp = filp_open("/vendor/etc/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/dual_ccci/ccci_chrdev.c b/drivers/misc/mediatek/dual_ccci/ccci_chrdev.c index b04383ec5..90f49252a 100644 --- a/drivers/misc/mediatek/dual_ccci/ccci_chrdev.c +++ b/drivers/misc/mediatek/dual_ccci/ccci_chrdev.c @@ -39,7 +39,7 @@ static unsigned int md_sbp_code_default = 0; #endif #ifndef CONFIG_MODEM_FIRMWARE_PATH -#define CONFIG_MODEM_FIRMWARE_PATH "/etc/firmware/" +#define CONFIG_MODEM_FIRMWARE_PATH "/vendor/etc/firmware/" #endif static char * type_str[] = { [modem_invalid]="invalid", diff --git a/drivers/misc/mediatek/eemcs/eemcs_boot.h b/drivers/misc/mediatek/eemcs/eemcs_boot.h index 3bc67bf2d..abe490c47 100644 --- a/drivers/misc/mediatek/eemcs/eemcs_boot.h +++ b/drivers/misc/mediatek/eemcs/eemcs_boot.h @@ -20,7 +20,7 @@ #define BOOT_TX_MAX_PKT_LEN (2095- 255) // Max Tx packet size of xBoot -#define CONFIG_MODEM_FIRMWARE_FOLDER "/etc/firmware/" +#define CONFIG_MODEM_FIRMWARE_FOLDER "/vendor/etc/firmware/" #define CONFIG_MODEM_FIRMWARE_CIP_FOLDER "/custom/etc/firmware/" #define EXT_MD_POST_FIX_LEN (20) diff --git a/drivers/misc/mediatek/eemcs/eemcs_expt.c b/drivers/misc/mediatek/eemcs/eemcs_expt.c index 70b91b393..a8ca4dc11 100644 --- a/drivers/misc/mediatek/eemcs/eemcs_expt.c +++ b/drivers/misc/mediatek/eemcs/eemcs_expt.c @@ -1139,7 +1139,7 @@ void eemcs_expt_reset_statistics(void) } #define EEMCS_EXCEPTION_LOG_TO_FILE 1 -#define EEMCS_EXCEPTION_LOG_PATH "/system/etc/firmware" +#define EEMCS_EXCEPTION_LOG_PATH "/vendor/etc/firmware" /* * @brief Flush all packets in exception instance to files for debugging diff --git a/drivers/misc/mediatek/eemcs/eemcs_fs_ut.c b/drivers/misc/mediatek/eemcs/eemcs_fs_ut.c index 827eb6049..e5997741d 100644 --- a/drivers/misc/mediatek/eemcs/eemcs_fs_ut.c +++ b/drivers/misc/mediatek/eemcs/eemcs_fs_ut.c @@ -62,7 +62,7 @@ #define MD_ROOT_DIR "Z:" #define DSP_ROOT_DIR "Y:" #define FS_ROOT_DIR "/data/nvram/md1" -#define FS_DSP_ROOT_DIR "/system/etc/firmware" +#define FS_DSP_ROOT_DIR "/vendor/etc/firmware" #define MAX_FS_PKT_BYTE (0x1000 - 128) #define CCCI_FS_REQ_SEND_AGAIN 0x80000000 diff --git a/drivers/misc/mediatek/mach/mt6735/include/mach/md32_helper.h b/drivers/misc/mediatek/mach/mt6735/include/mach/md32_helper.h index 5e2694897..87fa1254a 100644 --- a/drivers/misc/mediatek/mach/mt6735/include/mach/md32_helper.h +++ b/drivers/misc/mediatek/mach/mt6735/include/mach/md32_helper.h @@ -40,11 +40,11 @@ extern struct md32_regs md32reg; #define MD32_AED_STR_LEN (512) #ifdef CONFIG_MTK_LDVT - #define MD32_DATA_IMAGE_PATH "/system/etc/firmware/md32_d.bin" - #define MD32_PROGRAM_IMAGE_PATH "/system/etc/firmware/md32_p.bin" + #define MD32_DATA_IMAGE_PATH "/vendor/etc/firmware/md32_d.bin" + #define MD32_PROGRAM_IMAGE_PATH "/vendor/etc/firmware/md32_p.bin" #else - #define MD32_DATA_IMAGE_PATH "/etc/firmware/md32_d.bin" - #define MD32_PROGRAM_IMAGE_PATH "/etc/firmware/md32_p.bin" + #define MD32_DATA_IMAGE_PATH "/vendor/etc/firmware/md32_d.bin" + #define MD32_PROGRAM_IMAGE_PATH "/vendor/etc/firmware/md32_p.bin" #endif /* Support dynamic TCM data/program swap macro */ //#define DYNAMIC_TCM_SWAP diff --git a/drivers/misc/mediatek/wmt_ccci/wmt_cfg_parser.h b/drivers/misc/mediatek/wmt_ccci/wmt_cfg_parser.h index 0aab3c60b..70ec83575 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/vendor/firmware/" +#define WMT_CFG_FILE_PREFIX "/vendor/etc/firmware/" /******************************************************************************* * D A T A T Y P E S diff --git a/include/mach/mt_ccci_common.h b/include/mach/mt_ccci_common.h index 96a07a1de..9e066be87 100644 --- a/include/mach/mt_ccci_common.h +++ b/include/mach/mt_ccci_common.h @@ -65,7 +65,7 @@ typedef enum { // image name/path #define MOEDM_IMAGE_NAME "modem.img" #define DSP_IMAGE_NAME "DSP_ROM" -#define CONFIG_MODEM_FIRMWARE_PATH "/etc/firmware/" +#define CONFIG_MODEM_FIRMWARE_PATH "/vendor/etc/firmware/" #define CONFIG_MODEM_FIRMWARE_CIP_PATH "/custom/etc/firmware/" #define IMG_ERR_STR_LEN 64 |
