[coreboot-gerrit] Change in coreboot[master]: soc/intel/common/block/cpu: Fix boot failure

[Patrick Rudolph (Code Review)]

Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45344 )

Change subject: soc/intel/common/block/cpu: Fix boot failure
......................................................................

soc/intel/common/block/cpu: Fix boot failure

This fixes CB:45043 "Guard options with if-blocks".

The code no longer returns if SGX is disabled, but as the PRMRR
configuration is missing it runs into die().

Tested on Prodrive Hermes: Boots again into Linux.

Change-Id: I6d32ca32b1b53767b2db91305103cd532823a5ca
Signed-off-by: Patrick Rudolph 
---
M src/soc/intel/common/block/cpu/cpulib.c
1 file changed, 3 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/45344/1

diff --git a/src/soc/intel/common/block/cpu/cpulib.c b/src/soc/intel/common/block/cpu/cpulib.c
index 5b703cf..9cf7777 100644
--- a/src/soc/intel/common/block/cpu/cpulib.c
+++ b/src/soc/intel/common/block/cpu/cpulib.c
@@ -346,6 +346,9 @@
    int i;
    int valid_size;

+	if (!CONFIG(SOC_INTEL_COMMON_BLOCK_SGX))
+		return 0;
+
    if (CONFIG(SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_DISABLED)) {
    	printk(BIOS_DEBUG, "PRMRR disabled by config.\n");
    	return 0;