Ronald G. Minnich (rminnich@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3059
-gerrit
commit 6607afee826764df24417e7b1dfd8c9990973ae9 Author: Ronald G. Minnich rminnich@gmail.com Date: Tue Apr 9 15:47:38 2013 -0700
Replace delay.h with time.h to prepare for adding global time functions
In coreboot, we've always had a notion of relative time, enforced with udelay, i.e. "wait for x microseconds".
In modern systems, hardware is messy enough that it pays to have a notion of time. For example, the romstage might start a piece of hardware, and then load the ramstage. The ramstage knows the hardware will be ready 200 ms. after the core is turned on, but a simple udelay(200000); will potentially waste lots of time if it is called at, e.g., t=198000. Coreboot should not wait for 200 ms.; it should wait UNTIL t=200 ms. Those are very different things.
We're going to need a measure of time. We have to move beyond udelay. As a first step, rename udelay.h to time.h to recognize changes that are coming.
Change-Id: Ib6d89e168bcc6b86696f1aca0bf22736e0fe9951 Signed-off-by: Ronald G. Minnich rminnich@gmail.com --- src/cpu/amd/sc520/sc520.c | 2 +- src/cpu/intel/haswell/mp_init.c | 2 +- src/cpu/samsung/exynos5-common/i2c.c | 2 +- src/cpu/samsung/exynos5250/clock_init.c | 2 +- src/cpu/via/c7/c7_init.c | 2 +- src/cpu/via/nano/nano_init.c | 2 +- src/cpu/x86/lapic/apic_timer.c | 2 +- src/cpu/x86/lapic/lapic_cpu_init.c | 2 +- src/cpu/x86/tsc/delay_tsc.c | 2 +- src/device/oprom/realmode/x86.c | 2 +- src/device/oprom/yabel/vbe.c | 2 +- src/device/pci_device.c | 2 +- src/device/pciexp_device.c | 2 +- src/drivers/ati/ragexl/xlinit.c | 2 +- src/drivers/emulation/qemu/init.c | 2 +- src/drivers/generic/debug/debug_dev.c | 2 +- src/drivers/generic/ioapic/ioapic.c | 2 +- src/drivers/ipmi/ipmi_kcs.c | 2 +- src/drivers/oxford/oxpcie/oxpcie_early.c | 2 +- src/drivers/pc80/keyboard.c | 2 +- src/drivers/pc80/tpm.c | 2 +- src/drivers/pc80/udelay_io.c | 2 +- src/drivers/sil/3114/sil_sata.c | 2 +- src/drivers/spi/spi_flash.c | 2 +- src/drivers/trident/blade3d/blade3d.c | 2 +- src/ec/acpi/ec.c | 2 +- src/ec/compal/ene932/ec.c | 2 +- src/ec/google/chromeec/ec.c | 2 +- src/ec/quanta/ene_kb3940q/ec.c | 2 +- src/ec/quanta/it8518/ec.c | 2 +- src/ec/smsc/mec1308/ec.c | 2 +- src/include/delay.h | 17 ----------------- src/include/time.h | 17 +++++++++++++++++ src/lib/delay.c | 2 +- src/lib/hardwaremain.c | 2 +- src/lib/ne2k.c | 2 +- src/lib/uart8250mem.c | 2 +- src/lib/xmodem.c | 2 +- src/mainboard/amd/inagua/broadcom.c | 2 +- src/mainboard/amd/south_station/mainboard.c | 2 +- src/mainboard/asus/dsbf/mainboard.c | 2 +- src/mainboard/emulation/qemu-x86/northbridge.c | 2 +- src/mainboard/getac/p470/ec_oem.c | 2 +- src/mainboard/getac/p470/mainboard.c | 2 +- src/mainboard/google/link/i915.c | 2 +- src/mainboard/google/link/intel_dp.c | 2 +- src/mainboard/google/stout/i915.c | 2 +- src/mainboard/hp/dl145_g1/romstage.c | 2 +- src/mainboard/intel/eagleheights/romstage.c | 2 +- src/mainboard/lenovo/t60/dock.c | 2 +- src/mainboard/lenovo/t60/mainboard.c | 2 +- src/mainboard/lenovo/x60/dock.c | 2 +- src/mainboard/lenovo/x60/mainboard.c | 2 +- src/mainboard/lenovo/x60/smihandler.c | 2 +- src/mainboard/roda/rk886ex/m3885.c | 2 +- src/mainboard/roda/rk886ex/mainboard.c | 2 +- src/mainboard/siemens/sitemp_g1p1/mainboard.c | 2 +- src/mainboard/supermicro/x7db8/mainboard.c | 2 +- src/mainboard/technexion/tim5690/speaker.c | 2 +- src/mainboard/thomson/ip1000/mainboard.c | 2 +- src/mainboard/via/epia-m700/wakeup.c | 2 +- src/northbridge/amd/amdfam10/debug.c | 2 +- src/northbridge/amd/amdfam10/raminit_sysinfo_in_ram.c | 2 +- src/northbridge/amd/amdmct/wrappers/mcti_d.c | 2 +- src/northbridge/intel/gm45/delay.c | 2 +- src/northbridge/intel/gm45/delay.h | 2 +- src/northbridge/intel/gm45/raminit_rcomp_calibration.c | 2 +- src/northbridge/intel/haswell/gma.c | 2 +- src/northbridge/intel/haswell/northbridge.c | 2 +- src/northbridge/intel/haswell/udelay.c | 2 +- src/northbridge/intel/i440bx/raminit.c | 2 +- src/northbridge/intel/i440lx/raminit.c | 2 +- src/northbridge/intel/i5000/raminit.c | 2 +- src/northbridge/intel/i5000/udelay.c | 2 +- src/northbridge/intel/i82810/raminit.c | 2 +- src/northbridge/intel/i82830/raminit.c | 2 +- src/northbridge/intel/i855/raminit.c | 2 +- src/northbridge/intel/i945/gma.c | 2 +- src/northbridge/intel/i945/udelay.c | 2 +- src/northbridge/intel/sandybridge/gma.c | 2 +- src/northbridge/intel/sandybridge/northbridge.c | 2 +- src/northbridge/intel/sandybridge/udelay.c | 2 +- src/northbridge/via/cn400/raminit.c | 2 +- src/northbridge/via/cn700/raminit.c | 2 +- src/northbridge/via/cx700/raminit.c | 2 +- src/northbridge/via/vx800/raminit.c | 2 +- src/southbridge/amd/agesa/hudson/hda.c | 2 +- src/southbridge/amd/agesa/hudson/sata.c | 2 +- src/southbridge/amd/amd8111/nic.c | 2 +- src/southbridge/amd/cs5530/vga.c | 2 +- src/southbridge/amd/rs690/cmn.c | 2 +- src/southbridge/amd/rs690/gfx.c | 2 +- src/southbridge/amd/rs690/pcie.c | 2 +- src/southbridge/amd/rs780/cmn.c | 2 +- src/southbridge/amd/rs780/gfx.c | 2 +- src/southbridge/amd/rs780/pcie.c | 2 +- src/southbridge/amd/sb600/hda.c | 2 +- src/southbridge/amd/sb600/sata.c | 2 +- src/southbridge/amd/sb700/hda.c | 2 +- src/southbridge/amd/sb700/sata.c | 2 +- src/southbridge/amd/sb800/hda.c | 2 +- src/southbridge/amd/sb800/sata.c | 2 +- src/southbridge/amd/sr5650/pcie.c | 2 +- src/southbridge/amd/sr5650/sr5650.c | 2 +- src/southbridge/broadcom/bcm5785/sata.c | 2 +- src/southbridge/intel/bd82x6x/azalia.c | 2 +- src/southbridge/intel/bd82x6x/early_me.c | 2 +- src/southbridge/intel/bd82x6x/early_spi.c | 2 +- src/southbridge/intel/bd82x6x/me.c | 2 +- src/southbridge/intel/bd82x6x/me_8.x.c | 2 +- src/southbridge/intel/bd82x6x/pch.c | 2 +- src/southbridge/intel/bd82x6x/spi.c | 2 +- src/southbridge/intel/esb6300/smbus.h | 2 +- src/southbridge/intel/i82801dx/ac97.c | 2 +- src/southbridge/intel/i82801gx/ac97.c | 2 +- src/southbridge/intel/i82801gx/azalia.c | 2 +- src/southbridge/intel/i82801ix/hdaudio.c | 2 +- src/southbridge/intel/lynxpoint/azalia.c | 2 +- src/southbridge/intel/lynxpoint/early_me.c | 2 +- src/southbridge/intel/lynxpoint/early_spi.c | 2 +- src/southbridge/intel/lynxpoint/me_9.x.c | 2 +- src/southbridge/intel/lynxpoint/pch.c | 2 +- src/southbridge/intel/lynxpoint/sata.c | 2 +- src/southbridge/intel/lynxpoint/spi.c | 2 +- src/southbridge/intel/pxhd/bridge.c | 2 +- src/southbridge/intel/sch/audio.c | 2 +- src/southbridge/nvidia/ck804/sata.c | 2 +- src/southbridge/nvidia/mcp55/azalia.c | 2 +- src/southbridge/nvidia/mcp55/nic.c | 2 +- src/southbridge/nvidia/mcp55/sata.c | 2 +- src/southbridge/ricoh/rl5c476/rl5c476.c | 2 +- src/southbridge/sis/sis966/aza.c | 2 +- src/southbridge/sis/sis966/nic.c | 2 +- src/southbridge/sis/sis966/sata.c | 2 +- src/southbridge/via/k8t890/pcie.c | 2 +- 135 files changed, 150 insertions(+), 150 deletions(-)
diff --git a/src/cpu/amd/sc520/sc520.c b/src/cpu/amd/sc520/sc520.c index 6079828..5758160 100644 --- a/src/cpu/amd/sc520/sc520.c +++ b/src/cpu/amd/sc520/sc520.c @@ -12,7 +12,7 @@ #include <device/hypertransport.h> #include <stdlib.h> #include <string.h> -#include <delay.h> +#include <time.h>
/* * set up basic things ... diff --git a/src/cpu/intel/haswell/mp_init.c b/src/cpu/intel/haswell/mp_init.c index ddcff6c..8e561a0 100644 --- a/src/cpu/intel/haswell/mp_init.c +++ b/src/cpu/intel/haswell/mp_init.c @@ -30,7 +30,7 @@ #include <cpu/x86/msr.h> #include <cpu/x86/mtrr.h> #include <cpu/x86/smm.h> -#include <delay.h> +#include <time.h> #include <device/device.h> #include <device/path.h> #include <lib.h> diff --git a/src/cpu/samsung/exynos5-common/i2c.c b/src/cpu/samsung/exynos5-common/i2c.c index 30fabe1..992c681 100644 --- a/src/cpu/samsung/exynos5-common/i2c.c +++ b/src/cpu/samsung/exynos5-common/i2c.c @@ -26,7 +26,7 @@ * The different address mapping is handled by the s3c24xx.h files below. */
-#include <delay.h> +#include <time.h> #include <arch/io.h> #include <console/console.h> #include <device/i2c.h> diff --git a/src/cpu/samsung/exynos5250/clock_init.c b/src/cpu/samsung/exynos5250/clock_init.c index 618fdb6..ae4e909 100644 --- a/src/cpu/samsung/exynos5250/clock_init.c +++ b/src/cpu/samsung/exynos5250/clock_init.c @@ -22,7 +22,7 @@ * MA 02111-1307 USA */
-#include <delay.h> +#include <time.h> #include <stdlib.h> #include <types.h> #include <system.h> diff --git a/src/cpu/via/c7/c7_init.c b/src/cpu/via/c7/c7_init.c index 510e66d..e13c8fa 100644 --- a/src/cpu/via/c7/c7_init.c +++ b/src/cpu/via/c7/c7_init.c @@ -21,7 +21,7 @@
#include <device/device.h> #include <console/console.h> -#include <delay.h> +#include <time.h> #include <stdlib.h> #include <cpu/cpu.h> #include <cpu/x86/mtrr.h> diff --git a/src/cpu/via/nano/nano_init.c b/src/cpu/via/nano/nano_init.c index 417119f..613facf 100644 --- a/src/cpu/via/nano/nano_init.c +++ b/src/cpu/via/nano/nano_init.c @@ -25,7 +25,7 @@ #include <cpu/x86/msr.h> #include <cpu/x86/lapic.h> #include <cpu/x86/cache.h> -#include <delay.h> +#include <time.h>
#define MODEL_NANO 0x2 #define MODEL_NANO_3000_B0 0x8 diff --git a/src/cpu/x86/lapic/apic_timer.c b/src/cpu/x86/lapic/apic_timer.c index b60da27..52710bc 100644 --- a/src/cpu/x86/lapic/apic_timer.c +++ b/src/cpu/x86/lapic/apic_timer.c @@ -19,7 +19,7 @@ */
#include <stdint.h> -#include <delay.h> +#include <time.h> #include <arch/io.h> #include <arch/cpu.h> #include <cpu/x86/car.h> diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c index 69430d5..dc40043 100644 --- a/src/cpu/x86/lapic/lapic_cpu_init.c +++ b/src/cpu/x86/lapic/lapic_cpu_init.c @@ -21,7 +21,7 @@ */
#include <cpu/x86/lapic.h> -#include <delay.h> +#include <time.h> #include <lib.h> #include <string.h> #include <console/console.h> diff --git a/src/cpu/x86/tsc/delay_tsc.c b/src/cpu/x86/tsc/delay_tsc.c index 1907a9c..0e15bf6 100644 --- a/src/cpu/x86/tsc/delay_tsc.c +++ b/src/cpu/x86/tsc/delay_tsc.c @@ -3,7 +3,7 @@ #include <cpu/x86/msr.h> #include <cpu/x86/tsc.h> #include <smp/spinlock.h> -#include <delay.h> +#include <time.h>
static unsigned long clocks_per_usec;
diff --git a/src/device/oprom/realmode/x86.c b/src/device/oprom/realmode/x86.c index 94b65e1..6a7ecbd 100644 --- a/src/device/oprom/realmode/x86.c +++ b/src/device/oprom/realmode/x86.c @@ -26,7 +26,7 @@ #include <console/console.h> #include <arch/interrupt.h> #include <cbfs.h> -#include <delay.h> +#include <time.h> #include <pc80/i8259.h> #include "x86.h" #include "vbe.h" diff --git a/src/device/oprom/yabel/vbe.c b/src/device/oprom/yabel/vbe.c index 5952dae..c710f05 100644 --- a/src/device/oprom/yabel/vbe.c +++ b/src/device/oprom/yabel/vbe.c @@ -33,7 +33,7 @@
#include <cbfs.h>
-#include <delay.h> +#include <time.h> #include "../../src/lib/jpeg.h"
#include <vbe.h> diff --git a/src/device/pci_device.c b/src/device/pci_device.c index 4c5a814..09ec336 100644 --- a/src/device/pci_device.c +++ b/src/device/pci_device.c @@ -31,7 +31,7 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <delay.h> +#include <time.h> #if CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT #include <device/hypertransport.h> #endif diff --git a/src/device/pciexp_device.c b/src/device/pciexp_device.c index 87aea67..5bd8ebc 100644 --- a/src/device/pciexp_device.c +++ b/src/device/pciexp_device.c @@ -19,7 +19,7 @@ */
#include <console/console.h> -#include <delay.h> +#include <time.h> #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> diff --git a/src/drivers/ati/ragexl/xlinit.c b/src/drivers/ati/ragexl/xlinit.c index 36a0619..56860f9 100644 --- a/src/drivers/ati/ragexl/xlinit.c +++ b/src/drivers/ati/ragexl/xlinit.c @@ -10,7 +10,7 @@ * move to coreboot * This code is distributed without warranty under the GPL v2 (see COPYING) * */ -#include <delay.h> +#include <time.h> #include <stdlib.h> #include <string.h> #include <arch/io.h> diff --git a/src/drivers/emulation/qemu/init.c b/src/drivers/emulation/qemu/init.c index 7fe3fc7..1d54c23 100644 --- a/src/drivers/emulation/qemu/init.c +++ b/src/drivers/emulation/qemu/init.c @@ -1,4 +1,4 @@ -#include <delay.h> +#include <time.h> #include <stdlib.h> #include <string.h> #include <arch/io.h> diff --git a/src/drivers/generic/debug/debug_dev.c b/src/drivers/generic/debug/debug_dev.c index b523ca7..1d7c009 100644 --- a/src/drivers/generic/debug/debug_dev.c +++ b/src/drivers/generic/debug/debug_dev.c @@ -6,7 +6,7 @@ #include <device/pci_ops.h> #include <cpu/x86/msr.h> #include <reset.h> -#include <delay.h> +#include <time.h>
static void print_pci_regs(struct device *dev) { diff --git a/src/drivers/generic/ioapic/ioapic.c b/src/drivers/generic/ioapic/ioapic.c index 9a93c78..6c2f9cb 100644 --- a/src/drivers/generic/ioapic/ioapic.c +++ b/src/drivers/generic/ioapic/ioapic.c @@ -6,7 +6,7 @@ #include <device/pci_ops.h> #include <cpu/x86/msr.h> #include <reset.h> -#include <delay.h> +#include <time.h> #include "chip.h" #include <arch/ioapic.h> #include <arch/io.h> diff --git a/src/drivers/ipmi/ipmi_kcs.c b/src/drivers/ipmi/ipmi_kcs.c index 9be1433..df61c22 100644 --- a/src/drivers/ipmi/ipmi_kcs.c +++ b/src/drivers/ipmi/ipmi_kcs.c @@ -23,7 +23,7 @@ #include <device/device.h> #include <arch/io.h> #include <string.h> -#include <delay.h> +#include <time.h> #include "ipmi_kcs.h"
#define IPMI_KCS_STATE(_x) ((_x) >> 6) diff --git a/src/drivers/oxford/oxpcie/oxpcie_early.c b/src/drivers/oxford/oxpcie/oxpcie_early.c index 9899619..5b03943 100644 --- a/src/drivers/oxford/oxpcie/oxpcie_early.c +++ b/src/drivers/oxford/oxpcie/oxpcie_early.c @@ -20,7 +20,7 @@ #include <stdint.h> #include <arch/io.h> #include <cpu/x86/car.h> -#include <delay.h> +#include <time.h> #include <uart8250.h> #include <device/pci_def.h>
diff --git a/src/drivers/pc80/keyboard.c b/src/drivers/pc80/keyboard.c index 2888bcf..4e6f9bf 100644 --- a/src/drivers/pc80/keyboard.c +++ b/src/drivers/pc80/keyboard.c @@ -24,7 +24,7 @@ #include <pc80/keyboard.h> #include <device/device.h> #include <arch/io.h> -#include <delay.h> +#include <time.h>
#define KBD_DATA 0x60 #define KBD_COMMAND 0x64 diff --git a/src/drivers/pc80/tpm.c b/src/drivers/pc80/tpm.c index c7b5081..7ddd758 100644 --- a/src/drivers/pc80/tpm.c +++ b/src/drivers/pc80/tpm.c @@ -29,7 +29,7 @@
#include <stdlib.h> #include <string.h> -#include <delay.h> +#include <time.h> #include <arch/io.h> #include <arch/byteorder.h> #include <console/console.h> diff --git a/src/drivers/pc80/udelay_io.c b/src/drivers/pc80/udelay_io.c index 37f3f73..38855b8 100644 --- a/src/drivers/pc80/udelay_io.c +++ b/src/drivers/pc80/udelay_io.c @@ -1,5 +1,5 @@ #include <arch/io.h> -#include <delay.h> +#include <time.h>
void udelay(unsigned usecs) { diff --git a/src/drivers/sil/3114/sil_sata.c b/src/drivers/sil/3114/sil_sata.c index 1285726..7a9a77f 100644 --- a/src/drivers/sil/3114/sil_sata.c +++ b/src/drivers/sil/3114/sil_sata.c @@ -4,7 +4,7 @@ * Copyright (C) 2010 Rudolf Marek r.marek@assembler.cz */
-#include <delay.h> +#include <time.h> #include <stdlib.h> #include <string.h> #include <arch/io.h> diff --git a/src/drivers/spi/spi_flash.c b/src/drivers/spi/spi_flash.c index d1a9504..57c9d6e 100644 --- a/src/drivers/spi/spi_flash.c +++ b/src/drivers/spi/spi_flash.c @@ -11,7 +11,7 @@ #include <string.h> #include <spi-generic.h> #include <spi_flash.h> -#include <delay.h> +#include <time.h> #ifdef __SMM__ #include <cpu/x86/smm.h> #endif diff --git a/src/drivers/trident/blade3d/blade3d.c b/src/drivers/trident/blade3d/blade3d.c index 1d79766..28f7815 100644 --- a/src/drivers/trident/blade3d/blade3d.c +++ b/src/drivers/trident/blade3d/blade3d.c @@ -4,7 +4,7 @@ * (C) 2003 XGI Technology Inc. * This code is released under GPL with permission from XGI */ -#include <delay.h> +#include <time.h> #include <stdlib.h> #include <string.h> #include <arch/io.h> diff --git a/src/ec/acpi/ec.c b/src/ec/acpi/ec.c index d3a6aaf..f585d2e 100644 --- a/src/ec/acpi/ec.c +++ b/src/ec/acpi/ec.c @@ -22,7 +22,7 @@ #include <console/console.h> #include <device/device.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include "ec.h"
static int ec_cmd_reg = EC_SC; diff --git a/src/ec/compal/ene932/ec.c b/src/ec/compal/ene932/ec.c index c3087e9..5487dc2 100644 --- a/src/ec/compal/ene932/ec.c +++ b/src/ec/compal/ene932/ec.c @@ -26,7 +26,7 @@ #include <device/pnp.h> #include <stdlib.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include "ec.h" #include "chip.h"
diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c index 5ae0178..a5c3d55 100644 --- a/src/ec/google/chromeec/ec.c +++ b/src/ec/google/chromeec/ec.c @@ -20,7 +20,7 @@ #include <stdint.h> #include <console/console.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include <device/device.h> #include <device/pnp.h> #ifndef __PRE_RAM__ diff --git a/src/ec/quanta/ene_kb3940q/ec.c b/src/ec/quanta/ene_kb3940q/ec.c index 137aa81..ffb54fa 100644 --- a/src/ec/quanta/ene_kb3940q/ec.c +++ b/src/ec/quanta/ene_kb3940q/ec.c @@ -26,7 +26,7 @@ #include <device/device.h> #include <device/pnp.h> #include <stdlib.h> -#include <delay.h> +#include <time.h> #include <elog.h> #include "ec.h" #include "chip.h" diff --git a/src/ec/quanta/it8518/ec.c b/src/ec/quanta/it8518/ec.c index 4798cee..e333f87 100644 --- a/src/ec/quanta/it8518/ec.c +++ b/src/ec/quanta/it8518/ec.c @@ -30,7 +30,7 @@
#include <stdlib.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include "ec.h" #include "chip.h"
diff --git a/src/ec/smsc/mec1308/ec.c b/src/ec/smsc/mec1308/ec.c index fdae5e4..cf9672a 100644 --- a/src/ec/smsc/mec1308/ec.c +++ b/src/ec/smsc/mec1308/ec.c @@ -22,7 +22,7 @@ #include <console/console.h> #include <device/device.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include "ec.h" #include "chip.h"
diff --git a/src/include/delay.h b/src/include/delay.h deleted file mode 100644 index 0333879..0000000 --- a/src/include/delay.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef DELAY_H -#define DELAY_H - -#if !defined( __ROMCC__) - -#if CONFIG_HAVE_INIT_TIMER -void init_timer(void); -#else -#define init_timer() do{} while(0) -#endif - -void udelay(unsigned usecs); -void mdelay(unsigned msecs); -void delay(unsigned secs); - -#endif -#endif /* DELAY_H */ diff --git a/src/include/time.h b/src/include/time.h new file mode 100644 index 0000000..0333879 --- /dev/null +++ b/src/include/time.h @@ -0,0 +1,17 @@ +#ifndef DELAY_H +#define DELAY_H + +#if !defined( __ROMCC__) + +#if CONFIG_HAVE_INIT_TIMER +void init_timer(void); +#else +#define init_timer() do{} while(0) +#endif + +void udelay(unsigned usecs); +void mdelay(unsigned msecs); +void delay(unsigned secs); + +#endif +#endif /* DELAY_H */ diff --git a/src/lib/delay.c b/src/lib/delay.c index 207c629..15d5c61 100644 --- a/src/lib/delay.c +++ b/src/lib/delay.c @@ -1,4 +1,4 @@ -#include <delay.h> +#include <time.h> void mdelay(unsigned msecs) { unsigned i; diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c index a3ee10b..64a7944 100644 --- a/src/lib/hardwaremain.c +++ b/src/lib/hardwaremain.c @@ -29,7 +29,7 @@ it with the version available from LANL. #include <version.h> #include <device/device.h> #include <device/pci.h> -#include <delay.h> +#include <time.h> #include <stdlib.h> #include <reset.h> #include <boot/tables.h> diff --git a/src/lib/ne2k.c b/src/lib/ne2k.c index 31470fc..8478e19 100644 --- a/src/lib/ne2k.c +++ b/src/lib/ne2k.c @@ -415,7 +415,7 @@ int ne2k_init(unsigned int eth_nic_base) {
#else
-#include <delay.h> +#include <time.h> #include <stdlib.h> #include <string.h> #include <arch/io.h> diff --git a/src/lib/uart8250mem.c b/src/lib/uart8250mem.c index 8224843..33bb738 100644 --- a/src/lib/uart8250mem.c +++ b/src/lib/uart8250mem.c @@ -27,7 +27,7 @@ #if !defined(__SMM__) && !defined(__PRE_RAM__) #include <device/device.h> #endif -#include <delay.h> +#include <time.h>
/* Should support 8250, 16450, 16550, 16550A type UARTs */
diff --git a/src/lib/xmodem.c b/src/lib/xmodem.c index c3bb1d8..6c37a79 100644 --- a/src/lib/xmodem.c +++ b/src/lib/xmodem.c @@ -18,7 +18,7 @@ */
#include <string.h> -#include <delay.h> +#include <time.h> #include <uart8250.h>
static int _inbyte(int msec) diff --git a/src/mainboard/amd/inagua/broadcom.c b/src/mainboard/amd/inagua/broadcom.c index 86de3b4..603e628 100644 --- a/src/mainboard/amd/inagua/broadcom.c +++ b/src/mainboard/amd/inagua/broadcom.c @@ -33,7 +33,7 @@ #include <console/console.h> #include <device/device.h> //Coreboot device access #include <device/pci.h> -#include <delay.h> +#include <time.h>
void broadcom_init(void);
diff --git a/src/mainboard/amd/south_station/mainboard.c b/src/mainboard/amd/south_station/mainboard.c index 43d6a78..e366d2a 100644 --- a/src/mainboard/amd/south_station/mainboard.c +++ b/src/mainboard/amd/south_station/mainboard.c @@ -25,7 +25,7 @@ #include <southbridge/amd/sb800/sb800.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> -#include <delay.h> +#include <time.h> #include "SBPLATFORM.h" /* Platfrom Specific Definitions */
diff --git a/src/mainboard/asus/dsbf/mainboard.c b/src/mainboard/asus/dsbf/mainboard.c index 34a355e..876b026 100644 --- a/src/mainboard/asus/dsbf/mainboard.c +++ b/src/mainboard/asus/dsbf/mainboard.c @@ -22,7 +22,7 @@ #include <console/console.h> #include <device/device.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include <device/pci_def.h> #include <device/pci_ops.h> #include <arch/io.h> diff --git a/src/mainboard/emulation/qemu-x86/northbridge.c b/src/mainboard/emulation/qemu-x86/northbridge.c index d785beb..d1673d7 100644 --- a/src/mainboard/emulation/qemu-x86/northbridge.c +++ b/src/mainboard/emulation/qemu-x86/northbridge.c @@ -7,7 +7,7 @@ #include <device/pci.h> #include <stdlib.h> #include <string.h> -#include <delay.h> +#include <time.h> #include <smbios.h> #include <cbmem.h>
diff --git a/src/mainboard/getac/p470/ec_oem.c b/src/mainboard/getac/p470/ec_oem.c index f742f3f..317c4e8 100644 --- a/src/mainboard/getac/p470/ec_oem.c +++ b/src/mainboard/getac/p470/ec_oem.c @@ -21,7 +21,7 @@
#include <console/console.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include <ec/acpi/ec.h> #include "ec_oem.h"
diff --git a/src/mainboard/getac/p470/mainboard.c b/src/mainboard/getac/p470/mainboard.c index edaf301..35968bc 100644 --- a/src/mainboard/getac/p470/mainboard.c +++ b/src/mainboard/getac/p470/mainboard.c @@ -23,7 +23,7 @@ #include <device/device.h> #include <device/pci_def.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include "hda_verb.h"
#include "ec_oem.c" diff --git a/src/mainboard/google/link/i915.c b/src/mainboard/google/link/i915.c index ec959ab..0750c7c 100644 --- a/src/mainboard/google/link/i915.c +++ b/src/mainboard/google/link/i915.c @@ -25,7 +25,7 @@ #include <device/pci_def.h> #include <device/pci_ops.h> #include <console/console.h> -#include <delay.h> +#include <time.h> #include <pc80/mc146818rtc.h> #include <arch/acpi.h> #include <arch/io.h> diff --git a/src/mainboard/google/link/intel_dp.c b/src/mainboard/google/link/intel_dp.c index 9fb66f6..5d02a9e 100644 --- a/src/mainboard/google/link/intel_dp.c +++ b/src/mainboard/google/link/intel_dp.c @@ -28,7 +28,7 @@
#include <console/console.h> #include <stdint.h> -#include <delay.h> +#include <time.h> #include "i915io.h"
u32 diff --git a/src/mainboard/google/stout/i915.c b/src/mainboard/google/stout/i915.c index 89a8594..aacdcb5 100644 --- a/src/mainboard/google/stout/i915.c +++ b/src/mainboard/google/stout/i915.c @@ -5,7 +5,7 @@ #include <device/pci_def.h> #include <device/pci_ops.h> #include <console/console.h> -#include <delay.h> +#include <time.h> #if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL)&&CONFIG_PCI_OPTION_ROM_RUN_YABEL #include <x86emu/x86emu.h> #endif diff --git a/src/mainboard/hp/dl145_g1/romstage.c b/src/mainboard/hp/dl145_g1/romstage.c index 0ae744f..c47d802 100644 --- a/src/mainboard/hp/dl145_g1/romstage.c +++ b/src/mainboard/hp/dl145_g1/romstage.c @@ -7,7 +7,7 @@ #include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/amd/model_fxx_rev.h> -#include <delay.h> +#include <time.h> #include "northbridge/amd/amdk8/amdk8.h" #include "southbridge/amd/amd8111/early_smbus.c" #include "northbridge/amd/amdk8/raminit.h" diff --git a/src/mainboard/intel/eagleheights/romstage.c b/src/mainboard/intel/eagleheights/romstage.c index 3aeb71c..76d79de 100644 --- a/src/mainboard/intel/eagleheights/romstage.c +++ b/src/mainboard/intel/eagleheights/romstage.c @@ -20,7 +20,7 @@ * MA 02110-1301 USA */
-#include <delay.h> +#include <time.h> #include <stdint.h> #include <arch/io.h> #include <device/pci_def.h> diff --git a/src/mainboard/lenovo/t60/dock.c b/src/mainboard/lenovo/t60/dock.c index 9921457..4524f04 100644 --- a/src/mainboard/lenovo/t60/dock.c +++ b/src/mainboard/lenovo/t60/dock.c @@ -22,7 +22,7 @@ #include <console/console.h> #include <device/device.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include "dock.h" #include "superio/nsc/pc87384/pc87384.h" #include "ec/acpi/ec.h" diff --git a/src/mainboard/lenovo/t60/mainboard.c b/src/mainboard/lenovo/t60/mainboard.c index 2e54c7b..61054f7 100644 --- a/src/mainboard/lenovo/t60/mainboard.c +++ b/src/mainboard/lenovo/t60/mainboard.c @@ -23,7 +23,7 @@ #include <console/console.h> #include <device/device.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include <device/pci_def.h> #include <device/pci_ops.h> #include <arch/io.h> diff --git a/src/mainboard/lenovo/x60/dock.c b/src/mainboard/lenovo/x60/dock.c index 1b15a6c..de3895b 100644 --- a/src/mainboard/lenovo/x60/dock.c +++ b/src/mainboard/lenovo/x60/dock.c @@ -22,7 +22,7 @@ #include <console/console.h> #include <device/device.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include <arch/io.h> #include "dock.h" #include "southbridge/intel/i82801gx/i82801gx.h" diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c index e5d2e19..beb998d 100644 --- a/src/mainboard/lenovo/x60/mainboard.c +++ b/src/mainboard/lenovo/x60/mainboard.c @@ -23,7 +23,7 @@ #include <console/console.h> #include <device/device.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include <device/pci_def.h> #include <device/pci_ops.h> #include <device/pci_ids.h> diff --git a/src/mainboard/lenovo/x60/smihandler.c b/src/mainboard/lenovo/x60/smihandler.c index 5a7130f..e221bcf 100644 --- a/src/mainboard/lenovo/x60/smihandler.c +++ b/src/mainboard/lenovo/x60/smihandler.c @@ -27,7 +27,7 @@ #include <ec/acpi/ec.h> #include <pc80/mc146818rtc.h> #include <ec/lenovo/h8/h8.h> -#include <delay.h> +#include <time.h> #include "dock.h" #include "smi.h"
diff --git a/src/mainboard/roda/rk886ex/m3885.c b/src/mainboard/roda/rk886ex/m3885.c index 29d12bc..d358b50 100644 --- a/src/mainboard/roda/rk886ex/m3885.c +++ b/src/mainboard/roda/rk886ex/m3885.c @@ -23,7 +23,7 @@ #include <stdlib.h> #include <console/console.h> #include <arch/io.h> -#include <delay.h> +#include <time.h>
#include <ec/acpi/ec.h> #include "m3885.h" diff --git a/src/mainboard/roda/rk886ex/mainboard.c b/src/mainboard/roda/rk886ex/mainboard.c index 575aa9b..287c44d 100644 --- a/src/mainboard/roda/rk886ex/mainboard.c +++ b/src/mainboard/roda/rk886ex/mainboard.c @@ -23,7 +23,7 @@ #include <device/device.h> #include <arch/io.h> #include <arch/interrupt.h> -#include <delay.h> +#include <time.h> #if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> #endif diff --git a/src/mainboard/siemens/sitemp_g1p1/mainboard.c b/src/mainboard/siemens/sitemp_g1p1/mainboard.c index 4fc6855..2e54f44 100644 --- a/src/mainboard/siemens/sitemp_g1p1/mainboard.c +++ b/src/mainboard/siemens/sitemp_g1p1/mainboard.c @@ -24,7 +24,7 @@ #include <device/pci.h> #include <arch/io.h> #include <arch/interrupt.h> -#include <delay.h> +#include <time.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> diff --git a/src/mainboard/supermicro/x7db8/mainboard.c b/src/mainboard/supermicro/x7db8/mainboard.c index 34a355e..876b026 100644 --- a/src/mainboard/supermicro/x7db8/mainboard.c +++ b/src/mainboard/supermicro/x7db8/mainboard.c @@ -22,7 +22,7 @@ #include <console/console.h> #include <device/device.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include <device/pci_def.h> #include <device/pci_ops.h> #include <arch/io.h> diff --git a/src/mainboard/technexion/tim5690/speaker.c b/src/mainboard/technexion/tim5690/speaker.c index e4d2a87..d2ad8c7 100644 --- a/src/mainboard/technexion/tim5690/speaker.c +++ b/src/mainboard/technexion/tim5690/speaker.c @@ -30,7 +30,7 @@ #include <device/pci.h> #include <device/pci_ids.h> #include "southbridge/amd/sb600/sb600.h" -#include <delay.h> +#include <time.h>
#endif /* __PRE_RAM__ */
diff --git a/src/mainboard/thomson/ip1000/mainboard.c b/src/mainboard/thomson/ip1000/mainboard.c index 909c9f6..ecfb223 100644 --- a/src/mainboard/thomson/ip1000/mainboard.c +++ b/src/mainboard/thomson/ip1000/mainboard.c @@ -20,7 +20,7 @@
#include <console/console.h> #include <device/device.h> -#include <delay.h> +#include <time.h> #if CONFIG_PCI_OPTION_ROM_RUN_YABEL #include <x86emu/x86emu.h> #endif diff --git a/src/mainboard/via/epia-m700/wakeup.c b/src/mainboard/via/epia-m700/wakeup.c index 28b8911..68ed9d9 100644 --- a/src/mainboard/via/epia-m700/wakeup.c +++ b/src/mainboard/via/epia-m700/wakeup.c @@ -34,7 +34,7 @@ #include <string.h> #include <arch/io.h> #include <console/console.h> -#include <delay.h> +#include <time.h> #include "wakeup.h"
int enable_a20(void); diff --git a/src/northbridge/amd/amdfam10/debug.c b/src/northbridge/amd/amdfam10/debug.c index 7d00af7..d73d629 100644 --- a/src/northbridge/amd/amdfam10/debug.c +++ b/src/northbridge/amd/amdfam10/debug.c @@ -22,7 +22,7 @@ */
#include "pci.c" -#include <delay.h> +#include <time.h>
static inline void print_debug_addr(const char *str, void *val) { diff --git a/src/northbridge/amd/amdfam10/raminit_sysinfo_in_ram.c b/src/northbridge/amd/amdfam10/raminit_sysinfo_in_ram.c index adf4d23..e523e08 100644 --- a/src/northbridge/amd/amdfam10/raminit_sysinfo_in_ram.c +++ b/src/northbridge/amd/amdfam10/raminit_sysinfo_in_ram.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#include <delay.h> +#include <time.h>
static void set_htic_bit(u8 i, u32 val, u8 bit) { diff --git a/src/northbridge/amd/amdmct/wrappers/mcti_d.c b/src/northbridge/amd/amdmct/wrappers/mcti_d.c index d6860b2..85055e8 100644 --- a/src/northbridge/amd/amdmct/wrappers/mcti_d.c +++ b/src/northbridge/amd/amdmct/wrappers/mcti_d.c @@ -18,7 +18,7 @@ */
/* Call-backs */ -#include <delay.h> +#include <time.h>
static u16 mctGet_NVbits(u8 index) { diff --git a/src/northbridge/intel/gm45/delay.c b/src/northbridge/intel/gm45/delay.c index 9f49c6e..f2471bb 100644 --- a/src/northbridge/intel/gm45/delay.c +++ b/src/northbridge/intel/gm45/delay.c @@ -22,7 +22,7 @@ #include <cpu/x86/tsc.h> #include <cpu/x86/msr.h> #include <cpu/intel/speedstep.h> -#include "delay.h" +#include "time.h"
/* Simple 32- to 64-bit multiplication. Uses 16-bit words to avoid overflow. */ static inline void multiply_to_tsc(tsc_t *const tsc, const u32 a, const u32 b) diff --git a/src/northbridge/intel/gm45/delay.h b/src/northbridge/intel/gm45/delay.h index dda6cf4..bb749b3 100644 --- a/src/northbridge/intel/gm45/delay.h +++ b/src/northbridge/intel/gm45/delay.h @@ -20,7 +20,7 @@ #ifndef __NORTHBRIDGE_INTEL_GM45_DELAY_H__ #define __NORTHBRIDGE_INTEL_GM45_DELAY_H__ 1
-#include <delay.h> +#include <time.h>
void ns100delay(u32); void udelay_from_reset(u32); diff --git a/src/northbridge/intel/gm45/raminit_rcomp_calibration.c b/src/northbridge/intel/gm45/raminit_rcomp_calibration.c index 4327045..036197c 100644 --- a/src/northbridge/intel/gm45/raminit_rcomp_calibration.c +++ b/src/northbridge/intel/gm45/raminit_rcomp_calibration.c @@ -19,7 +19,7 @@ */
#include <stdint.h> -#include <delay.h> +#include <time.h> #include <console/console.h> #include "gm45.h"
diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c index 0a67b6a..2d6a3b4 100644 --- a/src/northbridge/intel/haswell/gma.c +++ b/src/northbridge/intel/haswell/gma.c @@ -19,7 +19,7 @@
#include <arch/io.h> #include <console/console.h> -#include <delay.h> +#include <time.h> #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c index 16196ad..13ada25 100644 --- a/src/northbridge/intel/haswell/northbridge.c +++ b/src/northbridge/intel/haswell/northbridge.c @@ -22,7 +22,7 @@ #include <arch/acpi.h> #include <arch/io.h> #include <stdint.h> -#include <delay.h> +#include <time.h> #include <cpu/intel/haswell/haswell.h> #include <cpu/x86/msr.h> #include <device/device.h> diff --git a/src/northbridge/intel/haswell/udelay.c b/src/northbridge/intel/haswell/udelay.c index f5d541e..cd9310b 100644 --- a/src/northbridge/intel/haswell/udelay.c +++ b/src/northbridge/intel/haswell/udelay.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#include <delay.h> +#include <time.h> #include <stdint.h> #include <cpu/x86/tsc.h> #include <cpu/x86/msr.h> diff --git a/src/northbridge/intel/i440bx/raminit.c b/src/northbridge/intel/i440bx/raminit.c index e3cfbdf..63b090f 100644 --- a/src/northbridge/intel/i440bx/raminit.c +++ b/src/northbridge/intel/i440bx/raminit.c @@ -20,7 +20,7 @@ */
#include <spd.h> -#include <delay.h> +#include <time.h> #include <stdint.h> #include <stdlib.h> #include <arch/io.h> diff --git a/src/northbridge/intel/i440lx/raminit.c b/src/northbridge/intel/i440lx/raminit.c index d96e4eb..34d0df0 100644 --- a/src/northbridge/intel/i440lx/raminit.c +++ b/src/northbridge/intel/i440lx/raminit.c @@ -20,7 +20,7 @@ */
#include <spd.h> -#include <delay.h> +#include <time.h> #include <stdlib.h> #include "i440lx.h"
diff --git a/src/northbridge/intel/i5000/raminit.c b/src/northbridge/intel/i5000/raminit.c index 48499da..f39704d 100644 --- a/src/northbridge/intel/i5000/raminit.c +++ b/src/northbridge/intel/i5000/raminit.c @@ -32,7 +32,7 @@ #include <cbmem.h> #include <stdlib.h> #include <lib.h> -#include <delay.h> +#include <time.h>
static int i5000_for_each_channel(struct i5000_fbd_branch *branch, int (*cb)(struct i5000_fbd_channel *)) diff --git a/src/northbridge/intel/i5000/udelay.c b/src/northbridge/intel/i5000/udelay.c index e462bbc..c1092f0 100644 --- a/src/northbridge/intel/i5000/udelay.c +++ b/src/northbridge/intel/i5000/udelay.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#include <delay.h> +#include <time.h> #include <stdint.h> #include <cpu/x86/tsc.h> #include <cpu/x86/msr.h> diff --git a/src/northbridge/intel/i82810/raminit.c b/src/northbridge/intel/i82810/raminit.c index 2c379e7..633b9c9 100644 --- a/src/northbridge/intel/i82810/raminit.c +++ b/src/northbridge/intel/i82810/raminit.c @@ -21,7 +21,7 @@ */
#include <spd.h> -#include <delay.h> +#include <time.h> #include <stdint.h> #include <arch/io.h> #include <device/pci_def.h> diff --git a/src/northbridge/intel/i82830/raminit.c b/src/northbridge/intel/i82830/raminit.c index a42374c..5a1247f 100644 --- a/src/northbridge/intel/i82830/raminit.c +++ b/src/northbridge/intel/i82830/raminit.c @@ -20,7 +20,7 @@ */
#include <spd.h> -#include <delay.h> +#include <time.h> #include "lib/debug.c" #include "i82830.h"
diff --git a/src/northbridge/intel/i855/raminit.c b/src/northbridge/intel/i855/raminit.c index 919c653..fb8b681 100644 --- a/src/northbridge/intel/i855/raminit.c +++ b/src/northbridge/intel/i855/raminit.c @@ -22,7 +22,7 @@ #include <spd.h> #include <sdram_mode.h> #include <stdlib.h> -#include <delay.h> +#include <time.h> #include "i855.h"
/*----------------------------------------------------------------------------- diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c index b1e0c7b..f1115b6 100644 --- a/src/northbridge/intel/i945/gma.c +++ b/src/northbridge/intel/i945/gma.c @@ -18,7 +18,7 @@ */
#include <console/console.h> -#include <delay.h> +#include <time.h> #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> diff --git a/src/northbridge/intel/i945/udelay.c b/src/northbridge/intel/i945/udelay.c index 780c730..7ae865e 100644 --- a/src/northbridge/intel/i945/udelay.c +++ b/src/northbridge/intel/i945/udelay.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#include <delay.h> +#include <time.h> #include <stdint.h> #include <cpu/x86/tsc.h> #include <cpu/x86/msr.h> diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c index 853139e..8662e9d 100644 --- a/src/northbridge/intel/sandybridge/gma.c +++ b/src/northbridge/intel/sandybridge/gma.c @@ -19,7 +19,7 @@
#include <arch/io.h> #include <console/console.h> -#include <delay.h> +#include <time.h> #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c index b8022b8..8f3cf1c 100644 --- a/src/northbridge/intel/sandybridge/northbridge.c +++ b/src/northbridge/intel/sandybridge/northbridge.c @@ -22,7 +22,7 @@ #include <arch/acpi.h> #include <arch/io.h> #include <stdint.h> -#include <delay.h> +#include <time.h> #include <cpu/intel/model_206ax/model_206ax.h> #include <cpu/x86/msr.h> #include <cpu/x86/mtrr.h> diff --git a/src/northbridge/intel/sandybridge/udelay.c b/src/northbridge/intel/sandybridge/udelay.c index 3edd69d..a4f46d6 100644 --- a/src/northbridge/intel/sandybridge/udelay.c +++ b/src/northbridge/intel/sandybridge/udelay.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#include <delay.h> +#include <time.h> #include <stdint.h> #include <cpu/x86/tsc.h> #include <cpu/x86/msr.h> diff --git a/src/northbridge/via/cn400/raminit.c b/src/northbridge/via/cn400/raminit.c index 23a6209..078d374 100644 --- a/src/northbridge/via/cn400/raminit.c +++ b/src/northbridge/via/cn400/raminit.c @@ -29,7 +29,7 @@ /* ported from Via VT8263 Code*/
#include <spd.h> -#include <delay.h> +#include <time.h> #include <cpu/x86/mtrr.h> #include "cn400.h"
diff --git a/src/northbridge/via/cn700/raminit.c b/src/northbridge/via/cn700/raminit.c index 0103c4f..179eaed 100644 --- a/src/northbridge/via/cn700/raminit.c +++ b/src/northbridge/via/cn700/raminit.c @@ -21,7 +21,7 @@ */
#include <spd.h> -#include <delay.h> +#include <time.h> #include "cn700.h"
#if CONFIG_DEBUG_RAM_SETUP diff --git a/src/northbridge/via/cx700/raminit.c b/src/northbridge/via/cx700/raminit.c index a2e6dad..e8ed68e 100644 --- a/src/northbridge/via/cx700/raminit.c +++ b/src/northbridge/via/cx700/raminit.c @@ -20,7 +20,7 @@ #include <types.h> #include <spd.h> #include <spd_ddr2.h> -#include <delay.h> +#include <time.h> #include "registers.h"
/* Debugging macros. */ diff --git a/src/northbridge/via/vx800/raminit.c b/src/northbridge/via/vx800/raminit.c index 058337c..c5f7b7d 100644 --- a/src/northbridge/via/vx800/raminit.c +++ b/src/northbridge/via/vx800/raminit.c @@ -18,7 +18,7 @@ */
#include <spd.h> -#include <delay.h> +#include <time.h>
#if CONFIG_DEBUG_RAM_SETUP #define PRINT_DEBUG_MEM(x) print_debug(x) diff --git a/src/southbridge/amd/agesa/hudson/hda.c b/src/southbridge/amd/agesa/hudson/hda.c index 2e648b7..d8120ae 100644 --- a/src/southbridge/amd/agesa/hudson/hda.c +++ b/src/southbridge/amd/agesa/hudson/hda.c @@ -23,7 +23,7 @@ #include <device/pci_ids.h> #include <device/pci_ops.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include "hudson.h"
diff --git a/src/southbridge/amd/agesa/hudson/sata.c b/src/southbridge/amd/agesa/hudson/sata.c index cc8bf95..eb8d64f 100644 --- a/src/southbridge/amd/agesa/hudson/sata.c +++ b/src/southbridge/amd/agesa/hudson/sata.c @@ -19,7 +19,7 @@
#include <console/console.h> #include <device/device.h> -#include <delay.h> +#include <time.h> #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> diff --git a/src/southbridge/amd/amd8111/nic.c b/src/southbridge/amd/amd8111/nic.c index 4ab7212..268bcc8 100644 --- a/src/southbridge/amd/amd8111/nic.c +++ b/src/southbridge/amd/amd8111/nic.c @@ -7,7 +7,7 @@ #include <device/pci_ids.h> #include <device/pci_ops.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include "amd8111.h"
diff --git a/src/southbridge/amd/cs5530/vga.c b/src/southbridge/amd/cs5530/vga.c index 66ab239..dc16ce0 100644 --- a/src/southbridge/amd/cs5530/vga.c +++ b/src/southbridge/amd/cs5530/vga.c @@ -39,7 +39,7 @@ #include <device/pci_ids.h> #include <console/console.h> #include <cpu/amd/gx1def.h> -#include <delay.h> +#include <time.h>
#if CONFIG_GX1_VIDEO /* diff --git a/src/southbridge/amd/rs690/cmn.c b/src/southbridge/amd/rs690/cmn.c index 36870b3..b161b1e 100644 --- a/src/southbridge/amd/rs690/cmn.c +++ b/src/southbridge/amd/rs690/cmn.c @@ -27,7 +27,7 @@ #include <device/pci_ops.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> -#include <delay.h> +#include <time.h> #include "rs690.h"
static u32 nb_read_index(device_t dev, u32 index_reg, u32 index) diff --git a/src/southbridge/amd/rs690/gfx.c b/src/southbridge/amd/rs690/gfx.c index 42e6c35..0e2412a 100644 --- a/src/southbridge/amd/rs690/gfx.c +++ b/src/southbridge/amd/rs690/gfx.c @@ -28,7 +28,7 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> -#include <delay.h> +#include <time.h> #include "rs690.h"
#define CLK_CNTL_INDEX 0x8 diff --git a/src/southbridge/amd/rs690/pcie.c b/src/southbridge/amd/rs690/pcie.c index 0bd4da5..9c1313b 100644 --- a/src/southbridge/amd/rs690/pcie.c +++ b/src/southbridge/amd/rs690/pcie.c @@ -22,7 +22,7 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> -#include <delay.h> +#include <time.h> #include "rs690.h"
/*------------------------------------------------ diff --git a/src/southbridge/amd/rs780/cmn.c b/src/southbridge/amd/rs780/cmn.c index 3c6d22d..2574348 100644 --- a/src/southbridge/amd/rs780/cmn.c +++ b/src/southbridge/amd/rs780/cmn.c @@ -27,7 +27,7 @@ #include <device/pci_ops.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> -#include <delay.h> +#include <time.h> #include <cpu/cpu.h> #include "rs780.h"
diff --git a/src/southbridge/amd/rs780/gfx.c b/src/southbridge/amd/rs780/gfx.c index 2825925..83052c9 100644 --- a/src/southbridge/amd/rs780/gfx.c +++ b/src/southbridge/amd/rs780/gfx.c @@ -36,7 +36,7 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> -#include <delay.h> +#include <time.h> #include <cpu/x86/msr.h> #include "rs780.h" extern int is_dev3_present(void); diff --git a/src/southbridge/amd/rs780/pcie.c b/src/southbridge/amd/rs780/pcie.c index fcf3d94..8b561f2 100644 --- a/src/southbridge/amd/rs780/pcie.c +++ b/src/southbridge/amd/rs780/pcie.c @@ -22,7 +22,7 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> -#include <delay.h> +#include <time.h> #include "rs780.h"
/*------------------------------------------------ diff --git a/src/southbridge/amd/sb600/hda.c b/src/southbridge/amd/sb600/hda.c index 3b118af..a2d2fb9 100644 --- a/src/southbridge/amd/sb600/hda.c +++ b/src/southbridge/amd/sb600/hda.c @@ -23,7 +23,7 @@ #include <device/pci_ids.h> #include <device/pci_ops.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include "sb600.h"
#define HDA_ICII_REG 0x68 diff --git a/src/southbridge/amd/sb600/sata.c b/src/southbridge/amd/sb600/sata.c index 8664483..602b7c2 100644 --- a/src/southbridge/amd/sb600/sata.c +++ b/src/southbridge/amd/sb600/sata.c @@ -20,7 +20,7 @@
#include <console/console.h> #include <device/device.h> -#include <delay.h> +#include <time.h> #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> diff --git a/src/southbridge/amd/sb700/hda.c b/src/southbridge/amd/sb700/hda.c index 98cb75f..ea5b559 100644 --- a/src/southbridge/amd/sb700/hda.c +++ b/src/southbridge/amd/sb700/hda.c @@ -23,7 +23,7 @@ #include <device/pci_ids.h> #include <device/pci_ops.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include "sb700.h"
#define HDA_ICII_REG 0x68 diff --git a/src/southbridge/amd/sb700/sata.c b/src/southbridge/amd/sb700/sata.c index c0e3c0f..14ea555 100644 --- a/src/southbridge/amd/sb700/sata.c +++ b/src/southbridge/amd/sb700/sata.c @@ -19,7 +19,7 @@
#include <console/console.h> #include <device/device.h> -#include <delay.h> +#include <time.h> #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> diff --git a/src/southbridge/amd/sb800/hda.c b/src/southbridge/amd/sb800/hda.c index 1be44fb..7e9a059 100644 --- a/src/southbridge/amd/sb800/hda.c +++ b/src/southbridge/amd/sb800/hda.c @@ -23,7 +23,7 @@ #include <device/pci_ids.h> #include <device/pci_ops.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include "sb800.h"
#define HDA_ICII_REG 0x68 diff --git a/src/southbridge/amd/sb800/sata.c b/src/southbridge/amd/sb800/sata.c index 5ac6144..433df79 100644 --- a/src/southbridge/amd/sb800/sata.c +++ b/src/southbridge/amd/sb800/sata.c @@ -19,7 +19,7 @@
#include <console/console.h> #include <device/device.h> -#include <delay.h> +#include <time.h> #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> diff --git a/src/southbridge/amd/sr5650/pcie.c b/src/southbridge/amd/sr5650/pcie.c index 809675c..b69290c 100644 --- a/src/southbridge/amd/sr5650/pcie.c +++ b/src/southbridge/amd/sr5650/pcie.c @@ -22,7 +22,7 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> -#include <delay.h> +#include <time.h> #include "sr5650.h" #include "cmn.h"
diff --git a/src/southbridge/amd/sr5650/sr5650.c b/src/southbridge/amd/sr5650/sr5650.c index 0bb246e..4118ed3 100644 --- a/src/southbridge/amd/sr5650/sr5650.c +++ b/src/southbridge/amd/sr5650/sr5650.c @@ -25,7 +25,7 @@ #include <device/pci_ops.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> -#include <delay.h> +#include <time.h> #include "sr5650.h" #include "cmn.h"
diff --git a/src/southbridge/broadcom/bcm5785/sata.c b/src/southbridge/broadcom/bcm5785/sata.c index 62eab45..fbb0e6e 100644 --- a/src/southbridge/broadcom/bcm5785/sata.c +++ b/src/southbridge/broadcom/bcm5785/sata.c @@ -20,7 +20,7 @@
#include <console/console.h> #include <device/device.h> -#include <delay.h> +#include <time.h> #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> diff --git a/src/southbridge/intel/bd82x6x/azalia.c b/src/southbridge/intel/bd82x6x/azalia.c index 2d854a4..ff5131e 100644 --- a/src/southbridge/intel/bd82x6x/azalia.c +++ b/src/southbridge/intel/bd82x6x/azalia.c @@ -25,7 +25,7 @@ #include <device/pci_ids.h> #include <device/pci_ops.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include "pch.h"
#define HDA_ICII_REG 0x68 diff --git a/src/southbridge/intel/bd82x6x/early_me.c b/src/southbridge/intel/bd82x6x/early_me.c index 670e1ce..0719152 100644 --- a/src/southbridge/intel/bd82x6x/early_me.c +++ b/src/southbridge/intel/bd82x6x/early_me.c @@ -22,7 +22,7 @@ #include <arch/hlt.h> #include <arch/io.h> #include <console/console.h> -#include <delay.h> +#include <time.h> #include <device/pci_ids.h> #include <string.h> #include "me.h" diff --git a/src/southbridge/intel/bd82x6x/early_spi.c b/src/southbridge/intel/bd82x6x/early_spi.c index 6f57f63..4dfc030 100644 --- a/src/southbridge/intel/bd82x6x/early_spi.c +++ b/src/southbridge/intel/bd82x6x/early_spi.c @@ -22,7 +22,7 @@ #include <console/console.h> #include <device/pci_ids.h> #include <device/pci_def.h> -#include <delay.h> +#include <time.h> #include "pch.h"
#define SPI_DELAY 10 /* 10us */ diff --git a/src/southbridge/intel/bd82x6x/me.c b/src/southbridge/intel/bd82x6x/me.c index 7fdf926..b215ebd 100644 --- a/src/southbridge/intel/bd82x6x/me.c +++ b/src/southbridge/intel/bd82x6x/me.c @@ -34,7 +34,7 @@ #include <device/pci_ids.h> #include <device/pci_def.h> #include <string.h> -#include <delay.h> +#include <time.h> #include <elog.h>
#ifdef __SMM__ diff --git a/src/southbridge/intel/bd82x6x/me_8.x.c b/src/southbridge/intel/bd82x6x/me_8.x.c index f79adf5..71480cd 100644 --- a/src/southbridge/intel/bd82x6x/me_8.x.c +++ b/src/southbridge/intel/bd82x6x/me_8.x.c @@ -34,7 +34,7 @@ #include <device/pci_ids.h> #include <device/pci_def.h> #include <string.h> -#include <delay.h> +#include <time.h> #include <elog.h>
#ifdef __SMM__ diff --git a/src/southbridge/intel/bd82x6x/pch.c b/src/southbridge/intel/bd82x6x/pch.c index 37a0b64..e3d5906 100644 --- a/src/southbridge/intel/bd82x6x/pch.c +++ b/src/southbridge/intel/bd82x6x/pch.c @@ -20,7 +20,7 @@ */
#include <console/console.h> -#include <delay.h> +#include <time.h> #ifdef __SMM__ #include <arch/io.h> #include <device/pci_def.h> diff --git a/src/southbridge/intel/bd82x6x/spi.c b/src/southbridge/intel/bd82x6x/spi.c index 09169b1..250aae7 100644 --- a/src/southbridge/intel/bd82x6x/spi.c +++ b/src/southbridge/intel/bd82x6x/spi.c @@ -24,7 +24,7 @@ #include <stdint.h> #include <stdlib.h> #include <string.h> -#include <delay.h> +#include <time.h> #include <arch/io.h> #include <console/console.h> #include <device/pci_ids.h> diff --git a/src/southbridge/intel/esb6300/smbus.h b/src/southbridge/intel/esb6300/smbus.h index 4f4ec5c..c53be44 100644 --- a/src/southbridge/intel/esb6300/smbus.h +++ b/src/southbridge/intel/esb6300/smbus.h @@ -14,7 +14,7 @@
#define SMBUS_TIMEOUT (100*1000*10)
-#include <delay.h> +#include <time.h>
static int smbus_wait_until_ready(unsigned smbus_io_base) { diff --git a/src/southbridge/intel/i82801dx/ac97.c b/src/southbridge/intel/i82801dx/ac97.c index 004ab97..73f58ec 100644 --- a/src/southbridge/intel/i82801dx/ac97.c +++ b/src/southbridge/intel/i82801dx/ac97.c @@ -23,7 +23,7 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include "i82801dx.h"
#define NAMBAR 0x10 diff --git a/src/southbridge/intel/i82801gx/ac97.c b/src/southbridge/intel/i82801gx/ac97.c index 576ecce..cb6149c 100644 --- a/src/southbridge/intel/i82801gx/ac97.c +++ b/src/southbridge/intel/i82801gx/ac97.c @@ -23,7 +23,7 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include "i82801gx.h"
#define NAMBAR 0x10 diff --git a/src/southbridge/intel/i82801gx/azalia.c b/src/southbridge/intel/i82801gx/azalia.c index 26859c5..195dbcc 100644 --- a/src/southbridge/intel/i82801gx/azalia.c +++ b/src/southbridge/intel/i82801gx/azalia.c @@ -24,7 +24,7 @@ #include <device/pci_ids.h> #include <device/pci_ops.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include "i82801gx.h"
#define HDA_ICII_REG 0x68 diff --git a/src/southbridge/intel/i82801ix/hdaudio.c b/src/southbridge/intel/i82801ix/hdaudio.c index 2d75d11..1ed0f1e 100644 --- a/src/southbridge/intel/i82801ix/hdaudio.c +++ b/src/southbridge/intel/i82801ix/hdaudio.c @@ -25,7 +25,7 @@ #include <device/pci_ids.h> #include <device/pci_ops.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include "i82801ix.h"
#define HDA_ICII_REG 0x68 diff --git a/src/southbridge/intel/lynxpoint/azalia.c b/src/southbridge/intel/lynxpoint/azalia.c index ac2b79d..5614171 100644 --- a/src/southbridge/intel/lynxpoint/azalia.c +++ b/src/southbridge/intel/lynxpoint/azalia.c @@ -25,7 +25,7 @@ #include <device/pci_ids.h> #include <device/pci_ops.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include "pch.h"
#define HDA_ICII_REG 0x68 diff --git a/src/southbridge/intel/lynxpoint/early_me.c b/src/southbridge/intel/lynxpoint/early_me.c index 6b61eac..175282f 100644 --- a/src/southbridge/intel/lynxpoint/early_me.c +++ b/src/southbridge/intel/lynxpoint/early_me.c @@ -22,7 +22,7 @@ #include <arch/hlt.h> #include <arch/io.h> #include <console/console.h> -#include <delay.h> +#include <time.h> #include <device/pci_ids.h> #include <string.h> #include "me.h" diff --git a/src/southbridge/intel/lynxpoint/early_spi.c b/src/southbridge/intel/lynxpoint/early_spi.c index 6f57f63..4dfc030 100644 --- a/src/southbridge/intel/lynxpoint/early_spi.c +++ b/src/southbridge/intel/lynxpoint/early_spi.c @@ -22,7 +22,7 @@ #include <console/console.h> #include <device/pci_ids.h> #include <device/pci_def.h> -#include <delay.h> +#include <time.h> #include "pch.h"
#define SPI_DELAY 10 /* 10us */ diff --git a/src/southbridge/intel/lynxpoint/me_9.x.c b/src/southbridge/intel/lynxpoint/me_9.x.c index a16879b..a36b08d 100644 --- a/src/southbridge/intel/lynxpoint/me_9.x.c +++ b/src/southbridge/intel/lynxpoint/me_9.x.c @@ -36,7 +36,7 @@ #include <device/pci_ids.h> #include <device/pci_def.h> #include <string.h> -#include <delay.h> +#include <time.h> #include <elog.h>
#include "me.h" diff --git a/src/southbridge/intel/lynxpoint/pch.c b/src/southbridge/intel/lynxpoint/pch.c index cc3718d..6de254b 100644 --- a/src/southbridge/intel/lynxpoint/pch.c +++ b/src/southbridge/intel/lynxpoint/pch.c @@ -20,7 +20,7 @@ */
#include <console/console.h> -#include <delay.h> +#include <time.h> #include <arch/io.h> #include <device/device.h> #include <device/pci.h> diff --git a/src/southbridge/intel/lynxpoint/sata.c b/src/southbridge/intel/lynxpoint/sata.c index 8912865..0006b58 100644 --- a/src/southbridge/intel/lynxpoint/sata.c +++ b/src/southbridge/intel/lynxpoint/sata.c @@ -23,7 +23,7 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <delay.h> +#include <time.h> #include "pch.h"
typedef struct southbridge_intel_lynxpoint_config config_t; diff --git a/src/southbridge/intel/lynxpoint/spi.c b/src/southbridge/intel/lynxpoint/spi.c index eaa17d5..7d53ecd 100644 --- a/src/southbridge/intel/lynxpoint/spi.c +++ b/src/southbridge/intel/lynxpoint/spi.c @@ -24,7 +24,7 @@ #include <stdint.h> #include <stdlib.h> #include <string.h> -#include <delay.h> +#include <time.h> #include <arch/io.h> #include <console/console.h> #include <device/pci_ids.h> diff --git a/src/southbridge/intel/pxhd/bridge.c b/src/southbridge/intel/pxhd/bridge.c index 1134f8f..d3f9487 100644 --- a/src/southbridge/intel/pxhd/bridge.c +++ b/src/southbridge/intel/pxhd/bridge.c @@ -9,7 +9,7 @@ #include <device/pcix.h> #include <pc80/mc146818rtc.h> #include <arch/ioapic.h> -#include <delay.h> +#include <time.h> #include "pxhd.h"
static void pxhd_enable(device_t dev) diff --git a/src/southbridge/intel/sch/audio.c b/src/southbridge/intel/sch/audio.c index 701c944..56edf27 100644 --- a/src/southbridge/intel/sch/audio.c +++ b/src/southbridge/intel/sch/audio.c @@ -24,7 +24,7 @@ #include <device/pci_ids.h> #include <device/pci_ops.h> #include <arch/io.h> -#include <delay.h> +#include <time.h>
#define HDA_ICII_REG 0x68 #define HDA_ICII_BUSY (1 << 0) diff --git a/src/southbridge/nvidia/ck804/sata.c b/src/southbridge/nvidia/ck804/sata.c index bcf4200..635bf12 100644 --- a/src/southbridge/nvidia/ck804/sata.c +++ b/src/southbridge/nvidia/ck804/sata.c @@ -20,7 +20,7 @@
#include <console/console.h> #include <device/device.h> -#include <delay.h> +#include <time.h> #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> diff --git a/src/southbridge/nvidia/mcp55/azalia.c b/src/southbridge/nvidia/mcp55/azalia.c index a4ad51e..1846c19 100644 --- a/src/southbridge/nvidia/mcp55/azalia.c +++ b/src/southbridge/nvidia/mcp55/azalia.c @@ -24,7 +24,7 @@ #include <device/pci_ids.h> #include <device/pci_ops.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include "mcp55.h"
#define HDA_ICII_REG 0x68 diff --git a/src/southbridge/nvidia/mcp55/nic.c b/src/southbridge/nvidia/mcp55/nic.c index 86468fd..09a587d 100644 --- a/src/southbridge/nvidia/mcp55/nic.c +++ b/src/southbridge/nvidia/mcp55/nic.c @@ -28,7 +28,7 @@ #include <device/pci_ids.h> #include <device/pci_ops.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include "mcp55.h"
static int phy_read(u32 base, unsigned phy_addr, unsigned phy_reg) diff --git a/src/southbridge/nvidia/mcp55/sata.c b/src/southbridge/nvidia/mcp55/sata.c index 0501548..c01318a 100644 --- a/src/southbridge/nvidia/mcp55/sata.c +++ b/src/southbridge/nvidia/mcp55/sata.c @@ -23,7 +23,7 @@
#include <console/console.h> #include <device/device.h> -#include <delay.h> +#include <time.h> #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> diff --git a/src/southbridge/ricoh/rl5c476/rl5c476.c b/src/southbridge/ricoh/rl5c476/rl5c476.c index 0efcafa..a2e5627 100644 --- a/src/southbridge/ricoh/rl5c476/rl5c476.c +++ b/src/southbridge/ricoh/rl5c476/rl5c476.c @@ -25,7 +25,7 @@ #include <device/pci_ids.h> #include <console/console.h> #include <device/cardbus.h> -#include <delay.h> +#include <time.h> #include "rl5c476.h" #include "chip.h"
diff --git a/src/southbridge/sis/sis966/aza.c b/src/southbridge/sis/sis966/aza.c index 0fd8eb0..2966d5d 100644 --- a/src/southbridge/sis/sis966/aza.c +++ b/src/southbridge/sis/sis966/aza.c @@ -29,7 +29,7 @@ #include <device/pci_ids.h> #include <device/pci_ops.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include "sis966.h"
u8 SiS_SiS7502_init[7][3]={ diff --git a/src/southbridge/sis/sis966/nic.c b/src/southbridge/sis/sis966/nic.c index 18ed75e..6202b87 100644 --- a/src/southbridge/sis/sis966/nic.c +++ b/src/southbridge/sis/sis966/nic.c @@ -30,7 +30,7 @@ #include <device/pci_ids.h> #include <device/pci_ops.h> #include <arch/io.h> -#include <delay.h> +#include <time.h> #include "sis966.h"
diff --git a/src/southbridge/sis/sis966/sata.c b/src/southbridge/sis/sis966/sata.c index 3f8c28f..f6e5712 100644 --- a/src/southbridge/sis/sis966/sata.c +++ b/src/southbridge/sis/sis966/sata.c @@ -25,7 +25,7 @@
#include <console/console.h> #include <device/device.h> -#include <delay.h> +#include <time.h> #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> diff --git a/src/southbridge/via/k8t890/pcie.c b/src/southbridge/via/k8t890/pcie.c index adc6770..9f030f2 100644 --- a/src/southbridge/via/k8t890/pcie.c +++ b/src/southbridge/via/k8t890/pcie.c @@ -22,7 +22,7 @@ #include <device/pci.h> #include <device/pciexp.h> #include <device/pci_ids.h> -#include <delay.h> +#include <time.h> #include "k8t890.h"
/*