diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2018-01-24 17:20:11 -0700 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2018-01-25 22:36:46 +0000 |
| commit | f70c1bf69a6f1938d39a5a7e7f7679b5e5187e6d (patch) | |
| tree | b464d9b8a02b5ed2151ea835ad4fed11e093a650 /src | |
| parent | 0660d1fa40e88f01ad7b9e5d0369e0dfcb2fb08f (diff) | |
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 <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/23422
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-by: Justin TerAvest <teravest@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cpu/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
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 |