diff options
| author | Simon Glass <sjg@chromium.org> | 2015-02-27 22:06:35 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-04-23 09:05:53 -0600 |
| commit | 0879361fd3bc33eb52bcfb2574a78f1e52a36429 (patch) | |
| tree | 4b23d3c50eaee147f346fe59b34de9e313680603 | |
| parent | b45122fdf5d314ef1f492b051fb104a7b48b8079 (diff) | |
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>
| -rw-r--r-- | common/board_f.c | 5 | ||||
| -rw-r--r-- | include/fdtdec.h | 2 | ||||
| -rw-r--r-- | lib/fdtdec.c | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/common/board_f.c b/common/board_f.c index 656c24940d..90f3b8847f 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -762,7 +762,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, @@ -774,9 +774,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 ea8a52602a..0d3e6d9711 100644 --- 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 d9dbc86164..80b897a21c 100644 --- 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 */ |