From 7b59571758a5dec75c89928a60d982b29629cee6 Mon Sep 17 00:00:00 2001 From: Anup Patel Date: Wed, 26 Dec 2018 18:21:22 +0530 Subject: lib: Simplify sbi_platform early_init() and final_init() hooks Instead of having separate early_init() and final_init() hooks for cold and warm boot, this patch updates struct sbi_platform to have just one early_init() and one final_init() hook. The type of boot (cold or warm) is now a boolean flag parameter for the updated early_init() and final_init() hooks. Signed-off-by: Anup Patel --- lib/sbi_system.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'lib/sbi_system.c') diff --git a/lib/sbi_system.c b/lib/sbi_system.c index cd250f5..f543cef 100644 --- a/lib/sbi_system.c +++ b/lib/sbi_system.c @@ -11,24 +11,18 @@ #include #include -int sbi_system_warm_early_init(struct sbi_scratch *scratch, u32 hartid) +int sbi_system_early_init(struct sbi_scratch *scratch, u32 hartid, + bool cold_boot) { - return sbi_platform_warm_early_init(sbi_platform_ptr(scratch), hartid); + return sbi_platform_early_init(sbi_platform_ptr(scratch), + hartid, cold_boot); } -int sbi_system_warm_final_init(struct sbi_scratch *scratch, u32 hartid) +int sbi_system_final_init(struct sbi_scratch *scratch, u32 hartid, + bool cold_boot) { - return sbi_platform_warm_final_init(sbi_platform_ptr(scratch), hartid); -} - -int sbi_system_cold_early_init(struct sbi_scratch *scratch) -{ - return sbi_platform_cold_early_init(sbi_platform_ptr(scratch)); -} - -int sbi_system_cold_final_init(struct sbi_scratch *scratch) -{ - return sbi_platform_cold_final_init(sbi_platform_ptr(scratch)); + return sbi_platform_final_init(sbi_platform_ptr(scratch), + hartid, cold_boot); } void __attribute__((noreturn)) sbi_system_reboot(struct sbi_scratch *scratch, -- cgit v1.2.3