[S] Change in coreboot[main]: soc/intel/common/block/gpmr: Allow soc to have specific gpmr definition

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/83317?usp=email )

(

10 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
 )Change subject: soc/intel/common/block/gpmr: Allow soc to have specific gpmr definition
......................................................................

soc/intel/common/block/gpmr: Allow soc to have specific gpmr definition

This patch add a new Kconfig HAVE_SPECIFIC_GPMR and use it to include
soc/gpmr.h if necessary.

Change-Id: I94797a72af75fc96ab2cacb1d46b581605a15387
Signed-off-by: Yuchi Chen 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83317
Reviewed-by: Shuo Liu 
Tested-by: build bot (Jenkins) 
---
M src/soc/intel/common/block/gpmr/Kconfig
M src/soc/intel/common/block/include/intelblocks/pcr_gpmr.h
2 files changed, 16 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Shuo Liu: Looks good to me, approved

diff --git a/src/soc/intel/common/block/gpmr/Kconfig b/src/soc/intel/common/block/gpmr/Kconfig
index 06ababe..313b0cc 100644
--- a/src/soc/intel/common/block/gpmr/Kconfig
+++ b/src/soc/intel/common/block/gpmr/Kconfig
@@ -5,3 +5,13 @@
    select SOC_INTEL_COMMON_BLOCK_PCR
    help
      Intel Processor common GPMR support
+
+if SOC_INTEL_COMMON_BLOCK_GPMR
+
+config USE_SOC_GPMR_DEFS
+	bool
+	default n
+	help
+	  Specify if the SoC have specific GPMR register definitions.
+
+endif
diff --git a/src/soc/intel/common/block/include/intelblocks/pcr_gpmr.h b/src/soc/intel/common/block/include/intelblocks/pcr_gpmr.h
index fb138f9..98ee837 100644
--- a/src/soc/intel/common/block/include/intelblocks/pcr_gpmr.h
+++ b/src/soc/intel/common/block/include/intelblocks/pcr_gpmr.h
@@ -3,6 +3,10 @@
 #ifndef SOC_INTEL_COMMON_BLOCK_PCR_GPMR_H
 #define SOC_INTEL_COMMON_BLOCK_PCR_GPMR_H

+#if CONFIG(USE_SOC_GPMR_DEFS)
+#include <soc/pcr_gpmr.h>
+#else
+
 #define GPMR_LPCLGIR1		0x2730
 #define GPMR_DMICTL		0x2234
 #define  GPMR_DMICTL_SRLOCK	(1 << 31)
@@ -24,4 +28,6 @@
 #define GPMR_DID_OFFSET(x)	(0x2780 + (x) * 8)
 #define  GPMR_EN		BIT(31)

+#endif
+
 #endif /* SOC_INTEL_COMMON_BLOCK_PCR_GPMR_H */