From 671549e5b0f51ad015746f0dcbe05332dfe370b1 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Tue, 28 Mar 2017 10:27:18 -0600 Subject: [PATCH] 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 Reviewed-by: Stefan Roese --- arch/x86/include/asm/u-boot-x86.h | 3 --- arch/x86/lib/fsp/fsp_common.c | 2 +- common/board_f.c | 4 ++-- include/common.h | 9 +++++++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h index 4f901f9392..cc7fc7370e 100644 --- a/arch/x86/include/asm/u-boot-x86.h +++ b/arch/x86/include/asm/u-boot-x86.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)); diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c index 8479af1d7e..cebf85ee5b 100644 --- a/arch/x86/lib/fsp/fsp_common.c +++ b/arch/x86/lib/fsp/fsp_common.c @@ -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; diff --git a/common/board_f.c b/common/board_f.c index 0b2a325cef..b8c0514b0d 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -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 */ diff --git a/include/common.h b/include/common.h index 8bd4087bab..5f5c0f46e0 100644 --- a/include/common.h +++ b/include/common.h @@ -285,6 +285,15 @@ int print_cpuinfo(void); 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 * -- 2.25.1