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 /common | |
| parent | b45122fdf5d314ef1f492b051fb104a7b48b8079 (diff) | |
| download | u-boot-imx-0879361fd3bc33eb52bcfb2574a78f1e52a36429.zip u-boot-imx-0879361fd3bc33eb52bcfb2574a78f1e52a36429.tar.gz u-boot-imx-0879361fd3bc33eb52bcfb2574a78f1e52a36429.tar.bz2 | |
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>
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 5 |
1 files changed, 1 insertions, 4 deletions
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 @@ 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) |