Author: oxygene Date: 2010-01-11 10:05:52 +0100 (Mon, 11 Jan 2010) New Revision: 5006
Modified: trunk/src/cpu/emulation/qemu-x86/northbridge.c trunk/src/mainboard/emulation/qemu-x86/Kconfig trunk/src/mainboard/emulation/qemu-x86/Options.lb Log: 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
Modified: trunk/src/cpu/emulation/qemu-x86/northbridge.c =================================================================== --- trunk/src/cpu/emulation/qemu-x86/northbridge.c 2010-01-08 11:26:02 UTC (rev 5005) +++ trunk/src/cpu/emulation/qemu-x86/northbridge.c 2010-01-11 09:05:52 UTC (rev 5006) @@ -157,12 +157,3 @@ CHIP_NAME("QEMU Northbridge") .enable_dev = enable_dev, }; - -void udelay(unsigned usecs) -{ - unsigned i; - for(i = 0; i < usecs; i++) - inb(0x80); -} - -
Modified: trunk/src/mainboard/emulation/qemu-x86/Kconfig =================================================================== --- trunk/src/mainboard/emulation/qemu-x86/Kconfig 2010-01-08 11:26:02 UTC (rev 5005) +++ trunk/src/mainboard/emulation/qemu-x86/Kconfig 2010-01-11 09:05:52 UTC (rev 5006) @@ -22,13 +22,3 @@ 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
Modified: trunk/src/mainboard/emulation/qemu-x86/Options.lb =================================================================== --- trunk/src/mainboard/emulation/qemu-x86/Options.lb 2010-01-08 11:26:02 UTC (rev 5005) +++ trunk/src/mainboard/emulation/qemu-x86/Options.lb 2010-01-11 09:05:52 UTC (rev 5006) @@ -47,6 +47,8 @@ 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