[Feature][ZXW-130]merge P50U02 version
Only Configure: No
Affected branch: master
Affected module: unknow
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I4f29ec5bb7c59385f23738d2b7ca84e67c100f69
diff --git a/pub/include/infra/pub_flags.h b/pub/include/infra/pub_flags.h
index 07fd7d0..444a200 100755
--- a/pub/include/infra/pub_flags.h
+++ b/pub/include/infra/pub_flags.h
@@ -50,6 +50,11 @@
DUAL_SYSTEM2 = 0x986B, /* µÚ¶þ¸öϵͳ */
} T_BOOT_TARGET;
+#define NVRO_INIT (0) /* initial state */
+#define NVRO_BACKED_UP (0xBACE) /* nvro backed up already */
+#define NVRO_RESTORING (0x2E20) /* nvro restoring */
+#define NVRO_INVALID (0xDEAD) /* nvro invalid */
+
/* ˫ϵͳÀàÐÍ */
typedef enum
{
@@ -87,8 +92,8 @@
T_BOOT_FOTA_FLAG boot_fota_flag;
T_BOOT_ENV boot_env;
T_UBIFS_STATUS ubifs_status;
-
- char reserve[184];
+ unsigned int nvro_flag;
+ char reserve[180];
unsigned int magic_end; /* Êý¾ÝÓÐЧÐÔħÊõ×Ö */
} T_FLAGS_INFO;
diff --git a/pub/include/ps_phy/atipsevent.h b/pub/include/ps_phy/atipsevent.h
old mode 100644
new mode 100755
index a62bde7..9fbc55a
--- a/pub/include/ps_phy/atipsevent.h
+++ b/pub/include/ps_phy/atipsevent.h
@@ -1022,6 +1022,7 @@
#define MMIA_CC_CHLD_CNF_EV (DWORD)(MMIA_CC_RSP_EVENT + 24)
#define MMIA_CC_DTMF_CNF_EV (DWORD)(MMIA_CC_RSP_EVENT + 25)
#define MMIA_CC_CSTA_SET_CNF_EV (DWORD)(MMIA_CC_RSP_EVENT + 26)
+#define MMIA_CC_START_LOCALVOICE_IND_EV (DWORD)(MMIA_CC_RSP_EVENT + 27)
/* ========================================================================
MMIA£SMSÏûÏ¢ºÅ¶¨Òå
diff --git a/pub/project/zx297520v3/include/infra/ram_base_config_7520v3.h b/pub/project/zx297520v3/include/infra/ram_base_config_7520v3.h
index 992d71b..6a1626d 100755
--- a/pub/project/zx297520v3/include/infra/ram_base_config_7520v3.h
+++ b/pub/project/zx297520v3/include/infra/ram_base_config_7520v3.h
@@ -34,6 +34,7 @@
/* 1K, Òì³£ÏòÁ¿±í: 0x82000000/0x41000000 */
#define IRAM_BASE_ADDR_VECTOR (IRAM_BASE_ADDR)
#define IRAM_BASE_LEN_VECTOR ((1 * 1024UL)>>CPU_SHIFT)
+#define OTP_SECURE_PUK_BASE IRAM_BASE_ADDR_VECTOR + 0x4
/* 12K£¬Çý¶¯ºË¼äͨѶ */
#define IRAM_BASE_ADDR_DRV (IRAM_BASE_ADDR_VECTOR + IRAM_BASE_LEN_VECTOR)
@@ -92,11 +93,17 @@
/* phy log¶ªÊ§¸ú×Ù·½°¸¸´Óà IRAM_BASE_ADDR_SYS_TRACE ºó64×Ö½Ú¿Õ¼ä */
#define IRAM_BASE_PHY_LOG_DROP_TRACE (IRAM_BASE_ADDR_ZCAT_PHY_LOG + (0x200>>CPU_SHIFT) - (0x40>>CPU_SHIFT))
-/* ¼Ç¼zcat ģʽ: 4×Ö½Ú¿Õ¼ä*/
-#define IRAM_BASE_ADDR_ZCAT_MODE (IRAM_BASE_PHY_LOG_DROP_TRACE - (0x04>>CPU_SHIFT))
+/* ¼Ç¼ramdumpģʽ: 4×Ö½Ú¿Õ¼ä*/
+#define IRAM_BASE_ADDR_RAMDUMP_MODE (IRAM_BASE_PHY_LOG_DROP_TRACE - (0x04>>CPU_SHIFT))
/* ¼Ç¼SHM bufferµØÖ·: 16×Ö½Ú¿Õ¼ä*/
-#define IRAM_BASE_ADDR_SHM_REMOTE_REGION (IRAM_BASE_ADDR_ZCAT_MODE - (0x10>>CPU_SHIFT))
+#define IRAM_BASE_ADDR_SHM_REMOTE_REGION (IRAM_BASE_ADDR_RAMDUMP_MODE - (0x10>>CPU_SHIFT))
+
+/* ¼Ç¼zcatģʽ: 4×Ö½Ú¿Õ¼ä*/
+#define IRAM_BASE_ADDR_ZCAT_MODE (IRAM_BASE_ADDR_SHM_REMOTE_REGION - (0x04>>CPU_SHIFT))
+
+/* ¸´Óù켣µÄÇ°4¸ö×ֽڼǼboot´«µÝµÄDDR sizeÐÅÏ¢ */
+#define IRAM_BASE_ADDR_BOOT_DDR (IRAM_BASE_ADDR_DRV - (0x04>>CPU_SHIFT))
/* IRAM1»ùµØÖ· */
#ifdef DDR_BASE_ADDR_LINUX_VA