14 files changed, 6 insertions, 246 deletions
diff --git a/src/soc/nvidia/tegra124/Kconfig b/src/soc/nvidia/tegra124/Kconfig
index 1680f4554c..3ce368b95f 100644
--- a/src/soc/nvidia/tegra124/Kconfig
+++ b/src/soc/nvidia/tegra124/Kconfig
@@ -7,6 +7,8 @@ config SOC_NVIDIA_TEGRA124
 	select ARCH_RAMSTAGE_ARMV7
 	select HAVE_UART_SPECIAL
 	select HAVE_HARD_RESET
+	select HAVE_MONOTONIC_TIMER
+	select GENERIC_UDELAY
 	select BOOTBLOCK_CONSOLE
 	select ARM_BOOTBLOCK_CUSTOM
 	select ARM_LPAE
diff --git a/src/soc/nvidia/tegra124/Makefile.inc b/src/soc/nvidia/tegra124/Makefile.inc
index 6de142d4ce..49669ebd83 100644
--- a/src/soc/nvidia/tegra124/Makefile.inc
+++ b/src/soc/nvidia/tegra124/Makefile.inc
@@ -15,7 +15,6 @@ bootblock-$(CONFIG_SOFTWARE_I2C) += ../tegra/software_i2c.c
 bootblock-y += ../tegra/pingroup.c
 bootblock-y += ../tegra/pinmux.c
 bootblock-y += ../tegra/apbmisc.c
-bootblock-y += timer.c
 ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y)
 bootblock-$(CONFIG_DRIVERS_UART) += uart.c
 endif
@@ -25,7 +24,6 @@ verstage-y += cbfs.c
 verstage-y += dma.c
 verstage-y += monotonic_timer.c
 verstage-y += spi.c
-verstage-y += timer.c
 verstage-$(CONFIG_DRIVERS_UART) += uart.c
 verstage-y += ../tegra/gpio.c
 verstage-y += ../tegra/i2c.c
@@ -48,7 +46,6 @@ romstage-y += ../tegra/gpio.c
 romstage-y += ../tegra/i2c.c
 romstage-$(CONFIG_SOFTWARE_I2C) += ../tegra/software_i2c.c
 romstage-y += ../tegra/pinmux.c
-romstage-y += timer.c
 romstage-y += cache.c
 romstage-$(CONFIG_DRIVERS_UART) += uart.c
 
@@ -70,7 +67,6 @@ ramstage-y += ../tegra/i2c.c
 ramstage-$(CONFIG_SOFTWARE_I2C) += ../tegra/software_i2c.c
 ramstage-y += ../tegra/pinmux.c
 ramstage-y += ../tegra/usb.c
-ramstage-y += timer.c
 ramstage-$(CONFIG_DRIVERS_UART) += uart.c
 
 rmodules_$(ARCH-romstage-y)-y += monotonic_timer.c
diff --git a/src/soc/nvidia/tegra124/timer.c b/src/soc/nvidia/tegra124/timer.c
deleted file mode 100644
index 83f499cbf1..0000000000
--- a/src/soc/nvidia/tegra124/timer.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2013 Google Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <console/console.h>
-#include <timer.h>
-#include <delay.h>
-#include <thread.h>
-
-void init_timer(void)
-{
-}
-
-/* delay x useconds */
-void udelay(unsigned usec)
-{
-	struct mono_time current, end;
-
-	if (!thread_yield_microseconds(usec))
-		return;
-
-	timer_monotonic_get(&current);
-	end = current;
-	mono_time_add_usecs(&end, usec);
-
-	if (mono_time_after(&current, &end)) {
-		printk(BIOS_EMERG, "udelay: 0x%08x is impossibly large\n",
-				usec);
-		/* There's not much we can do if usec is too big. Use a long,
-		 * paranoid delay value and hope for the best... */
-		end = current;
-		mono_time_add_usecs(&end, USECS_PER_SEC);
-	}
-
-	while (mono_time_before(&current, &end))
-		timer_monotonic_get(&current);
-}
-
diff --git a/src/soc/nvidia/tegra132/Kconfig b/src/soc/nvidia/tegra132/Kconfig
index c87698a8d2..0a1b28be66 100644
--- a/src/soc/nvidia/tegra132/Kconfig
+++ b/src/soc/nvidia/tegra132/Kconfig
@@ -8,6 +8,7 @@ config SOC_NVIDIA_TEGRA132
 	select BOOTBLOCK_CONSOLE
 	select GIC
 	select HAVE_MONOTONIC_TIMER
+	select GENERIC_UDELAY
 	select HAVE_HARD_RESET
 	select HAVE_UART_SPECIAL
 	select HAVE_UART_MEMORY_MAPPED
diff --git a/src/soc/nvidia/tegra132/Makefile.inc b/src/soc/nvidia/tegra132/Makefile.inc
index 81d08f54df..8ad9b83059 100644
--- a/src/soc/nvidia/tegra132/Makefile.inc
+++ b/src/soc/nvidia/tegra132/Makefile.inc
@@ -1,7 +1,6 @@
 bootblock-y += bootblock.c
 bootblock-y += bootblock_asm.S
 bootblock-y += cbfs.c
