From c2741855afacd073d370d47818d972cca9baba18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Fri, 16 Aug 2019 15:13:00 +0300 Subject: [PATCH] arch/x86: Rename some mainboard_romstage_entry() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These platforms use different signature for this function, so declare them with different name to make room in global namespace. Change-Id: I77be9099bf20e00ae6770e9ffe12301eda028819 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/34909 Reviewed-by: Aaron Durbin Reviewed-by: Furquan Shaikh Reviewed-by: HAOUAS Elyes Tested-by: build bot (Jenkins) --- src/mainboard/google/kahlee/romstage.c | 2 +- src/mainboard/google/rambi/romstage.c | 2 +- src/soc/amd/picasso/include/soc/romstage.h | 2 +- src/soc/amd/picasso/romstage.c | 4 ++-- src/soc/amd/stoneyridge/include/soc/romstage.h | 2 +- src/soc/amd/stoneyridge/romstage.c | 4 ++-- src/soc/intel/baytrail/include/soc/romstage.h | 2 +- src/soc/intel/baytrail/romstage/romstage.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/mainboard/google/kahlee/romstage.c b/src/mainboard/google/kahlee/romstage.c index 8bc766e112..ebe59ac77f 100644 --- a/src/mainboard/google/kahlee/romstage.c +++ b/src/mainboard/google/kahlee/romstage.c @@ -28,7 +28,7 @@ void __weak variant_romstage_entry(int s3_resume) /* By default, don't do anything */ } -void mainboard_romstage_entry(int s3_resume) +void mainboard_romstage_entry_s3(int s3_resume) { size_t num_gpios; const struct soc_amd_gpio *gpios; diff --git a/src/mainboard/google/rambi/romstage.c b/src/mainboard/google/rambi/romstage.c index 5322267af9..9fbe1ca10e 100644 --- a/src/mainboard/google/rambi/romstage.c +++ b/src/mainboard/google/rambi/romstage.c @@ -55,7 +55,7 @@ static void *get_spd_pointer(char *spd_file_content, int total_spds, int *dual) return &spd_file_content[SPD_SIZE * ram_id]; } -void mainboard_romstage_entry(struct romstage_params *rp) +void mainboard_romstage_entry_rp(struct romstage_params *rp) { void *spd_content; int dual_channel = 0; diff --git a/src/soc/amd/picasso/include/soc/romstage.h b/src/soc/amd/picasso/include/soc/romstage.h index d8b2900fb5..c0d03d0ead 100644 --- a/src/soc/amd/picasso/include/soc/romstage.h +++ b/src/soc/amd/picasso/include/soc/romstage.h @@ -16,6 +16,6 @@ #ifndef __PICASSO_ROMSTAGE_H__ #define __PICASSO_ROMSTAGE_H__ -void mainboard_romstage_entry(int s3_resume); +void mainboard_romstage_entry_s3(int s3_resume); #endif /* __PICASSO_ROMSTAGE_H__ */ diff --git a/src/soc/amd/picasso/romstage.c b/src/soc/amd/picasso/romstage.c index 22b5ce4be0..7970b0edda 100644 --- a/src/soc/amd/picasso/romstage.c +++ b/src/soc/amd/picasso/romstage.c @@ -34,7 +34,7 @@ #include "chip.h" -void __weak mainboard_romstage_entry(int s3_resume) +void __weak mainboard_romstage_entry_s3(int s3_resume) { /* By default, don't do anything */ } @@ -49,7 +49,7 @@ asmlinkage void car_stage_entry(void) console_init(); - mainboard_romstage_entry(s3_resume); + mainboard_romstage_entry_s3(s3_resume); if (!s3_resume) { post_code(0x40); diff --git a/src/soc/amd/stoneyridge/include/soc/romstage.h b/src/soc/amd/stoneyridge/include/soc/romstage.h index 6ce79b424e..598b409ba5 100644 --- a/src/soc/amd/stoneyridge/include/soc/romstage.h +++ b/src/soc/amd/stoneyridge/include/soc/romstage.h @@ -16,6 +16,6 @@ #ifndef __STONEYRIDGE_ROMSTAGE_H__ #define __STONEYRIDGE_ROMSTAGE_H__ -void mainboard_romstage_entry(int s3_resume); +void mainboard_romstage_entry_s3(int s3_resume); #endif /* __STONEYRIDGE_ROMSTAGE_H__ */ diff --git a/src/soc/amd/stoneyridge/romstage.c b/src/soc/amd/stoneyridge/romstage.c index 4cadc68a89..c76f7cd80c 100644 --- a/src/soc/amd/stoneyridge/romstage.c +++ b/src/soc/amd/stoneyridge/romstage.c @@ -37,7 +37,7 @@ #include "chip.h" -void __weak mainboard_romstage_entry(int s3_resume) +void __weak mainboard_romstage_entry_s3(int s3_resume) { /* By default, don't do anything */ } @@ -97,7 +97,7 @@ asmlinkage void car_stage_entry(void) if (CONFIG(SOC_AMD_PSP_SELECTABLE_SMU_FW)) load_smu_fw1(); - mainboard_romstage_entry(s3_resume); + mainboard_romstage_entry_s3(s3_resume); bsp_agesa_call(); diff --git a/src/soc/intel/baytrail/include/soc/romstage.h b/src/soc/intel/baytrail/include/soc/romstage.h index 8ea2d699c7..ae38b70770 100644 --- a/src/soc/intel/baytrail/include/soc/romstage.h +++ b/src/soc/intel/baytrail/include/soc/romstage.h @@ -28,7 +28,7 @@ struct romstage_params { struct mrc_params *mrc_params; }; -void mainboard_romstage_entry(struct romstage_params *params); +void mainboard_romstage_entry_rp(struct romstage_params *params); void romstage_common(struct romstage_params *params); void raminit(struct mrc_params *mp, int prev_sleep_state); diff --git a/src/soc/intel/baytrail/romstage/romstage.c b/src/soc/intel/baytrail/romstage/romstage.c index 7a413d9c1d..63e36aaa36 100644 --- a/src/soc/intel/baytrail/romstage/romstage.c +++ b/src/soc/intel/baytrail/romstage/romstage.c @@ -146,7 +146,7 @@ static void romstage_main(uint64_t tsc) gfx_init(); /* Call into mainboard. */ - mainboard_romstage_entry(&rp); + mainboard_romstage_entry_rp(&rp); if (CONFIG(SMM_TSEG)) smm_list_regions();