[Feature][ZXW-33]merge ZXW 0428 version
Change-Id: I11f167edfea428d9fab198ff00ff1364932d1b0b
diff --git a/pub/include/infra/pub_debug_info.h b/pub/include/infra/pub_debug_info.h
index 73c79f2..5adb04b 100755
--- a/pub/include/infra/pub_debug_info.h
+++ b/pub/include/infra/pub_debug_info.h
@@ -20,11 +20,20 @@
#define MODULE_ID_CAP_KERNEL_END (300)
#define MODULE_ID_AP_DRIVES_START (301)
-#define MODULE_ID_AP_USB (301)
+#define MODULE_ID_AP_USB (301)
+#define MODULE_ID_AP_REBOOT (302)
+#define MODULE_ID_AP_TSC (303)
+#define MODULE_ID_AP_PSM (304)
+#define MODULE_ID_AP_NAND (305)
+
#define MODULE_ID_AP_DRIVES_END (400)
#define MODULE_ID_CAP_DRIVES_START (401)
#define MODULE_ID_CAP_USB (401)
+#define MODULE_ID_CAP_TSC (402)
+#define MODULE_ID_CAP_PSM (403)
+#define MODULE_ID_CAP_NAND (404)
+
#define MODULE_ID_CAP_DRIVES_END (500)
#define MODULE_ID_AP_FS_START (501)
diff --git a/pub/include/ps_phy/atipsevent.h b/pub/include/ps_phy/atipsevent.h
index f44c93a..a62bde7 100644
--- a/pub/include/ps_phy/atipsevent.h
+++ b/pub/include/ps_phy/atipsevent.h
@@ -1197,7 +1197,7 @@
#define MMIA_AS_QUERY_ZCSQ_REQ_EV (DWORD)(MMIA_AS_EVENT_BASE + 28)
#define MMIA_AS_LBS_REQ_EV (DWORD)(MMIA_AS_EVENT_BASE + 29)
#define MMIA_AS_IMS_DATA_DELETE_REQ_EV (DWORD)(MMIA_AS_EVENT_BASE + 30)
-#define MMIA_L1E_CARD_SWITCH_REQ_EV (DWORD)(MMIA_AS_EVENT_BASE + 31)
+#define MMIA_AS_CARD_SWITCH_REQ_EV (DWORD)(MMIA_AS_EVENT_BASE + 31)
#define MMIA_AS_CARD_SWITCH_IND_EV (DWORD)(MMIA_AS_EVENT_BASE + 32)
#define MMIA_AS_EM_UCELL_INFO_IND_EV (DWORD)(MMIA_AS_RSP_EVENT + 0)
@@ -1239,7 +1239,7 @@
#define MMIA_AS_QUERY_ZCSQ_CNF_EV (DWORD)(MMIA_AS_RSP_EVENT + 36)
#define MMIA_AS_LBS_CNF_EV (DWORD)(MMIA_AS_RSP_EVENT + 37)
#define MMIA_AS_UL_PARAM_IND_EV (DWORD)(MMIA_AS_RSP_EVENT + 38)
-#define MMIA_L1E_CARD_SWITCH_CNF_EV (DWORD)(MMIA_AS_RSP_EVENT + 39)
+#define MMIA_AS_CARD_SWITCH_CNF_EV (DWORD)(MMIA_AS_RSP_EVENT + 39)
/* ========================================================================
PDI - ATI ÏûÏ¢ºÅ¶¨Òå
======================================================================== */
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 0c6d0f6..44951c6 100755
--- a/pub/project/zx297520v3/include/infra/ram_base_config_7520v3.h
+++ b/pub/project/zx297520v3/include/infra/ram_base_config_7520v3.h
@@ -132,9 +132,9 @@
#define DDR_BASE_OFF_RAMDUMP (DDR_BASE_OFF_LTE_DATA + DDR_BASE_LEN_LTE_DATA)
#ifdef _USE_VEHICLE_DC /* ³µÔØË«ºËLinux */
-/* 27.75M£¬AP¹²ºË°æ±¾(´Ë´óСÊÇ°´ÕÕº¬CAPºËµÄ64MÄÚ´æÅäÖö¨Ò壬¸Ãºê±ð´¦²»»á±»Ê¹ÓÃ) */
+/* 33.75M£¬AP¹²ºË°æ±¾(´Ë´óСÊÇ°´ÕÕº¬CAPºËµÄ64MÄÚ´æÅäÖö¨Ò壬¸Ãºê±ð´¦²»»á±»Ê¹ÓÃ) */
#define DDR_BASE_ADDR_AP (DDR_BASE_ADDR_RAMDUMP + DDR_BASE_LEN_RAMDUMP)
-#define DDR_BASE_LEN_AP (0x01BC0000UL>>CPU_SHIFT)
+#define DDR_BASE_LEN_AP (0x021C0000UL>>CPU_SHIFT)
#define DDR_BASE_OFF_AP (DDR_BASE_OFF_RAMDUMP + DDR_BASE_LEN_RAMDUMP)
/* 2M, share memory between ap and cap */
@@ -142,10 +142,13 @@
#define DDR_BASE_LEN_CAP_BUF (0x00200000UL>>CPU_SHIFT)
#define DDR_BASE_OFF_CAP_BUF (DDR_BASE_OFF_AP + DDR_BASE_LEN_AP)
-/* 94M/222M, cap°æ±¾ */
+/* 88M/216M, cap°æ±¾ */
#define DDR_BASE_ADDR_CAP (DDR_BASE_ADDR_CAP_BUF + DDR_BASE_LEN_CAP_BUF)
-#define DDR_BASE_LEN_CAP (0x05E00000UL>>CPU_SHIFT)
+#define DDR_BASE_LEN_CAP (0x05800000UL>>CPU_SHIFT)
#define DDR_BASE_OFF_CAP (DDR_BASE_OFF_CAP_BUF + DDR_BASE_LEN_CAP_BUF)
+
+/* capºËµÄdtbµØÖ·¹©ubootºËcap kernelʹÓà */
+#define DDR_BASE_CAP_DTB_ADDR (DDR_BASE_ADDR_CAP_BUF + (0x00100000UL>>CPU_SHIFT))
#else
/* 42.75M£¬AP¹²ºË°æ±¾(´Ë´óСÊÇ°´ÕÕº¬CAPºËµÄ64MÄÚ´æÅäÖö¨Ò壬¸Ãºê±ð´¦²»»á±»Ê¹ÓÃ) */
#define DDR_BASE_ADDR_AP (DDR_BASE_ADDR_RAMDUMP + DDR_BASE_LEN_RAMDUMP)
diff --git a/pub/project/zx297520v3/include/infra/ram_config_7520v3.h b/pub/project/zx297520v3/include/infra/ram_config_7520v3.h
index 5fa8eaf..ac3306c 100644
--- a/pub/project/zx297520v3/include/infra/ram_config_7520v3.h
+++ b/pub/project/zx297520v3/include/infra/ram_config_7520v3.h
@@ -34,6 +34,10 @@
/*
* MODEM_PA_2_VA ºÍ MODEM_VA_2_PA½öÖ§³ÖDDRºÍIRAM0ÉϵÄÐéÄâµØÖ·/ÎïÀíµØÖ·¼äµÄת»»
*/
+#if _USE_VEHICLE_DC
+unsigned long MODEM_PA_2_VA(unsigned long pa);
+unsigned long MODEM_VA_2_PA(unsigned long va);
+#else
static inline unsigned long MODEM_PA_2_VA(unsigned long pa)
{
if (pa >= (unsigned long)ZX29_IRAM0_PHYS && (pa <= ((unsigned long)ZX29_IRAM0_PHYS + ZX_IRAM0_SIZE)))
@@ -54,6 +58,7 @@
return (unsigned long)(virt_to_phys(va));
}
#endif
+#endif
/*******************************************************************************
* Êý¾ÝÀàÐͶ¨Òå *
diff --git a/pub/project/zx297520v3/include/psm/psm_ram_config_7520v3.h b/pub/project/zx297520v3/include/psm/psm_ram_config_7520v3.h
index 1927198..fecb815 100644
--- a/pub/project/zx297520v3/include/psm/psm_ram_config_7520v3.h
+++ b/pub/project/zx297520v3/include/psm/psm_ram_config_7520v3.h
@@ -328,6 +328,7 @@
#define IRAM_PSPSM_DEBUG_INFO_DRV_ADDR (IRAM_PSPSM_DEBUG_INFO_BASE_ADDR + (0x20>>CPU_SHIFT))
#define IRAM_PSPSM_DEBUG_INFO_PLAT_ADDR (IRAM_PSPSM_DEBUG_INFO_BASE_ADDR + (0x30>>CPU_SHIFT))
#define IRAM_PSPSM_DEBUG_INFO_APP_ADDR (IRAM_PSPSM_DEBUG_INFO_BASE_ADDR + (0x40>>CPU_SHIFT))
+#define IRAM_PSPSM_DEBUG_INFO_L1E1_ADDR (IRAM_PSPSM_DEBUG_INFO_BASE_ADDR + (0x44>>CPU_SHIFT))
#define IRAM_PSPSM_DEBUG_INFO_SYSMODE (*((volatile unsigned long *)IRAM_PSPSM_DEBUG_INFO_SYSMODE_ADDR))
#define IRAM_PSPSM_DEBUG_INFO_COMMON (*((volatile unsigned long *)IRAM_PSPSM_DEBUG_INFO_COMMON_ADDR))
@@ -338,6 +339,7 @@
#define IRAM_PSPSM_DEBUG_INFO_DRV (*((volatile unsigned long *)IRAM_PSPSM_DEBUG_INFO_DRV_ADDR))
#define IRAM_PSPSM_DEBUG_INFO_PLAT (*((volatile unsigned long *)IRAM_PSPSM_DEBUG_INFO_PLAT_ADDR))
#define IRAM_PSPSM_DEBUG_INFO_APP (*((volatile unsigned long *)IRAM_PSPSM_DEBUG_INFO_APP_ADDR))
+#define IRAM_PSPSM_DEBUG_INFO_L1E1 (*((volatile unsigned long *)IRAM_PSPSM_DEBUG_INFO_L1E1_ADDR))
#define IRAM_PHYPSM_DEBUG_INFO1_ADDR (IRAM_PHYPSM_DEBUG_INFO_BASE_ADDR + (0x00>>CPU_SHIFT))
#define IRAM_PHYPSM_DEBUG_INFO2_ADDR (IRAM_PHYPSM_DEBUG_INFO_BASE_ADDR + (0x04>>CPU_SHIFT))