From: Sumit Garg <sumit.garg@nxp.com>
Date: Wed, 7 Sep 2016 16:17:34 +0000 (-0400)
Subject: fsl_sfp : Modify macros as per changes in SFP v3.4
X-Git-Tag: v2016.11-rc2~16^2~21
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=abd9c1bbfbdc9fbef0f178321c43e6fac108520a;p=u-boot

fsl_sfp : Modify macros as per changes in SFP v3.4

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>
Reviewed-by: York Sun <york.sun@nxp.com>
---

diff --git a/include/fsl_sfp.h b/include/fsl_sfp.h
index 2976a2cbef..d3a2813470 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