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>
This commit is contained in:
parent
0660d1fa40
commit
f70c1bf69a
|
@ -19,7 +19,7 @@ config PARALLEL_MP_AP_WORK
|
||||||
|
|
||||||
config UDELAY_IO
|
config UDELAY_IO
|
||||||
bool
|
bool
|
||||||
default y if !UDELAY_LAPIC && !UDELAY_TSC && !UDELAY_TIMER2
|
default y if !UDELAY_LAPIC && !UDELAY_TSC && !UDELAY_TIMER2 && !GENERIC_UDELAY
|
||||||
default n
|
default n
|
||||||
|
|
||||||
config UDELAY_LAPIC
|
config UDELAY_LAPIC
|
||||||
|
|
Loading…
Reference in New Issue