projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: rmobile: blanche: Disable CONFIG_CMD_SF / CONFIG_CMD_SPI
[oweals/u-boot.git]
/
lib
/
time.c
diff --git
a/lib/time.c
b/lib/time.c
index f30fc05804be9914d55973bd6163f1c46b0e30f8..65db0f6cda29367c6f4b2eee1666a18a3d578100 100644
(file)
--- a/
lib/time.c
+++ b/
lib/time.c
@@
-5,12
+5,16
@@
*/
#include <common.h>
*/
#include <common.h>
+#include <bootstage.h>
#include <dm.h>
#include <errno.h>
#include <dm.h>
#include <errno.h>
+#include <init.h>
+#include <time.h>
#include <timer.h>
#include <watchdog.h>
#include <div64.h>
#include <asm/io.h>
#include <timer.h>
#include <watchdog.h>
#include <div64.h>
#include <asm/io.h>
+#include <linux/delay.h>
#ifndef CONFIG_WD_PERIOD
# define CONFIG_WD_PERIOD (10 * 1000 * 1000) /* 10 seconds default */
#ifndef CONFIG_WD_PERIOD
# define CONFIG_WD_PERIOD (10 * 1000 * 1000) /* 10 seconds default */
@@
-180,7
+184,7
@@
void udelay(unsigned long usec)
do {
WATCHDOG_RESET();
kv = usec > CONFIG_WD_PERIOD ? CONFIG_WD_PERIOD : usec;
do {
WATCHDOG_RESET();
kv = usec > CONFIG_WD_PERIOD ? CONFIG_WD_PERIOD : usec;
- __udelay
(kv);
+ __udelay(kv);
usec -= kv;
} while(usec);
}
usec -= kv;
} while(usec);
}