[coreboot-gerrit] Change in coreboot[master]: soc/intel/common/block/sgx: Make PRMRR sizes always visible

[Angel Pons (Code Review)]

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45345 )

Change subject: soc/intel/common/block/sgx: Make PRMRR sizes always visible
......................................................................

soc/intel/common/block/sgx: Make PRMRR sizes always visible

Apparently, PRMRRs can be set to a non-zero size even if SGX is not to
be enabled. This fixes boot failures when SGX is disabled.

Change-Id: I27f1d3741e8e3755130078c79ab13ae8873354fc
Signed-off-by: Angel Pons 
---
M src/soc/intel/common/block/sgx/Kconfig
1 file changed, 18 insertions(+), 18 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/45345/1

diff --git a/src/soc/intel/common/block/sgx/Kconfig b/src/soc/intel/common/block/sgx/Kconfig
index 771c54c..b59c8ba 100644
--- a/src/soc/intel/common/block/sgx/Kconfig
+++ b/src/soc/intel/common/block/sgx/Kconfig
@@ -6,24 +6,6 @@
    help
      Intel Processor common SGX support

-if SOC_INTEL_COMMON_BLOCK_SGX
-
-config SOC_INTEL_COMMON_BLOCK_SGX_LOCK_MEMORY
-	bool
-	default n
-	help
-	 Lock memory before SGX activation. This is only needed if MCHECK does not do it.
-
-config SOC_INTEL_COMMON_BLOCK_SGX_ENABLE
-	bool "Enable Software Guard Extensions (SGX) if available"
-	default n
-	help
-	  Intel Software Guard Extensions (SGX) is a set of new CPU instructions that can be
-	  used by applications to set aside private regions (so-called Secure Enclaves) of
-	  code and data.
-
-	  SGX will only be enabled when supported by the CPU!
-
 config SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE
    int
    default 256 if SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_MAX
@@ -71,4 +53,22 @@

endchoice

+if SOC_INTEL_COMMON_BLOCK_SGX
+
+config SOC_INTEL_COMMON_BLOCK_SGX_LOCK_MEMORY
+	bool
+	default n
+	help
+	 Lock memory before SGX activation. This is only needed if MCHECK does not do it.
+
+config SOC_INTEL_COMMON_BLOCK_SGX_ENABLE
+	bool "Enable Software Guard Extensions (SGX) if available"
+	default n
+	help
+	  Intel Software Guard Extensions (SGX) is a set of new CPU instructions that can be
+	  used by applications to set aside private regions (so-called Secure Enclaves) of
+	  code and data.
+
+	  SGX will only be enabled when supported by the CPU!
+
 endif