diff options
| author | BernardXiong <[email protected]> | 2021-10-19 15:00:46 +0800 |
|---|---|---|
| committer | BernardXiong <[email protected]> | 2021-10-19 15:00:46 +0800 |
| commit | be2dec978d86fa4b00e74c2340486b8cfb7f44b2 (patch) | |
| tree | 13c752d9ee36044ec4423d36892aafaca647c345 | |
| parent | 557821fd3dfb6e13fc26b65e199508ba09f49872 (diff) | |
[BSP] fix the compiling issue for qemu-riscv64
| -rw-r--r-- | bsp/qemu-riscv-virt64/driver/board.c | 7 | ||||
| -rw-r--r-- | libcpu/risc-v/virt64/tick.c | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/bsp/qemu-riscv-virt64/driver/board.c b/bsp/qemu-riscv-virt64/driver/board.c index 5d303b6a40..c1e68090c6 100644 --- a/bsp/qemu-riscv-virt64/driver/board.c +++ b/bsp/qemu-riscv-virt64/driver/board.c @@ -67,10 +67,3 @@ void rt_hw_cpu_reset(void) while(1); } MSH_CMD_EXPORT_ALIAS(rt_hw_cpu_reset, reboot, reset machine); - -int rt_sbi_init(void) -{ - sbi_init(); - return 0; -} -INIT_PREV_EXPORT(rt_sbi_init); diff --git a/libcpu/risc-v/virt64/tick.c b/libcpu/risc-v/virt64/tick.c index d6970ec417..53f555da9d 100644 --- a/libcpu/risc-v/virt64/tick.c +++ b/libcpu/risc-v/virt64/tick.c @@ -36,7 +36,7 @@ int tick_isr(void) #ifdef RISCV_S_MODE sbi_set_timer(get_ticks() + tick_cycles); #else - *(uint64_t*)CLINT_MTIMECMP(r_mhartid()) = *(uint64_t*)CLINT_MTIME + tick_cycles; + *(uint64_t*)CLINT_MTIMECMP(__raw_hartid()) = *(uint64_t*)CLINT_MTIME + tick_cycles; #endif return 0; @@ -62,7 +62,7 @@ int rt_hw_tick_init(void) #else clear_csr(mie, MIP_MTIP); clear_csr(mip, MIP_MTIP); - *(uint64_t*)CLINT_MTIMECMP(r_mhartid()) = *(uint64_t*)CLINT_MTIME + interval; + *(uint64_t*)CLINT_MTIMECMP(__raw_hartid()) = *(uint64_t*)CLINT_MTIME + interval; set_csr(mie, MIP_MTIP); #endif return 0; |