[Feature][ZXW-33]merge ZXW 0428 version

Change-Id: I11f167edfea428d9fab198ff00ff1364932d1b0b
diff --git a/cp/ps/driver/inc/misc/drvs_efuse.h b/cp/ps/driver/inc/misc/drvs_efuse.h
index 2cca866..165021e 100644
--- a/cp/ps/driver/inc/misc/drvs_efuse.h
+++ b/cp/ps/driver/inc/misc/drvs_efuse.h
@@ -49,6 +49,8 @@
 	DEVICE_ID,

 	MAX_ENUM

 }E_ZDrvEfuse_SecureMsg;

+#else

+#include <linux/soc/zte/efuse/efuse_zx.h>

 #endif

 

 /****************************************************************************

@@ -76,8 +78,6 @@
 *******************************************************************************/

 UINT32 zDrvEfuse_IsSpe(VOID);

 

-#ifndef _OS_LINUX

-

 /*******************************************************************************

  * Function: zDrvEfuse_GetSecureMsg

  * Description:¸Ãº¯ÊýÓÃÓÚ»ñÈ¡¹«Ô¿¶Ô¡¢°²È«¿ªÆô±ê¼Ç¡¢¹«Ô¿hashÖµ¡¢É豸ID¡£

@@ -90,8 +90,9 @@
  *

  * Others:

  ********************************************************************************/

-VOID zDrvEfuse_GetSecureMsg(T_ZDrvEfuse_Secure *secure);

+extern VOID zDrvEfuse_GetSecureMsg(T_ZDrvEfuse_Secure *secure);

 

+#ifndef _OS_LINUX

 /*******************************************************************************

 * Function:     zDrvEfuse_SetSecureMsg

 * Description:¸Ãº¯ÊýÓÃÓÚÉèÖð²È«¿ªÆô±ê¼Ç¡¢¹«Ô¿hashÖµ¡¢É豸ID¡£