summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorThomas Chou <thomas@wytron.com.tw>2015-10-09 13:48:56 +0800
committerThomas Chou <thomas@wytron.com.tw>2015-10-23 07:37:03 +0800
commit8f41b8785be20da320a544206f8c6e4f352bc9f4 (patch)
tree6a30071f9de32ac7d3e061eeece5a46585658b0d /common
parentc8a7ba9e6a5fe2fc7b4a7894829aa0b0148b4d40 (diff)
downloadu-boot-8f41b8785be20da320a544206f8c6e4f352bc9f4.tar.gz
u-boot-8f41b8785be20da320a544206f8c6e4f352bc9f4.tar.bz2
u-boot-8f41b8785be20da320a544206f8c6e4f352bc9f4.zip
timer: start a new timer after relocation
Start a new timer after relocation, just in case the timer has been used in per-relocation. Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/board_r.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/common/board_r.c b/common/board_r.c
index f8c1baa949..a4facf8845 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -290,6 +290,9 @@ static int initr_dm(void)
/* Save the pre-reloc driver model and start a new one */
gd->dm_root_f = gd->dm_root;
gd->dm_root = NULL;
+#ifdef CONFIG_TIMER
+ gd->timer = NULL;
+#endif
return dm_init_and_scan(false);
}
#endif