From: Thomas Chou Date: Fri, 9 Oct 2015 05:48:56 +0000 (+0800) Subject: timer: start a new timer after relocation X-Git-Tag: v2016.01-rc1~206 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8f41b8785be20da320a544206f8c6e4f352bc9f4;p=oweals%2Fu-boot.git 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 Acked-by: Simon Glass --- 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