-bootblock-y += timer.c
 bootblock-y += clock.c
 bootblock-y += spi.c
 bootblock-y += i2c.c
@@ -26,7 +25,6 @@ romstage-y += romstage_asm.S
 romstage-y += addressmap.c
 romstage-y += cbfs.c
 romstage-y += cbmem.c
-romstage-y += timer.c
 romstage-y += ccplex.c
 romstage-y += clock.c
 romstage-y += cpu.c
@@ -53,7 +51,6 @@ ramstage-y += cbfs.c
 ramstage-y += cbmem.c
 ramstage-y += cpu.c
 ramstage-y += cpu_lib.S
-ramstage-y += timer.c
 ramstage-y += clock.c
 ramstage-y += soc.c
 ramstage-y += spi.c
diff --git a/src/soc/nvidia/tegra132/timer.c b/src/soc/nvidia/tegra132/timer.c
deleted file mode 100644
index ed10340040..0000000000
--- a/src/soc/nvidia/tegra132/timer.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2014 Google Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <console/console.h>
-#include <timer.h>
-#include <delay.h>
-#include <thread.h>
-
-void init_timer(void)
-{
-}
-
-void udelay(unsigned usec)
-{
-	struct stopwatch sw;
-
-	/*
-	 * As the hardware clock granularity is in microseconds pad the
-	 * requested delay by one to get at least >= requested usec delay.
-	 */
-	usec += 1;
-
-	if (!thread_yield_microseconds(usec))
-		return;
-
-	stopwatch_init_usecs_expire(&sw, usec);
-	while (!stopwatch_expired(&sw))
-		;
-}
diff --git a/src/soc/rockchip/rk3288/Kconfig b/src/soc/rockchip/rk3288/Kconfig
index 0865fe8f54..70951a5fa7 100644
--- a/src/soc/rockchip/rk3288/Kconfig
+++ b/src/soc/rockchip/rk3288/Kconfig
@@ -26,6 +26,7 @@ config SOC_ROCKCHIP_RK3288
 	select ARCH_RAMSTAGE_ARMV7
 	select CPU_HAS_BOOTBLOCK_INIT
 	select HAVE_MONOTONIC_TIMER
+	select GENERIC_UDELAY
 	select HAVE_UART_MEMORY_MAPPED
 	select HAVE_UART_SPECIAL
 	select BOOTBLOCK_CONSOLE
diff --git a/src/soc/rockchip/rk3288/timer.c b/src/soc/rockchip/rk3288/timer.c
index 7162482406..658f4d74f4 100644
--- a/src/soc/rockchip/rk3288/timer.c
+++ b/src/soc/rockchip/rk3288/timer.c
@@ -23,36 +23,9 @@
 #include <soc/timer.h>
 #include <timer.h>
 
-void init_timer(void)
-{
-}
-
 void rk3288_init_timer(void)
 {
 	write32(TIMER_LOAD_VAL, &timer7_ptr->timer_load_count0);
 	write32(TIMER_LOAD_VAL, &timer7_ptr->timer_load_count1);
 	write32(1, &timer7_ptr->timer_ctrl_reg);
 }
-
-/* delay x useconds */
-void udelay(unsigned usec)
-{
-	struct mono_time current, end;
-
-	timer_monotonic_get(&current);
-	end = current;
-	mono_time_add_usecs(&end, usec);
-
-	if (mono_time_after(&current, &end)) {
-		printk(BIOS_EMERG, "udelay: 0x%08x is impossibly large\n",
-				usec);
-		/* There's not much we can do if usec is too big. Use a long,
-		 * paranoid delay value and hope for the best... */
-		end = current;
-		mono_time_add_usecs(&end, USECS_PER_SEC);
-	}
-
-	while (mono_time_before(&current, &end))
-		timer_monotonic_get(&current);
-}
-
diff --git a/src/soc/samsung/exynos5250/Kconfig b/src/soc/samsung/exynos5250/Kconfig
index 4126ec1e59..7034e96201 100644
--- a/src/soc/samsung/exynos5250/Kconfig
+++ b/src/soc/samsung/exynos5250/Kconfig
@@ -5,6 +5,7 @@ config CPU_SAMSUNG_EXYNOS5250
 	select ARCH_RAMSTAGE_ARMV7
 	select CPU_HAS_BOOTBLOCK_INIT
 	select HAVE_MONOTONIC_TIMER
+	select GENERIC_UDELAY
 	select HAVE_UART_SPECIAL
 	bool
 	default n
diff --git a/src/soc/samsung/exynos5250/Makefile.inc b/src/soc/samsung/exynos5250/Makefile.inc
index 4483f820d0..4cf2d9675e 100644
--- a/src/soc/samsung/exynos5250/Makefile.inc
+++ b/src/soc/samsung/exynos5250/Makefile.inc
@@ -10,7 +10,6 @@ bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += uart.c
 endif
 bootblock-y += wakeup.c
 bootblock-y += gpio.c
-bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += timer.c
 
 romstage-y += spi.c alternate_cbfs.c
 romstage-y += clock.c
