From f70c1bf69a6f1938d39a5a7e7f7679b5e5187e6d Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Wed, 24 Jan 2018 17:20:11 -0700 Subject: cpu/x86: don't utilize UDELAY_IO if GENERIC_UDELAY If GENERIC_UDELAY is selected don't try to use UDELAY_IO as there will be a udelay() conflict at link time. BUG=b:72378235,b:72170796 Change-Id: I9e01c9daddd0629ecc38a809889b39a505c0e203 Signed-off-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/23422 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth Reviewed-by: Justin TerAvest Reviewed-by: Furquan Shaikh --- src/cpu/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig index 2e233cc778..a20febb9ce 100644 --- a/src/cpu/x86/Kconfig +++ b/src/cpu/x86/Kconfig @@ -19,7 +19,7 @@ config PARALLEL_MP_AP_WORK config UDELAY_IO bool - default y if !UDELAY_LAPIC && !UDELAY_TSC && !UDELAY_TIMER2 + default y if !UDELAY_LAPIC && !UDELAY_TSC && !UDELAY_TIMER2 && !GENERIC_UDELAY default n config UDELAY_LAPIC -- cgit v1.2.3