From: Alexander Holler Date: Sat, 18 Dec 2010 12:24:20 +0000 (+0100) Subject: OMAP3: Use sdelay from arch/arm/cpu/armv7/syslib.c instead of cloning that. X-Git-Tag: v2011.12-rc1~106^2~37^2~6 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a67fe5f284c73e5171b80657619ee24d7cc9726b;p=u-boot 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 Acked-by: Dirk Behme Signed-off-by: Anatolij Gustschin --- diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c index a9fdb4f8ed..cdf452dfbc 100644 --- a/arch/arm/cpu/armv7/omap3/board.c +++ b/arch/arm/cpu/armv7/omap3/board.c @@ -92,16 +92,6 @@ u32 omap_boot_device(void) #endif /* CONFIG_SPL_BUILD */ -/****************************************************************************** - * 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 @@ -227,7 +217,7 @@ void s_init(void) #endif set_muxconf_regs(); - delay(100); + sdelay(100); prcm_init();