From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Chou Date: Tue, 13 Oct 2015 21:17:26 +0800 Subject: [U-Boot] [PATCH v8 2/3] timer: start a new timer after relocation In-Reply-To: <1444461383-10167-2-git-send-email-thomas@wytron.com.tw> References: <1443446357-21393-1-git-send-email-thomas@wytron.com.tw> <1444461383-10167-1-git-send-email-thomas@wytron.com.tw> <1444461383-10167-2-git-send-email-thomas@wytron.com.tw> Message-ID: <561D0466.7090008@wytron.com.tw> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 10/10/2015 03:16 PM, Thomas Chou wrote: > 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 > --- > v6 > rename to CONFIG_TIMER as Simon suggested. > v7 > fix string replacement error in v6 > v8 > replace all dm_timer with timer. > > common/board_r.c | 3 +++ > 1 file changed, 3 insertions(+) > Applied to u-boot-nios. > diff --git a/common/board_r.c b/common/board_r.c > index f8c1baa..d22118b 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 >