diff mbox

[U-Boot,v2] fsl_sfp : Modify macros as per changes in SFP v3.4

Message ID 1473265054-28360-1-git-send-email-sumit.garg@nxp.com
State Accepted
Commit abd9c1bbfbdc9fbef0f178321c43e6fac108520a
Delegated to: York Sun
Headers show

Commit Message

Sumit Garg Sept. 7, 2016, 4:17 p.m. UTC 
SFP v3.4 supports 8 keys in SRK table which leads to corresponding
changes in OSPR key revocation field. So modify OSPR_KEY_REVOC_XXX
macros accordingly.

Signed-off-by: Sumit Garg <sumit.garg@nxp.com>
---

Changes in v2:
Corrected commit message. Also removed whitspace changes in this patch.

 include/fsl_sfp.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

Comments

York Sun Oct. 8, 2016, 5:16 p.m. UTC | #1 
On 09/06/2016 11:47 PM, Sumit Garg wrote:
> SFP v3.4 supports 8 keys in SRK table which leads to corresponding
> changes in OSPR key revocation field. So modify OSPR_KEY_REVOC_XXX
> macros accordingly.
>
> Signed-off-by: Sumit Garg <sumit.garg@nxp.com>
> ---
>
> Changes in v2:
> Corrected commit message. Also removed whitspace changes in this patch.
>


Applied to fsl-qoriq master, awaiting upstream. Thanks.

York
diff mbox

Patch

diff --git a/include/fsl_sfp.h b/include/fsl_sfp.h
index 2976a2c..d3a2813 100644
--- a/include/fsl_sfp.h
+++ b/include/fsl_sfp.h
@@ -78,9 +78,16 @@  struct ccsr_sfp_regs {
 	u32 fsl_uid;	/* 0xB0  FSL Unique ID */
 };
 #endif
+
 #define ITS_MASK	0x00000004
 #define ITS_BIT		2
-#define OSPR_KEY_REVOC_SHIFT	13
-#define OSPR_KEY_REVOC_MASK	0x0000e000
+
+#if defined(CONFIG_SYS_FSL_SFP_VER_3_4)
+#define OSPR_KEY_REVOC_SHIFT    9
+#define OSPR_KEY_REVOC_MASK     0x0000fe00
+#else
+#define OSPR_KEY_REVOC_SHIFT    13
+#define OSPR_KEY_REVOC_MASK     0x0000e000
+#endif /* CONFIG_SYS_FSL_SFP_VER_3_4 */
 
 #endif