dfu: Fix up the Kconfig mess

[people/ms/u-boot.git] / include / fsl_sec_mon.h

diff --git a/include/fsl_sec_mon.h b/include/fsl_sec_mon.h
index b6794cefcc53b78df3a3df65542aa284ae0971c1..1f31f8865c0af90b287f84133bd7769b5e8f5d4f 100644 (file)
--- a/include/fsl_sec_mon.h
+++ b/include/fsl_sec_mon.h
@@ -34,13 +34,16 @@ struct ccsr_sec_mon_regs {
        u32 hp_stat;    /* 0x08 SEC_MON_HP Status Register */
 };
 
-#define HPCOMR_SW_SV 0x100             /* Security Violation bit */
-#define HPCOMR_SW_FSV 0x200            /* Fatal Security Violation bit */
-#define HPCOMR_SSM_ST 0x1              /* SSM_ST field in SEC_MON command */
+#define HPCOMR_SW_SV           0x100   /* Security Violation bit */
+#define HPCOMR_SW_FSV          0x200   /* Fatal Security Violation bit */
+#define HPCOMR_SSM_ST          0x1     /* SSM_ST field in SEC_MON command */
+#define HPCOMR_SSM_ST_DIS      0x2     /* Disable Secure to Trusted State */
+#define HPCOMR_SSM_SFNS_DIS    0x4     /* Disable Soft Fail to Non-Secure */
 #define HPSR_SSM_ST_CHECK      0x900   /* SEC_MON is in check state */
 #define HPSR_SSM_ST_NON_SECURE 0xb00   /* SEC_MON is in non secure state */
 #define HPSR_SSM_ST_TRUST      0xd00   /* SEC_MON is in trusted state */
 #define HPSR_SSM_ST_SOFT_FAIL  0x300   /* SEC_MON is in soft fail state */
+#define HPSR_SSM_ST_SECURE     0xf00   /* SEC_MON is in secure state */
 #define HPSR_SSM_ST_MASK       0xf00   /* Mask for SSM_ST field */
 
 /*
@@ -53,6 +56,7 @@ enum {
        SEC_MON_SW_SV,
 };
 
-int change_sec_mon_state(uint32_t initial_state, uint32_t final_state);
+/* Transition SEC_MON state */
+int set_sec_mon_state(u32 state);
 
 #endif /* __FSL_SEC_MON_H */