summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAlexander Holler <holler@ahsoftware.de>2010-12-18 13:24:20 +0100
committerAnatolij Gustschin <agust@denx.de>2011-11-27 19:44:36 +0100
commita67fe5f284c73e5171b80657619ee24d7cc9726b (patch)
tree68152c10e0d66fa2d9c5278b5ab434f48e26e1bf /arch
parent762e63754b6417126260dd22631d0e3bda12eb70 (diff)
downloadu-boot-imx-a67fe5f284c73e5171b80657619ee24d7cc9726b.zip
u-boot-imx-a67fe5f284c73e5171b80657619ee24d7cc9726b.tar.gz
u-boot-imx-a67fe5f284c73e5171b80657619ee24d7cc9726b.tar.bz2
OMAP3: Use sdelay from arch/arm/cpu/armv7/syslib.c instead of cloning that.
There is no need to have such a function twice. Signed-off-by: Alexander Holler <holler@ahsoftware.de> Acked-by: Dirk Behme <dirk.behme@googlemail.com> Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/armv7/omap3/board.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c
index a9fdb4f..cdf452d 100644
--- a/arch/arm/cpu/armv7/omap3/board.c
+++ b/arch/arm/cpu/armv7/omap3/board.c
@@ -93,16 +93,6 @@ u32 omap_boot_device(void)
/******************************************************************************
- * Routine: delay
- * Description: spinning delay to use before udelay works
- *****************************************************************************/
-static inline void delay(unsigned long loops)
-{
- __asm__ volatile ("1:\n" "subs %0, %1, #1\n"
- "bne 1b":"=r" (loops):"0"(loops));
-}
-
-/******************************************************************************
* Routine: secure_unlock
* Description: Setup security registers for access
* (GP Device only)
@@ -227,7 +217,7 @@ void s_init(void)
#endif
set_muxconf_regs();
- delay(100);
+ sdelay(100);
prcm_init();