[Feature][ZXW-452]merge P54U02 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: I17e6795ab66e2b9d1cbbfec4b7c0028d666e177d
diff --git a/pub/include/infra/pub_debug_info.h b/pub/include/infra/pub_debug_info.h
index 93b5a80..10357aa 100755
--- a/pub/include/infra/pub_debug_info.h
+++ b/pub/include/infra/pub_debug_info.h
@@ -26,6 +26,7 @@
 #define MODULE_ID_AP_PSM			(304)
 #define MODULE_ID_AP_NAND			(305)
 #define MODULE_ID_AP_MMC			(306)
+#define MODULE_ID_AP_WIFI			(307)
 #define MODULE_ID_AP_DRIVES_END		(400)
 
 #define MODULE_ID_CAP_DRIVES_START	(401)
@@ -35,6 +36,7 @@
 #define MODULE_ID_CAP_NAND			(404)
 #define MODULE_ID_CAP_SPI			(405)
 #define MODULE_ID_CAP_MMC			(406)
+#define MODULE_ID_CAP_UART			(407)
 #define MODULE_ID_CAP_DRIVES_END	(500)
 
 #define MODULE_ID_AP_FS_START		(501)
diff --git a/pub/include/infra/pub_flags.h b/pub/include/infra/pub_flags.h
index 107cc5f..5ec8b26 100755
--- a/pub/include/infra/pub_flags.h
+++ b/pub/include/infra/pub_flags.h
@@ -54,6 +54,7 @@
 
 #define NVRO_INIT        (0)       /* initial state */
 #define NVRO_BACKED_UP   (0xBACE)  /* nvro backed up already */
+#define NVRO_BACKING_UP  (0xBAC1)  /* nvro back up next boot */
 #define NVRO_RESTORING   (0x2E20)  /* nvro restoring  */
 #define NVRO_INVALID     (0xDEAD)  /* nvro invalid */