summaryrefslogtreecommitdiff
path: root/src/southbridge/intel
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2013-03-21 18:43:51 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2013-03-22 03:37:23 +0100
commit5605f1b4ab7661f893bf0f10aea72cacdd51dc99 (patch)
tree01928e2770dea00e2d052c45d5f44d0f52045253 /src/southbridge/intel
parentdb6c5bfd8bdef4489e7fec533cb2ca8ae6c24cf3 (diff)
downloadcoreboot-5605f1b4ab7661f893bf0f10aea72cacdd51dc99.tar.xz
Fix compilation of Intel LynxPoint based boards
The haswell patches that verified correctly were not yet submitted, but verified correctly. However they still used romcc_io.h which was dropped in another patch earlier today. With a lot of development happening in parallel, this is unfortunately nothing that the gerrit 2.6 Rebase If Necessary submit type could have fixed. Change-Id: Ifef9ae05b22c408e78d6cff37defd68e4ed91ed9 Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/2876 Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/southbridge/intel')
-rw-r--r--src/southbridge/intel/lynxpoint/pch.c6
-rw-r--r--src/southbridge/intel/lynxpoint/pmutil.c7
-rw-r--r--src/southbridge/intel/lynxpoint/rcba.c4
3 files changed, 2 insertions, 15 deletions
diff --git a/src/southbridge/intel/lynxpoint/pch.c b/src/southbridge/intel/lynxpoint/pch.c
index b4f64e1436..cc3718d444 100644
--- a/src/southbridge/intel/lynxpoint/pch.c
+++ b/src/southbridge/intel/lynxpoint/pch.c
@@ -21,14 +21,10 @@
#include <console/console.h>
#include <delay.h>
-#ifdef __SMM__
#include <arch/io.h>
-#include <arch/romcc_io.h>
-#include <device/pci_def.h>
-#else /* !__SMM__ */
#include <device/device.h>
#include <device/pci.h>
-#endif
+#include <device/pci_def.h>
#include "pch.h"
static device_t pch_get_lpc_device(void)
diff --git a/src/southbridge/intel/lynxpoint/pmutil.c b/src/southbridge/intel/lynxpoint/pmutil.c
index ec4d473a58..3a0b70b0b3 100644
--- a/src/southbridge/intel/lynxpoint/pmutil.c
+++ b/src/southbridge/intel/lynxpoint/pmutil.c
@@ -25,14 +25,9 @@
*/
#include <arch/io.h>
-#ifdef __SMM__
-#include <arch/romcc_io.h>
-#include <device/pci_def.h>
-#else /* !__SMM__ */
#include <device/device.h>
#include <device/pci.h>
-#endif
-
+#include <device/pci_def.h>
#include <console/console.h>
#include "pch.h"
diff --git a/src/southbridge/intel/lynxpoint/rcba.c b/src/southbridge/intel/lynxpoint/rcba.c
index d41aa8686e..8cc97a9aea 100644
--- a/src/southbridge/intel/lynxpoint/rcba.c
+++ b/src/southbridge/intel/lynxpoint/rcba.c
@@ -20,13 +20,9 @@
#include <console/console.h>
#include <device/pci_def.h>
-#ifdef __PRE_RAM__
#include <arch/io.h>
-#include <arch/romcc_io.h>
-#else
#include <device/device.h>
#include <device/pci.h>
-#endif
#include "pch.h"
void pch_config_rcba(const struct rcba_config_instruction *rcba_config)