leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fdt: Rename setup_fdt() and make it prepare also

Browse Source 
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>
This commit is contained in:
Simon Glass 2015-02-27 22:06:35 -07:00
parent b45122fdf5
commit 0879361fd3
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/board_f.c
View File

@ -762,7 +762,7 @@ static init_fnc_t init_sequence_f[] = {
#endif #endif
setup_mon_len, setup_mon_len,
#ifdef CONFIG_OF_CONTROL #ifdef CONFIG_OF_CONTROL
setup_fdt, fdtdec_setup,
#endif #endif
#ifdef CONFIG_TRACE #ifdef CONFIG_TRACE
trace_early_init, trace_early_init,
@ -774,9 +774,6 @@ static init_fnc_t init_sequence_f[] = {
#endif #endif
arch_cpu_init, /* basic arch cpu dependent setup */ arch_cpu_init, /* basic arch cpu dependent setup */
mark_bootstage, mark_bootstage,
#ifdef CONFIG_OF_CONTROL
fdtdec_check_fdt,
#endif
initf_dm, initf_dm,
arch_cpu_init_dm, arch_cpu_init_dm,
#if defined(CONFIG_BOARD_EARLY_INIT_F) #if defined(CONFIG_BOARD_EARLY_INIT_F)

2
include/fdtdec.h
View File

@ -797,6 +797,6 @@ int fdtdec_decode_memory_region(const void *blob, int node,
/** /**
* Set up the device tree ready for use * Set up the device tree ready for use
*/ */
int setup_fdt(void); int fdtdec_setup(void);
#endif #endif

4
lib/fdtdec.c
View File

@ -1039,7 +1039,7 @@ int fdtdec_decode_memory_region(const void *blob, int config_node,
return 0; return 0;
} }
int setup_fdt(void) int fdtdec_setup(void)
{ {
#ifdef CONFIG_OF_CONTROL #ifdef CONFIG_OF_CONTROL
# ifdef CONFIG_OF_EMBED # ifdef CONFIG_OF_EMBED
@ -1065,7 +1065,7 @@ int setup_fdt(void)
(uintptr_t)gd->fdt_blob); (uintptr_t)gd->fdt_blob);
# endif # endif
#endif #endif
return 0; return fdtdec_prepare_fdt();
} }
#endif /* !USE_HOSTCC */ #endif /* !USE_HOSTCC */