From 0b78ae5476d5ef4a0b6329e20d273d843a43e798 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Wed, 25 Apr 2018 18:19:58 -0700 Subject: soc/intel/common/block/xdci: Use vboot_can_enable_udc in xdci_can_enable This change uses the newly added vboot_can_enable_udc to decide if it is okay to enable xDCI in vboot developer mode. BUG=b:78577893 BRANCH=poppy Change-Id: Ia83b91ce17eec782faf5bb318ad8c00c09e2db05 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/25848 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Paul Menzel --- src/soc/intel/common/block/xdci/xdci.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/soc/intel') diff --git a/src/soc/intel/common/block/xdci/xdci.c b/src/soc/intel/common/block/xdci/xdci.c index cc42f2c65c..eb330ee6ee 100644 --- a/src/soc/intel/common/block/xdci/xdci.c +++ b/src/soc/intel/common/block/xdci/xdci.c @@ -24,13 +24,9 @@ __weak void soc_xdci_init(struct device *dev) { /* no-op */ } -/* Only allow xDCI controller in developer mode if VBOOT is enabled */ int xdci_can_enable(void) { - if (IS_ENABLED(CONFIG_VBOOT)) - return vboot_developer_mode_enabled() ? 1 : 0; - else - return 1; + return vboot_can_enable_udc(); } static struct device_operations usb_xdci_ops = { -- cgit v1.2.3