soc/intel/apollolake: Simplify is-device-enabled checks

Simplify if-statements and use is_dev_enabled() where possible.

Change-Id: Ieeec987dc2bfe5bdef31882edbbb36e52f63b0e6
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43899
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Michael Niewöhner
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Felix Singer
2020-07-26 09:26:52 +02:00
committed by Michael Niewöhner
parent ca4164e629
commit 6c3a89c431
3 changed files with 7 additions and 8 deletions

View File

@@ -554,7 +554,7 @@ static void glk_fsp_silicon_init_params_cb(
}
dev = pcidev_path_on_root(SA_GLK_DEVFN_GMM);
silconfig->Gmm = dev ? dev->enabled : 0;
silconfig->Gmm = is_dev_enabled(dev);
/* On Geminilake, we need to override the default FSP PCIe de-emphasis
* settings using the device tree settings. This is because PCIe
@@ -696,10 +696,7 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *silupd)
silconfig->VtdEnable = cfg->enable_vtd;
dev = pcidev_path_on_root(SA_DEVFN_IGD);
if (CONFIG(RUN_FSP_GOP) && dev && dev->enabled)
silconfig->PeiGraphicsPeimInit = 1;
else
silconfig->PeiGraphicsPeimInit = 0;
silconfig->PeiGraphicsPeimInit = CONFIG(RUN_FSP_GOP) && is_dev_enabled(dev);
mainboard_silicon_init_params(silconfig);
}