[S] Change in coreboot[master]: soc/intel/cnl: Rename ME header with spec version and place it to common

[Dinesh Gehlot (Code Review)]

Dinesh Gehlot has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/72957 )

Change subject: soc/intel/cnl: Rename ME header with spec version and place it to common
......................................................................

soc/intel/cnl: Rename ME header with spec version and place it to common

Cannonlake based SoCs uses Intel's Management Engine (ME), version 12.
This patch renames the ME header file to 'me_12.h' and moves the renamed
header to common code.

Including the ME specification in common code will help current and
future SoC platforms to select the correct version based on the
applicable configuration. It might be also beneficial if two different
SoC platforms would like to use the same ME specification and not
necessarily share the same SoC directory.

BUG=b:260309647

Signed-off-by: Dinesh Gehlot 
Change-Id: I5c3228146f0723179def67993c3689933c56e9aa
---
M src/soc/intel/cannonlake/Kconfig
M src/soc/intel/cannonlake/me.c
M src/soc/intel/common/block/cse/Kconfig
M src/soc/intel/common/block/include/intelblocks/me.h
R src/soc/intel/common/block/include/intelblocks/me_12.h
5 files changed, 33 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/72957/1

diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig
index 16a3cbd..a54ef90 100644
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/src/soc/intel/cannonlake/Kconfig
@@ -97,6 +97,7 @@
    select SOC_INTEL_COMMON_BLOCK_GSPI_VERSION_2
    select SOC_INTEL_COMMON_BLOCK_HDA
    select SOC_INTEL_COMMON_BLOCK_IRQ
+	select SOC_INTEL_COMMON_BLOCK_ME_SPEC_12
    select SOC_INTEL_COMMON_BLOCK_POWER_LIMIT
    select SOC_INTEL_COMMON_BLOCK_SA
    select SOC_INTEL_COMMON_BLOCK_SCS
diff --git a/src/soc/intel/cannonlake/me.c b/src/soc/intel/cannonlake/me.c
index e5025e8..2fa866b 100644
--- a/src/soc/intel/cannonlake/me.c
+++ b/src/soc/intel/cannonlake/me.c
@@ -5,8 +5,8 @@
 #include <commonlib/helpers.h>
 #include <console/console.h>
 #include <device/pci.h>
+#include <intelblocks/me.h>
 #include <intelblocks/cse.h>
-#include <soc/me.h>
 #include <soc/pci_devs.h>
 #include <stdint.h>

diff --git a/src/soc/intel/common/block/cse/Kconfig b/src/soc/intel/common/block/cse/Kconfig
index 50807f9..268dcd4 100644
--- a/src/soc/intel/common/block/cse/Kconfig
+++ b/src/soc/intel/common/block/cse/Kconfig
@@ -206,6 +206,12 @@
    help
     Use this option for CSE FW Update when compressed blobs are used.

+config SOC_INTEL_COMMON_BLOCK_ME_SPEC_12
+	bool
+	help
+	  This config will enable 'ME specification version 12'. It will ensure ME specific
+	  declaration and uses of required data structures for Host firmware status registers.
+
 config SOC_INTEL_COMMON_BLOCK_ME_SPEC_13
    bool
    help
diff --git a/src/soc/intel/common/block/include/intelblocks/me.h b/src/soc/intel/common/block/include/intelblocks/me.h
index ea1b934..c1d12c0 100644
--- a/src/soc/intel/common/block/include/intelblocks/me.h
+++ b/src/soc/intel/common/block/include/intelblocks/me.h
@@ -5,7 +5,9 @@

#include <stdint.h>

-#if CONFIG(SOC_INTEL_COMMON_BLOCK_ME_SPEC_13)
+#if CONFIG(SOC_INTEL_COMMON_BLOCK_ME_SPEC_12)
+#include "me_12.h"
+#elif CONFIG(SOC_INTEL_COMMON_BLOCK_ME_SPEC_13)
 #include "me_13.h"
 #elif CONFIG(SOC_INTEL_COMMON_BLOCK_ME_SPEC_15)
 #include "me_15.h"
diff --git a/src/soc/intel/cannonlake/include/soc/me.h b/src/soc/intel/common/block/include/intelblocks/me_12.h
similarity index 100%
rename from src/soc/intel/cannonlake/include/soc/me.h
rename to src/soc/intel/common/block/include/intelblocks/me_12.h