Browse Source

[BSP] fix the compiling issue for qemu-riscv64

BernardXiong 3 years ago
parent
commit
be2dec978d
2 changed files with 2 additions and 9 deletions
  1. 0 7
      bsp/qemu-riscv-virt64/driver/board.c
  2. 2 2
      libcpu/risc-v/virt64/tick.c

+ 0 - 7
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);

+ 2 - 2
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;