3 files changed, 1 insertions, 52 deletions
diff --git a/src/cpu/ti/am335x/Kconfig b/src/cpu/ti/am335x/Kconfig
index c0554b8df1..7fe2665135 100644
--- a/src/cpu/ti/am335x/Kconfig
+++ b/src/cpu/ti/am335x/Kconfig
@@ -7,6 +7,7 @@ config CPU_TI_AM335X
 	select HAVE_UART_SPECIAL
 	select BOOTBLOCK_CONSOLE
 	select CPU_HAS_BOOTBLOCK_INIT
+	select GENERIC_UDELAY
 	bool
 	default n
 
diff --git a/src/cpu/ti/am335x/Makefile.inc b/src/cpu/ti/am335x/Makefile.inc
index 1dbadae924..8e8dab1e98 100644
--- a/src/cpu/ti/am335x/Makefile.inc
+++ b/src/cpu/ti/am335x/Makefile.inc
@@ -9,7 +9,6 @@ romstage-y	+= cbmem.c
 ramstage-y	+= dmtimer.c
 ramstage-y	+= monotonic_timer.c
 ramstage-y	+= nand.c
-ramstage-y	+= timer.c
 ramstage-y	+= cbmem.c
 
 ifeq ($(CONFIG_DRIVERS_UART),y)
diff --git a/src/cpu/ti/am335x/timer.c b/src/cpu/ti/am335x/timer.c
deleted file mode 100644
index 07b162a0ee..0000000000
--- a/src/cpu/ti/am335x/timer.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2013 Google Inc.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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; either version 2 of
- * the License, or (at your option) any later version.
- *
- * 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., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <console/console.h>
-#include <delay.h>
-#include <timer.h>
-
-void init_timer(void)
-{
-}
-
-/* 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);
-}