From f796dd86a79831f97bdb61ad7f29f140b8b941a5 Mon Sep 17 00:00:00 2001 From: Damien Zammit Date: Sat, 2 Sep 2017 17:48:33 +1000 Subject: [PATCH] fsp1_0/fsp_util: Rename global symbol find_fsp To avoid error with symbol redefinition (using clang): src/drivers/intel/fsp1_0/fsp_util.c:111:22: error: invalid symbol redefinition ".global find_fsp\n\t" Rename the asm global symbol to find_fsp_bypass_prologue and fix jmp. Change-Id: I84c152f9a580fdfc40e9f6e998d2d6484b7f47df Signed-off-by: Damien Zammit Reviewed-on: https://review.coreboot.org/21353 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/drivers/intel/fsp1_0/cache_as_ram.inc | 2 +- src/drivers/intel/fsp1_0/fsp_util.c | 4 ++-- src/drivers/intel/fsp1_0/fsp_util.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/drivers/intel/fsp1_0/cache_as_ram.inc b/src/drivers/intel/fsp1_0/cache_as_ram.inc index 189b4b2e3c..eb21348e2f 100644 --- a/src/drivers/intel/fsp1_0/cache_as_ram.inc +++ b/src/drivers/intel/fsp1_0/cache_as_ram.inc @@ -32,7 +32,7 @@ cache_as_ram: * Make a fake stack that has the return value back to this code. */ lea fake_fsp_stack, %esp - jmp find_fsp + jmp find_fsp_bypass_prologue find_fsp_ret: /* Save the FSP location */ mov %eax, %ebp diff --git a/src/drivers/intel/fsp1_0/fsp_util.c b/src/drivers/intel/fsp1_0/fsp_util.c index fc1bd51161..17b2fd45c8 100644 --- a/src/drivers/intel/fsp1_0/fsp_util.c +++ b/src/drivers/intel/fsp1_0/fsp_util.c @@ -108,8 +108,8 @@ volatile u8 * find_fsp () /* Entry point for CAR assembly routine */ __asm__ __volatile__ ( - ".global find_fsp\n\t" - "find_fsp:\n\t" + ".global find_fsp_bypass_prologue\n\t" + "find_fsp_bypass_prologue:\n\t" ); #else volatile u8 *fsp_ptr; diff --git a/src/drivers/intel/fsp1_0/fsp_util.h b/src/drivers/intel/fsp1_0/fsp_util.h index badd254f80..a3a7dd3119 100644 --- a/src/drivers/intel/fsp1_0/fsp_util.h +++ b/src/drivers/intel/fsp1_0/fsp_util.h @@ -25,7 +25,7 @@ int save_mrc_data(void *hob_start); void * find_and_set_fastboot_cache(void); #endif -volatile u8 * find_fsp (void); +volatile u8 * find_fsp(void); void fsp_early_init(FSP_INFO_HEADER *fsp_info); void FspNotify(u32 Phase); void FspNotifyReturnPoint(EFI_STATUS Status, VOID *HobListPtr);