Damien Zammit has uploaded this change for review. ( https://review.coreboot.org/21353
Change subject: fsp1_0/fsp_util: Rename find_fsp to find_fsp_dummy ......................................................................
fsp1_0/fsp_util: Rename find_fsp to find_fsp_dummy
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 C function to find_fsp_dummy.
Change-Id: I84c152f9a580fdfc40e9f6e998d2d6484b7f47df Signed-off-by: Damien Zammit damien@zamaudio.com --- M src/drivers/intel/fsp1_0/fsp_util.c M src/drivers/intel/fsp1_0/fsp_util.h 2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/53/21353/1
diff --git a/src/drivers/intel/fsp1_0/fsp_util.c b/src/drivers/intel/fsp1_0/fsp_util.c index fc1bd51..b10aa45 100644 --- a/src/drivers/intel/fsp1_0/fsp_util.c +++ b/src/drivers/intel/fsp1_0/fsp_util.c @@ -35,7 +35,7 @@ EFI_STATUS Status;
if (fsp_header_ptr == NULL) { - fsp_header_ptr = (void *)find_fsp(); + fsp_header_ptr = (void *)find_fsp_dummy(); if ((u32)fsp_header_ptr < 0xff) { post_code(0x4F); /* output something in case there is no serial */ die("Can't find the FSP!\n"); @@ -100,7 +100,7 @@ } #endif /* __PRE_RAM__ */
-volatile u8 * find_fsp () +volatile u8 * find_fsp_dummy () {
#ifdef __PRE_RAM__ @@ -213,7 +213,7 @@ void print_fsp_info(void) {
if (fsp_header_ptr == NULL) - fsp_header_ptr = (void *)find_fsp(); + fsp_header_ptr = (void *)find_fsp_dummy();
if ((u32)fsp_header_ptr < 0xff) { post_code(0x4F); /* post code in case there is no serial */ diff --git a/src/drivers/intel/fsp1_0/fsp_util.h b/src/drivers/intel/fsp1_0/fsp_util.h index badd254..7eb37ac 100644 --- a/src/drivers/intel/fsp1_0/fsp_util.h +++ b/src/drivers/intel/fsp1_0/fsp_util.h @@ -25,7 +25,7 @@ void * find_and_set_fastboot_cache(void); #endif
-volatile u8 * find_fsp (void); +volatile u8 * find_fsp_dummy (void); void fsp_early_init(FSP_INFO_HEADER *fsp_info); void FspNotify(u32 Phase); void FspNotifyReturnPoint(EFI_STATUS Status, VOID *HobListPtr);