summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Zammit <damien@zamaudio.com>2017-09-02 17:48:33 +1000
committerMartin Roth <martinroth@google.com>2017-09-13 19:18:08 +0000
commitf796dd86a79831f97bdb61ad7f29f140b8b941a5 (patch)
tree838d39d261a6e49ef7e6af8bcfd913bc53c6db12
parent1fbc1927b14f133ef6827f56e4fc31aacc1b8fa9 (diff)
downloadcoreboot-f796dd86a79831f97bdb61ad7f29f140b8b941a5.tar.xz
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 <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>
-rw-r--r--src/drivers/intel/fsp1_0/cache_as_ram.inc2
-rw-r--r--src/drivers/intel/fsp1_0/fsp_util.c4
-rw-r--r--src/drivers/intel/fsp1_0/fsp_util.h2
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);