From 57269e355f32a9755b2d65679e734fa4218fdf93 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Sat, 20 May 2017 02:26:12 +0200 Subject: [PATCH] UPSTREAM: nb/intel/haswell: Fix up C NGI remnants BUG=none BRANCH=none TEST=none Change-Id: Ib7c915f85fb38b04f99b1a97704d3779902a351c Signed-off-by: Patrick Georgi Original-Commit-Id: 0df9a010097b8842fbb286059953bfbea71feeed Original-Change-Id: I3cd5e99b9954a68837de85b49b4389b668e00cf4 Original-Signed-off-by: Nico Huber Original-Reviewed-on: https://review.coreboot.org/19802 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Patrick Rudolph Reviewed-on: https://chromium-review.googlesource.com/533043 Commit-Ready: Patrick Georgi Tested-by: Patrick Georgi Reviewed-by: Patrick Georgi --- src/northbridge/intel/haswell/Kconfig | 1 - src/northbridge/intel/haswell/gma.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/northbridge/intel/haswell/Kconfig b/src/northbridge/intel/haswell/Kconfig index 48a92b6d74..d5dec53041 100644 --- a/src/northbridge/intel/haswell/Kconfig +++ b/src/northbridge/intel/haswell/Kconfig @@ -18,7 +18,6 @@ config NORTHBRIDGE_INTEL_HASWELL select CPU_INTEL_HASWELL select NORTHBRIDGE_INTEL_COMMON_MRC_CACHE select INTEL_DDI - select INTEL_DP select INTEL_GMA_ACPI select RELOCATABLE_RAMSTAGE select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c index 9096d8cf9a..a7478de128 100644 --- a/src/northbridge/intel/haswell/gma.c +++ b/src/northbridge/intel/haswell/gma.c @@ -430,7 +430,7 @@ static void gma_func0_init(struct device *dev) find_resource(dev, PCI_BASE_ADDRESS_2); if (!linearfb_res || !linearfb_res->base) - return; + return; /* IGD needs to be Bus Master */ reg32 = pci_read_config32(dev, PCI_COMMAND);