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 656c249..90f3b88 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -762,7 +762,7 @@
#endif
setup_mon_len,
#ifdef CONFIG_OF_CONTROL
- setup_fdt,
+ fdtdec_setup,
#endif
#ifdef CONFIG_TRACE
trace_early_init,
@@ -774,9 +774,6 @@
#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 ea8a526..0d3e6d9 100644
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -797,6 +797,6 @@
/**
* 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 d9dbc86..80b897a 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -1039,7 +1039,7 @@
return 0;
}
-int setup_fdt(void)
+int fdtdec_setup(void)
{
#ifdef CONFIG_OF_CONTROL
# ifdef CONFIG_OF_EMBED
@@ -1065,7 +1065,7 @@
(uintptr_t)gd->fdt_blob);
# endif
#endif
- return 0;
+ return fdtdec_prepare_fdt();
}
#endif /* !USE_HOSTCC */