sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fsp1_0/fsp_util: Rename global symbol find_fsp

Browse Source 
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 <damien@zamaudio.com>
Reviewed-on: https://review.coreboot.org/21353
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Damien Zammit
2017-09-02 17:48:33 +10:00
committed by Martin Roth
parent 1fbc1927b1
commit f796dd86a7
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/drivers/intel/fsp1_0/cache_as_ram.inc
View File

@ -32,7 +32,7 @@ cache_as_ram:
* Make a fake stack that has the return value back to this code. * Make a fake stack that has the return value back to this code.
*/ */
lea fake_fsp_stack, %esp lea fake_fsp_stack, %esp
jmp find_fsp jmp find_fsp_bypass_prologue
find_fsp_ret: find_fsp_ret:
/* Save the FSP location */ /* Save the FSP location */
mov %eax, %ebp mov %eax, %ebp

4
src/drivers/intel/fsp1_0/fsp_util.c
View File

@ -108,8 +108,8 @@ volatile u8 * find_fsp ()
/* Entry point for CAR assembly routine */ /* Entry point for CAR assembly routine */
__asm__ __volatile__ ( __asm__ __volatile__ (
".global find_fsp\n\t" ".global find_fsp_bypass_prologue\n\t"
"find_fsp:\n\t" "find_fsp_bypass_prologue:\n\t"
); );
#else #else
volatile u8 *fsp_ptr; volatile u8 *fsp_ptr;

2
src/drivers/intel/fsp1_0/fsp_util.h
View File

@ -25,7 +25,7 @@ int save_mrc_data(void *hob_start);
void * find_and_set_fastboot_cache(void); void * find_and_set_fastboot_cache(void);
#endif #endif
volatile u8 * find_fsp (void); volatile u8 * find_fsp(void);
void fsp_early_init(FSP_INFO_HEADER *fsp_info); void fsp_early_init(FSP_INFO_HEADER *fsp_info);
void FspNotify(u32 Phase); void FspNotify(u32 Phase);
void FspNotifyReturnPoint(EFI_STATUS Status, VOID *HobListPtr); void FspNotifyReturnPoint(EFI_STATUS Status, VOID *HobListPtr);