[PATCH v4 1/2] x86: fsp: Only compile fsp_save_s3_stack if (SPL_)DM_RTC is enabled

Sean Anderson sean.anderson at seco.com
Tue Nov 22 18:54:51 CET 2022


This function calls rtc_write32, which has a different signature
depending on if (SPL_)DM_RTC is enabled or not. This could result in a
mismatch in SPL if DM_RTC was enabled but SPL_DM_RTC, as the non-DM
declaration would still be used in SPL even though the implementation
would be for non-DM_RTC. We are switching to the correct definitions in
the next commit, so this will become a compilation error. Since
fsp_save_s3_stack is not called from SPL, avoid compiling it if
(SPL_)DM_RTC is disabled.

Signed-off-by: Sean Anderson <sean.anderson at seco.com>
---

Changes in v4:
- Don't compile fsp_save_s3_stack in SPL (or TPL/VPL).

Changes in v3:
- New

 arch/x86/lib/fsp/fsp_common.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c
index 82f7d3ab5f..8f2977a807 100644
--- a/arch/x86/lib/fsp/fsp_common.c
+++ b/arch/x86/lib/fsp/fsp_common.c
@@ -61,6 +61,7 @@ void board_final_init(void)
 		debug("OK\n");
 }
 
+#if CONFIG_IS_ENABLED(DM_RTC)
 int fsp_save_s3_stack(void)
 {
 	struct udevice *dev;
@@ -84,3 +85,4 @@ int fsp_save_s3_stack(void)
 
 	return 0;
 }
+#endif
-- 
2.35.1.1320.gc452695387.dirty



More information about the U-Boot mailing list