arm: Move fdt check earlier so that board_early_init_f() can use it
authorSimon Glass <sjg@chromium.org>
Fri, 30 Nov 2012 13:01:16 +0000 (13:01 +0000)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 10 Jan 2013 21:21:44 +0000 (22:21 +0100)
We want to use the fdt inside board_early_init_f(), so check for its
presence earlier in the pre-reloc init sequence.

So far ARM and microblaze are the only only ones that use
CONFIG_OF_CONTROL. Microblaze does not have the same init loop, and in
particular does not have the board_early_init_f() call. So a patch for
microblaze would have no meaning.

Signed-off-by: Simon Glass <sjg@chromium.org>
arch/arm/lib/board.c

index c214bba881a3cf1db70906acf61d62f416d9c8ae..864b53380b04490ab184ed2f1b2af4dcb0e5b23e 100644 (file)
@@ -233,12 +233,11 @@ int power_init_board(void)
 
 init_fnc_t *init_sequence[] = {
        arch_cpu_init,          /* basic arch cpu dependent setup */
-
-#if defined(CONFIG_BOARD_EARLY_INIT_F)
-       board_early_init_f,
-#endif
 #ifdef CONFIG_OF_CONTROL
        fdtdec_check_fdt,
+#endif
+#if defined(CONFIG_BOARD_EARLY_INIT_F)
+       board_early_init_f,
 #endif
        timer_init,             /* initialize timer */
 #ifdef CONFIG_BOARD_POSTCLK_INIT