@@ -24,7 +23,6 @@ romstage-y += monotonic_timer.c
 romstage-$(CONFIG_DRIVERS_UART) += uart.c
 romstage-y += wakeup.c
 romstage-y += gpio.c
-romstage-y += timer.c
 romstage-y += trustzone.c
 romstage-y += i2c.c
 #romstage-y += wdt.c
@@ -40,7 +38,6 @@ ramstage-y += cpu.c
 ramstage-y += tmu.c
 ramstage-y += mct.c
 ramstage-y += monotonic_timer.c
-ramstage-y += timer.c
 ramstage-y += gpio.c
 ramstage-y += i2c.c
 ramstage-y += dp-reg.c
diff --git a/src/soc/samsung/exynos5250/timer.c b/src/soc/samsung/exynos5250/timer.c
deleted file mode 100644
index 891c3d74cd..0000000000
--- a/src/soc/samsung/exynos5250/timer.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2009 Samsung Electronics
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <console/console.h>
-#include <delay.h>
-#include <soc/clk.h>
-#include <timer.h>
-
-void init_timer(void)
-{
-	/* Nothing to do because we manually
-	 * call mct_start() in the bootblock
-	 */
-}
-
-/* delay x useconds */
-void udelay(unsigned usec)
-{
-	struct mono_time current, end;
-
-	timer_monotonic_get(&current);
-	end = current;
-	mono_time_add_usecs(&end, usec);
-
-	if (mono_time_after(&current, &end)) {
-		printk(BIOS_EMERG, "udelay: 0x%08x is impossibly large\n",
-				usec);
-		/* There's not much we can do if usec is too big. Use a long,
-		 * paranoid delay value and hope for the best... */
-		end = current;
-		mono_time_add_usecs(&end, USECS_PER_SEC);
-	}
-
-	while (mono_time_before(&current, &end))
-		timer_monotonic_get(&current);
-}
diff --git a/src/soc/samsung/exynos5420/Kconfig b/src/soc/samsung/exynos5420/Kconfig
index ed9d2f8a84..072976a2ac 100644
--- a/src/soc/samsung/exynos5420/Kconfig
+++ b/src/soc/samsung/exynos5420/Kconfig
@@ -5,6 +5,7 @@ config CPU_SAMSUNG_EXYNOS5420
 	select ARCH_RAMSTAGE_ARMV7
 	select CPU_HAS_BOOTBLOCK_INIT
 	select HAVE_MONOTONIC_TIMER
+	select GENERIC_UDELAY
 	select HAVE_UART_SPECIAL
 	select RELOCATABLE_MODULES
 	bool
diff --git a/src/soc/samsung/exynos5420/Makefile.inc b/src/soc/samsung/exynos5420/Makefile.inc
index eab4fb38c6..4e92864d5e 100644
--- a/src/soc/samsung/exynos5420/Makefile.inc
+++ b/src/soc/samsung/exynos5420/Makefile.inc
@@ -10,7 +10,6 @@ bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += uart.c
 endif
 bootblock-y += wakeup.c
 bootblock-y += gpio.c
-bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += timer.c
 
 romstage-y += spi.c alternate_cbfs.c
 romstage-y += smp.c
@@ -25,7 +24,6 @@ romstage-y += monotonic_timer.c
 romstage-$(CONFIG_DRIVERS_UART) += uart.c
 romstage-y += wakeup.c
 romstage-y += gpio.c
-romstage-y += timer.c
 romstage-y += i2c.c
 #romstage-y += wdt.c
 romstage-y += cbmem.c
@@ -41,7 +39,6 @@ ramstage-y += cpu.c
 ramstage-y += tmu.c
 ramstage-y += mct.c
 ramstage-y += monotonic_timer.c
-ramstage-y += timer.c
 ramstage-y += gpio.c
 ramstage-y += i2c.c
 ramstage-y += dp.c dp_lowlevel.c fimd.c
diff --git a/src/soc/samsung/exynos5420/timer.c b/src/soc/samsung/exynos5420/timer.c
deleted file mode 100644
index 7156a010af..0000000000
--- a/src/soc/samsung/exynos5420/timer.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2009 Samsung Electronics
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <console/console.h>
-#include <delay.h>
-#include <soc/clk.h>
-#include <thread.h>
-#include <timer.h>
-
-void init_timer(void)
-{
-	/* Nothing to do because we manually
-	 * call mct_start() in the bootblock
-	 */
-}
-
-/* delay x useconds */
-void udelay(unsigned usec)
-{
-	struct mono_time current, end;
-
-	if (!thread_yield_microseconds(usec))
-		return;
-
-	timer_monotonic_get(&current);
-	end = current;
-	mono_time_add_usecs(&end, usec);
-
-	if (mono_time_after(&current, &end)) {
-		printk(BIOS_EMERG, "udelay: 0x%08x is impossibly large\n",
-				usec);
-		/* There's not much we can do if usec is too big. Use a long,
-		 * paranoid delay value and hope for the best... */
-		end = current;
-		mono_time_add_usecs(&end, USECS_PER_SEC);
-	}
-
-	while (mono_time_before(&current, &end))
-		timer_monotonic_get(&current);
-}