[coreboot-gerrit] Change in coreboot[master]: soc/intel/common/block/xdci: Add override for vboot policy

[Wim Vervoorn (Code Review)]

Wim Vervoorn has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38403 )

Change subject: soc/intel/common/block/xdci: Add override for vboot policy
......................................................................

soc/intel/common/block/xdci: Add override for vboot policy

When VBOOT is enabled the xDCI controller can only be enabled in
developer mode. This is not neccessarily correct for any given system
with VBOOT enabled.

Add the possibility to override the vboot policy. So the xDCI controller
will be enabled when it is enabled in the device tree.

BUG=N/A
TEST=tested on facebook monolith

Change-Id: I6142c4a74ca6930457b16f62f32e1199b8baaff8
Signed-off-by: Wim Vervoorn 
---
M src/mainboard/facebook/monolith/Kconfig
M src/soc/intel/common/block/xdci/Kconfig
M src/soc/intel/common/block/xdci/xdci.c
3 files changed, 10 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/38403/1

diff --git a/src/mainboard/facebook/monolith/Kconfig b/src/mainboard/facebook/monolith/Kconfig
index 3261661..93e307b 100644
--- a/src/mainboard/facebook/monolith/Kconfig
+++ b/src/mainboard/facebook/monolith/Kconfig
@@ -11,6 +11,7 @@
    select MAINBOARD_HAS_TPM2
    select MAINBOARD_USES_IFD_GBE_REGION
    select INTEL_GMA_HAVE_VBT
+	select XDCI_VBOOT_FORCE_ENABLE

config CBFS_SIZE
    hex "CBFS_SIZE"
diff --git a/src/soc/intel/common/block/xdci/Kconfig b/src/soc/intel/common/block/xdci/Kconfig
index 3918642..b613417 100644
--- a/src/soc/intel/common/block/xdci/Kconfig
+++ b/src/soc/intel/common/block/xdci/Kconfig
@@ -2,3 +2,10 @@
    bool
    help
      Intel Processor common XDCI support
+
+config XDCI_VBOOT_FORCE_ENABLE
+	bool
+	depends on SOC_INTEL_COMMON_BLOCK_XDCI
+	help
+	  Overrides the VBOOT UDC policy and enables
+	  XDCI when enabled in the device tree
diff --git a/src/soc/intel/common/block/xdci/xdci.c b/src/soc/intel/common/block/xdci/xdci.c
index 2296f9f..39397f9 100644
--- a/src/soc/intel/common/block/xdci/xdci.c
+++ b/src/soc/intel/common/block/xdci/xdci.c
@@ -24,6 +24,8 @@

int xdci_can_enable(void)
 {
+	if (CONFIG(XDCI_VBOOT_FORCE_ENABLE))
+		return 1;
    return vboot_can_enable_udc();
 }