* [U-Boot] [PATCH] Do not call board_early_init_f() twice
@ 2013-04-10 0:06 Vadim Bendebury
2013-04-11 19:43 ` Tom Rini
0 siblings, 1 reply; 2+ messages in thread
From: Vadim Bendebury @ 2013-04-10 0:06 UTC (permalink / raw)
To: u-boot
Apparently due to a missed rebase conflict resolution
board_early_init_f() is included twice in the list of initialization
functions.
Leave only the first occurrence.
. built and boot an Exynos 5250 target
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
---
common/board_f.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/common/board_f.c b/common/board_f.c
index 29b49c3..7698891 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -788,9 +788,6 @@ static init_fnc_t init_sequence_f[] = {
/* TODO: can we rename this to timer_init()? */
init_timebase,
#endif
-#if defined(CONFIG_BOARD_EARLY_INIT_F)
- board_early_init_f,
-#endif
#ifdef CONFIG_ARM
timer_init, /* initialize timer */
#endif
--
1.8.1.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [U-Boot] [PATCH] Do not call board_early_init_f() twice
2013-04-10 0:06 [U-Boot] [PATCH] Do not call board_early_init_f() twice Vadim Bendebury
@ 2013-04-11 19:43 ` Tom Rini
0 siblings, 0 replies; 2+ messages in thread
From: Tom Rini @ 2013-04-11 19:43 UTC (permalink / raw)
To: u-boot
On Tue, Apr 09, 2013 at 05:06:51PM -0700, Vadim Bendebury wrote:
> Apparently due to a missed rebase conflict resolution
> board_early_init_f() is included twice in the list of initialization
> functions.
>
> Leave only the first occurrence.
> . built and boot an Exynos 5250 target
>
> Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130411/0408ce22/attachment.pgp>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-11 19:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-10 0:06 [U-Boot] [PATCH] Do not call board_early_init_f() twice Vadim Bendebury
2013-04-11 19:43 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.