New patch to review for coreboot: 1bade00 Make sure only one udelay function is available

[Stefan Reinauer]

Stefan Reinauer ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1864

-gerrit

commit 1bade00f7d771412a019145e095210f2fbfeb9eb
Author: Stefan Reinauer 
Date:   Thu Nov 15 16:03:27 2012 -0800

Make sure only one udelay function is available

The Agesa wrapper and UDELAY_TIMER2 define their own timer functions,
    so don't shove in UDELAY_IO

Change-Id: Ibe3345e825e0c074d5f531dba1198cd6e7b0a42d
    Signed-off-by: Stefan Reinauer 
---
 src/cpu/amd/agesa/Kconfig | 4 ++++
 src/cpu/x86/Kconfig       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/cpu/amd/agesa/Kconfig b/src/cpu/amd/agesa/Kconfig
index b7e69e0..39175fc 100644
--- a/src/cpu/amd/agesa/Kconfig
+++ b/src/cpu/amd/agesa/Kconfig
@@ -29,6 +29,10 @@ config CPU_AMD_AGESA

if CPU_AMD_AGESA

+config UDELAY_IO
+	bool
+	default n
+
 config XIP_ROM_SIZE
    hex
    default 0x100000
diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index 9a96aea..4300c3d 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -4,7 +4,7 @@ config SERIAL_CPU_INIT

config UDELAY_IO
    bool
-	default y if !UDELAY_LAPIC && !UDELAY_TSC
+	default y if !UDELAY_LAPIC && !UDELAY_TSC && !UDELAY_TIMER2
    default n

config UDELAY_LAPIC