diff options
| author | Patrick Georgi <patrick.georgi@coresystems.de> | 2010-01-11 09:05:52 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2010-01-11 09:05:52 +0000 |
| commit | 766db7ea09addca79d91436cb7ac06a9bff491a5 (patch) | |
| tree | 44fe0d8d2a2b5b4a08d059e22a48f4730eb67148 | |
| parent | 07684e6ce7461d329ef442290234b47561961798 (diff) | |
Make qemu use the udelay function in src/pc80/udelay_io.c
instead of the equivalent copy in src/cpu/emulation/qemu-x86/northbridge.c.
Also, delete the copy.
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5006 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
| -rw-r--r-- | src/cpu/emulation/qemu-x86/northbridge.c | 9 | ||||
| -rw-r--r-- | src/mainboard/emulation/qemu-x86/Kconfig | 10 | ||||
| -rw-r--r-- | src/mainboard/emulation/qemu-x86/Options.lb | 2 |
3 files changed, 2 insertions, 19 deletions
diff --git a/src/cpu/emulation/qemu-x86/northbridge.c b/src/cpu/emulation/qemu-x86/northbridge.c index 44fb1ce598..bac18806d4 100644 --- a/src/cpu/emulation/qemu-x86/northbridge.c +++ b/src/cpu/emulation/qemu-x86/northbridge.c @@ -157,12 +157,3 @@ struct chip_operations cpu_emulation_qemu_x86_ops = { CHIP_NAME("QEMU Northbridge") .enable_dev = enable_dev, }; - -void udelay(unsigned usecs) -{ - unsigned i; - for(i = 0; i < usecs; i++) - inb(0x80); -} - - diff --git a/src/mainboard/emulation/qemu-x86/Kconfig b/src/mainboard/emulation/qemu-x86/Kconfig index 7fc83c500c..92035bce90 100644 --- a/src/mainboard/emulation/qemu-x86/Kconfig +++ b/src/mainboard/emulation/qemu-x86/Kconfig @@ -22,13 +22,3 @@ config IRQ_SLOT_COUNT int default 6 depends on BOARD_EMULATION_QEMU_X86 - -config HAVE_INIT_TIMER - bool - default n - depends on BOARD_EMULATION_QEMU_X86 - -config UDELAY_IO - bool - default n - depends on BOARD_EMULATION_QEMU_X86 diff --git a/src/mainboard/emulation/qemu-x86/Options.lb b/src/mainboard/emulation/qemu-x86/Options.lb index 6cf0f76c97..e0671284a8 100644 --- a/src/mainboard/emulation/qemu-x86/Options.lb +++ b/src/mainboard/emulation/qemu-x86/Options.lb @@ -47,6 +47,8 @@ uses CONFIG_USE_PRINTK_IN_CAR uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL +uses CONFIG_UDELAY_IO +default CONFIG_UDELAY_IO=1 default CONFIG_CONSOLE_SERIAL8250=1 default CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 |