board_f: x86: Rename x86_fsp_init() to arch_fsp_init()

While x86 is the only user and this could in principle be moved to
arch_cpu_init() there is some justification for this being a separate
call. It provides a way to handle init which is not CPU-specific, but
must happen before the CPU can be set up.

Rename the function to be more generic.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stefan Roese <sr@denx.de>
master
Simon Glass 7 years ago committed by Tom Rini
parent 2d986c0f54
commit 671549e5b0
  1. 3
      arch/x86/include/asm/u-boot-x86.h
  2. 2
      arch/x86/lib/fsp/fsp_common.c
  3. 4
      common/board_f.c
  4. 9
      include/common.h

@ -55,9 +55,6 @@ u32 isa_map_rom(u32 bus_addr, int size);
/* arch/x86/lib/... */
int video_bios_init(void);
/* arch/x86/lib/fsp/... */
int x86_fsp_init(void);
void board_init_f_r_trampoline(ulong) __attribute__ ((noreturn));
void board_init_f_r(void) __attribute__ ((noreturn));

@ -70,7 +70,7 @@ static __maybe_unused void *fsp_prepare_mrc_cache(void)
return cache->data;
}
int x86_fsp_init(void)
int arch_fsp_init(void)
{
void *nvs;

@ -817,8 +817,8 @@ static const init_fnc_t init_sequence_f[] = {
#endif
initf_malloc,
initf_console_record,
#if defined(CONFIG_X86) && defined(CONFIG_HAVE_FSP)
x86_fsp_init,
#if defined(CONFIG_HAVE_FSP)
arch_fsp_init,
#endif
arch_cpu_init, /* basic arch cpu dependent setup */
mach_cpu_init, /* SoC/machine dependent CPU setup */

@ -286,6 +286,15 @@ int update_flash_size(int flash_size);
int arch_early_init_r(void);
/**
* arch_fsp_init() - perform firmware support package init
*
* Where U-Boot relies on binary blobs to handle part of the system init, this
* function can be used to set up the blobs. This is used on some Intel
* platforms.
*/
int arch_fsp_init(void);
/**
* arch_cpu_init_dm() - init CPU after driver model is available
*
* This is called immediately after driver model is available before

Loading…
Cancel
Save