fdt: Rename setup_fdt() and make it prepare also

There is little reason to split these two functions. Bring them together
which simplifies the init sequence.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/common/board_f.c b/common/board_f.c
index 290fd6507f444c7bc17dd48d15a843fa3035539b..aee429fcf6c2849fa1fadae9a33ffa704b16d635 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -770,7 +770,7 @@ static init_fnc_t init_sequence_f[] = {
 #endif
        setup_mon_len,
 #ifdef CONFIG_OF_CONTROL
-       setup_fdt,
+       fdtdec_setup,
 #endif
 #ifdef CONFIG_TRACE
        trace_early_init,
@@ -782,9 +782,6 @@ static init_fnc_t init_sequence_f[] = {
 #endif
        arch_cpu_init,          /* basic arch cpu dependent setup */
        mark_bootstage,
-#ifdef CONFIG_OF_CONTROL
-       fdtdec_check_fdt,
-#endif
        initf_dm,
        arch_cpu_init_dm,
 #if defined(CONFIG_BOARD_EARLY_INIT_F)

diff --git a/include/fdtdec.h b/include/fdtdec.h
index ea8a52602a5d6657aacc4c144b1e6d2a5c44e94c..0d3e6d9711dd964d14e306cc3ef23f86c46f1184 100644 (file)
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -797,6 +797,6 @@ int fdtdec_decode_memory_region(const void *blob, int node,
 /**
  * Set up the device tree ready for use
  */
-int setup_fdt(void);
+int fdtdec_setup(void);
 
 #endif

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index d9dbc86164bd7e2e94f075248cf77fd594308660..80b897a21cd69a88ce5d3fe1398d23da11339f67 100644 (file)
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -1039,7 +1039,7 @@ int fdtdec_decode_memory_region(const void *blob, int config_node,
        return 0;
 }
 
-int setup_fdt(void)
+int fdtdec_setup(void)
 {
 #ifdef CONFIG_OF_CONTROL
 # ifdef CONFIG_OF_EMBED
@@ -1065,7 +1065,7 @@ int setup_fdt(void)
                                                (uintptr_t)gd->fdt_blob);
 # endif
 #endif
-       return 0;
+       return fdtdec_prepare_fdt();
 }
 
 #endif /* !USE_HOSTCC */