diff options
| -rw-r--r-- | src/soc/intel/braswell/Makefile.inc | 3 | ||||
| -rw-r--r-- | src/soc/intel/braswell/gfx.c | 15 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/soc/intel/braswell/Makefile.inc b/src/soc/intel/braswell/Makefile.inc index ac1bacdd0e..fabbc2bc61 100644 --- a/src/soc/intel/braswell/Makefile.inc +++ b/src/soc/intel/braswell/Makefile.inc @@ -22,9 +22,8 @@ ramstage-y += cpu.c ramstage-$(CONFIG_ELOG) += elog.c ramstage-y += emmc.c ramstage-y += gpio.c -ifneq ($(CONFIG_RUN_FSP_GOP),y) ramstage-y += gfx.c -endif + ramstage-y += gpio_support.c ramstage-y += hda.c ramstage-y += iosf.c diff --git a/src/soc/intel/braswell/gfx.c b/src/soc/intel/braswell/gfx.c index 895d2ee7da..9417409358 100644 --- a/src/soc/intel/braswell/gfx.c +++ b/src/soc/intel/braswell/gfx.c @@ -68,15 +68,16 @@ static void gfx_init(struct device *dev) printk(BIOS_SPEW, "%s/%s (%s)\n", __FILE__, __func__, dev_name(dev)); - /* Pre VBIOS Init */ - gfx_pre_vbios_init(dev); + if (!IS_ENABLED(CONFIG_RUN_FSP_GOP)) { + /* Pre VBIOS Init */ + gfx_pre_vbios_init(dev); - /* Run VBIOS */ - pci_dev_init(dev); - - /* Post VBIOS Init */ - gfx_post_vbios_init(dev); + /* Run VBIOS */ + pci_dev_init(dev); + /* Post VBIOS Init */ + gfx_post_vbios_init(dev); + } intel_gma_restore_opregion(); } |