diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sbi_init.c | 8 | ||||
| -rw-r--r-- | lib/sbi_timer.c | 11 |
2 files changed, 6 insertions, 13 deletions
diff --git a/lib/sbi_init.c b/lib/sbi_init.c index 989cb7d7..f9429719 100644 --- a/lib/sbi_init.c +++ b/lib/sbi_init.c @@ -54,11 +54,7 @@ static void __attribute__((noreturn)) init_coldboot(struct sbi_scratch *scratch, if (rc) sbi_hart_hang(); - rc = sbi_timer_cold_init(scratch); - if (rc) - sbi_hart_hang(); - - rc = sbi_timer_warm_init(scratch, hartid); + rc = sbi_timer_init(scratch, hartid, TRUE); if (rc) sbi_hart_hang(); @@ -125,7 +121,7 @@ static void __attribute__((noreturn)) init_warmboot(struct sbi_scratch *scratch, if (rc) sbi_hart_hang(); - rc = sbi_timer_warm_init(scratch, hartid); + rc = sbi_timer_init(scratch, hartid, FALSE); if (rc) sbi_hart_hang(); diff --git a/lib/sbi_timer.c b/lib/sbi_timer.c index 355bc64e..8dfc7534 100644 --- a/lib/sbi_timer.c +++ b/lib/sbi_timer.c @@ -67,12 +67,9 @@ void sbi_timer_process(struct sbi_scratch *scratch, u32 hartid) csr_set(mip, MIP_STIP); } -int sbi_timer_warm_init(struct sbi_scratch *scratch, u32 hartid) +int sbi_timer_init(struct sbi_scratch *scratch, u32 hartid, + bool cold_boot) { - return sbi_platform_warm_timer_init(sbi_platform_ptr(scratch), hartid); -} - -int sbi_timer_cold_init(struct sbi_scratch *scratch) -{ - return sbi_platform_cold_timer_init(sbi_platform_ptr(scratch)); + return sbi_platform_timer_init(sbi_platform_ptr(scratch), + hartid, cold_boot); } |