summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Reinauer <stefan.reinauer@coreboot.org>2016-02-24 14:01:59 -0800
committerStefan Reinauer <stefan.reinauer@coreboot.org>2016-03-13 02:22:39 +0100
commit2510e2aa448dd7eb52232fa65def0be16af5da84 (patch)
treefbf906ed0261767fb6f0ff6a18a8e3f37cc1a392
parente3fd63f264e1f6e2869cf5868e1810dff5641147 (diff)
northbridge/intel/i3100: Unify UDELAY selection
Instead of manually including udelay_io.c in each romstage, select UDELAY_IO for all i3100 boards in the chipset. Change-Id: Ia66a0561c75777a9e98bb87117859808a2ff3732 Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-on: https://review.coreboot.org/13786 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth@google.com>
-rw-r--r--src/mainboard/intel/eagleheights/Kconfig1
-rw-r--r--src/mainboard/intel/mtarvon/Kconfig1
-rw-r--r--src/mainboard/intel/truxton/Kconfig1
-rw-r--r--src/mainboard/intel/truxton/romstage.c1
-rw-r--r--src/northbridge/intel/i3100/Kconfig1
-rw-r--r--src/northbridge/intel/i3100/raminit_ep80579.c1
6 files changed, 2 insertions, 4 deletions
diff --git a/src/mainboard/intel/eagleheights/Kconfig b/src/mainboard/intel/eagleheights/Kconfig
index 702e2aff5a..9671fffc7e 100644
--- a/src/mainboard/intel/eagleheights/Kconfig
+++ b/src/mainboard/intel/eagleheights/Kconfig
@@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
- select UDELAY_TSC
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024
diff --git a/src/mainboard/intel/mtarvon/Kconfig b/src/mainboard/intel/mtarvon/Kconfig
index 75bca403f2..11c26261c9 100644
--- a/src/mainboard/intel/mtarvon/Kconfig
+++ b/src/mainboard/intel/mtarvon/Kconfig
@@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SUPERIO_INTEL_I3100
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
- select UDELAY_TSC
select BOARD_ROMSIZE_KB_2048
config MAINBOARD_DIR
diff --git a/src/mainboard/intel/truxton/Kconfig b/src/mainboard/intel/truxton/Kconfig
index 11058e6097..cd8e478f1b 100644
--- a/src/mainboard/intel/truxton/Kconfig
+++ b/src/mainboard/intel/truxton/Kconfig
@@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
- select UDELAY_TSC
select BOARD_ROMSIZE_KB_2048
config MAINBOARD_DIR
diff --git a/src/mainboard/intel/truxton/romstage.c b/src/mainboard/intel/truxton/romstage.c
index c637d24192..3ea65426d9 100644
--- a/src/mainboard/intel/truxton/romstage.c
+++ b/src/mainboard/intel/truxton/romstage.c
@@ -21,7 +21,6 @@
#include <device/pnp_def.h>
#include <cpu/x86/lapic.h>
#include <pc80/mc146818rtc.h>
-#include "drivers/pc80/udelay_io.c"
#include <console/console.h>
#include "southbridge/intel/i3100/early_smbus.c"
#include "southbridge/intel/i3100/early_lpc.c"
diff --git a/src/northbridge/intel/i3100/Kconfig b/src/northbridge/intel/i3100/Kconfig
index cb0bd38086..2260664129 100644
--- a/src/northbridge/intel/i3100/Kconfig
+++ b/src/northbridge/intel/i3100/Kconfig
@@ -1,6 +1,7 @@
config NORTHBRIDGE_INTEL_I3100
bool
select LATE_CBMEM_INIT
+ select UDELAY_IO
if NORTHBRIDGE_INTEL_I3100
config DIMM_MAP_LOGICAL
diff --git a/src/northbridge/intel/i3100/raminit_ep80579.c b/src/northbridge/intel/i3100/raminit_ep80579.c
index 7996e111bc..497339c0e7 100644
--- a/src/northbridge/intel/i3100/raminit_ep80579.c
+++ b/src/northbridge/intel/i3100/raminit_ep80579.c
@@ -19,6 +19,7 @@
#include <cpu/x86/cache.h>
#include <cpu/intel/speedstep.h>
#include <lib.h>
+#include <delay.h>
#include "raminit_ep80579.h"
#include "ep80579.h"