From da9302a2c42038594ed0127b8887c7d984cd65e1 Mon Sep 17 00:00:00 2001
From: Patrick Rudolph <patrick.rudolph@9elements.com>
Date: Sun, 24 Mar 2019 17:01:41 +0100
Subject: nb/intel/sandybridge: Drop pch.h from sandybridge.h

Include pch.h in the source files instead in sandybridge.h.

Tested on Lenovo T520 (Intel Sandy Bridge).
Still boots to OS, no errors visible in dmesg.

Change-Id: I9e5b678e979a8d136d8d00b49486d0a882f77d81
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32065
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
---
 src/northbridge/intel/sandybridge/gma.c         | 1 +
 src/northbridge/intel/sandybridge/raminit.c     | 1 +
 src/northbridge/intel/sandybridge/sandybridge.h | 2 --
 3 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/northbridge')

diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c
index 0d28d67602..cb6782e9b7 100644
--- a/src/northbridge/intel/sandybridge/gma.c
+++ b/src/northbridge/intel/sandybridge/gma.c
@@ -25,6 +25,7 @@
 #include <drivers/intel/gma/libgfxinit.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
 #include <drivers/intel/gma/opregion.h>
+#include <southbridge/intel/bd82x6x/pch.h>
 #include <cbmem.h>
 
 #include "chip.h"
diff --git a/src/northbridge/intel/sandybridge/raminit.c b/src/northbridge/intel/sandybridge/raminit.c
index c066634312..050f4c2ba0 100644
--- a/src/northbridge/intel/sandybridge/raminit.c
+++ b/src/northbridge/intel/sandybridge/raminit.c
@@ -29,6 +29,7 @@
 #include <mrc_cache.h>
 #include <southbridge/intel/bd82x6x/me.h>
 #include <southbridge/intel/common/smbus.h>
+#include <southbridge/intel/bd82x6x/pch.h>
 #include <cpu/x86/msr.h>
 
 #include "raminit_native.h"
diff --git a/src/northbridge/intel/sandybridge/sandybridge.h b/src/northbridge/intel/sandybridge/sandybridge.h
index e315fa463f..92cb888a41 100644
--- a/src/northbridge/intel/sandybridge/sandybridge.h
+++ b/src/northbridge/intel/sandybridge/sandybridge.h
@@ -52,8 +52,6 @@
 #define IOMMU_BASE1		0xfed90000ULL
 #define IOMMU_BASE2		0xfed91000ULL
 
-#include <southbridge/intel/bd82x6x/pch.h>
-
 /* Everything below this line is ignored in the DSDT */
 #ifndef __ACPI__
 #include <cpu/intel/model_206ax/model_206ax.h>
-- 
cgit v1.2.3