Sridhar Siricilla has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38797 )
Change subject: soc/intel/skl: Rename me_hfs union into me_hfsts ......................................................................
soc/intel/skl: Rename me_hfs union into me_hfsts
Rename below union tags for consistency: me_hfs2 -> me_hfsts2 me_hfs3 -> me_hfsts3 me_hfs6 -> me_hfsts6
TEST=Verified on Soraka
Change-Id: Ibb53e6a5f2b95021f86b3e42e100b711b7d6e64e Signed-off-by: Sridhar Siricilla sridhar.siricilla@intel.com --- M src/soc/intel/skylake/include/soc/me.h M src/soc/intel/skylake/me.c 2 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/38797/1
diff --git a/src/soc/intel/skylake/include/soc/me.h b/src/soc/intel/skylake/include/soc/me.h index e8de30d..332340f 100644 --- a/src/soc/intel/skylake/include/soc/me.h +++ b/src/soc/intel/skylake/include/soc/me.h @@ -147,7 +147,7 @@ } __packed fields; };
-union me_hfs2 { +union me_hfsts2 { u32 data; struct { u32 reserved1: 3; @@ -168,7 +168,7 @@ } __packed fields; };
-union me_hfs3 { +union me_hfsts3 { u32 data; struct { u32 reserved1: 4; @@ -184,7 +184,7 @@ #define ME_HFS6_FPF_NOT_COMMITTED 0x0 #define ME_HFS6_FPF_ERROR 0x2
-union me_hfs6 { +union me_hfsts6 { u32 data; struct { u32 reserved1: 30; diff --git a/src/soc/intel/skylake/me.c b/src/soc/intel/skylake/me.c index 17a66bc..b45234e 100644 --- a/src/soc/intel/skylake/me.c +++ b/src/soc/intel/skylake/me.c @@ -273,9 +273,9 @@ void intel_me_status(void) { union me_hfsts1 hfs1; - union me_hfs2 hfs2; - union me_hfs3 hfs3; - union me_hfs6 hfs6; + union me_hfsts2 hfs2; + union me_hfsts3 hfs3; + union me_hfsts6 hfs6;
if (!is_cse_enabled()) return;