[Feature][task-view-998]merge P56U10 version, ZXW code
Only Configure: No
Affected branch: master
Affected module: unknow
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: No
Doc Update: No
Change-Id: I466f2ab935c5ede0be1803c75518b2cc4f939c15
diff --git a/boot/common/src/uboot/arch/arm/lib/bootm.c b/boot/common/src/uboot/arch/arm/lib/bootm.c
index 914259d..1edbc40 100755
--- a/boot/common/src/uboot/arch/arm/lib/bootm.c
+++ b/boot/common/src/uboot/arch/arm/lib/bootm.c
@@ -197,6 +197,11 @@
setup_end_tag(bd);
#endif
+ /*copy ?D????3¨¬1¨¬?¡ê to IRAM1_BASE_ADDR+0x2800 */
+ memcpy(IRAM1_BASE_ADDR+0x2800, IRAM_BASE_ADDR_OS_STATISTIC, IRAM_BASE_LEN_OS_STATISTIC );
+ //printf("0x%x,0x%x, value1:0x%x,value2:0x%x; value3:0x%x; \n",
+ // IRAM1_BASE_ADDR+0x2800, IRAM_BASE_ADDR_OS_STATISTIC,readl(IRAM1_BASE_ADDR+0x2804),readl(IRAM_BASE_ADDR_OS_STATISTIC),readl(IRAM1_BASE_ADDR+0x2c00));
+
//#ifdef CONFIG_ZX297520V3E_WATCH_CAP
#if defined(CONFIG_ZX297520V3E_WATCH_CAP) || defined (CONFIG_ZX297520V3E_VEHICLE_DC) || defined (CONFIG_ZX297520V3E_VEHICLE_DC_REF)
memset(ICP_CAP_BUF_ADDR, 0, ICP_CAP_BUF_LEN);
diff --git a/boot/common/src/uboot/drivers/power/zx234290.c b/boot/common/src/uboot/drivers/power/zx234290.c
index 6e82f81..fbd0f9a 100755
--- a/boot/common/src/uboot/drivers/power/zx234290.c
+++ b/boot/common/src/uboot/drivers/power/zx234290.c
@@ -280,6 +280,7 @@
switch (reg_user)
{
case ZX234290_USER_RST_TO_NORMAL:
+ case ZX234290_USER_RST_TO_EXCEPT:
{
s_boot_reason = RB_RESET_NOMAL;
return 0;
@@ -289,13 +290,13 @@
{
s_boot_reason = RB_RESET_USB_OFF;
return 0;
- }
+ }
case ZX234290_USER_RST_TO_ALARM:
- {
+ {
s_boot_reason = RB_RESET_ALARM;
return 0;
- }
+ }
/* ZX234290_REG_USERΪÉϵ縴λֵ»ò·Ç·¨Öµ */
default: