diff mbox

[U-Boot,v8,2/3] timer: start a new timer after relocation

Message ID 1444461383-10167-2-git-send-email-thomas@wytron.com.tw
State Accepted, archived
Delegated to: Thomas Chou
Headers show

Commit Message

Thomas Chou Oct. 10, 2015, 7:16 a.m. UTC 
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>
---
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(+)

Comments

Thomas Chou Oct. 13, 2015, 1:17 p.m. UTC | #1 
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 <thomas@wytron.com.tw>
> Acked-by: Simon Glass <sjg@chromium.org>
> ---
> 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
>
diff mbox

Patch

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