riscv_internal.h: Remove riscv_sbi.h from the file
riscv_internal.h is used literally everywhere, while the SBI definitions are needed only by whomever needs the services. Having the SBI definitions: a) Copied from OpenSBI (why has this been done? even the names are same) b) Presented publicly to 99% of risc-v modules creates a build error when building with OpenSBI, due to duplicate definitions of the SBI service identifiers: In file included from /nuttx/arch/risc-v/src/common/riscv_internal.h:40, from /nuttx/arch/risc-v/src/chip/chip.h:32, from board/mpfs_domain.c:30: /nuttx/arch/risc-v/src/common/riscv_sbi.h:36: error: "SBI_EXT_BASE" redefined [-Werror] 36 | #define SBI_EXT_BASE 0x00000010 and so forth... Fix this by removing riscv_sbi.h i.e. not exposing the ABI publicly.
This commit is contained in:
parent
f26ae83900
commit
e5aef873a2
|
@ -37,7 +37,6 @@
|
|||
|
||||
#include <nuttx/irq.h>
|
||||
|
||||
#include "riscv_sbi.h"
|
||||
#include "riscv_common_memorymap.h"
|
||||
|
||||
/****************************************************************************
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
****************************************************************************/
|
||||
|
||||
#include "riscv_internal.h"
|
||||
#include "riscv_sbi.h"
|
||||
#include "chip.h"
|
||||
|
||||
/****************************************************************************
|
||||
|
|
|
@ -27,8 +27,9 @@
|
|||
|
||||
#include <arch/barriers.h>
|
||||
|
||||
#include "riscv_mtimer.h"
|
||||
#include "riscv_internal.h"
|
||||
#include "riscv_mtimer.h"
|
||||
#include "riscv_sbi.h"
|
||||
|
||||
/****************************************************************************
|
||||
* Private Types
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
#include <stdint.h>
|
||||
|
||||
#include "riscv_internal.h"
|
||||
#include "riscv_sbi.h"
|
||||
|
||||
#include "sbi_mcall.h"
|
||||
#include "sbi_internal.h"
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
|
||||
#include <debug.h>
|
||||
#include "riscv_internal.h"
|
||||
#include "riscv_sbi.h"
|
||||
#include "chip.h"
|
||||
|
||||
#include "qemu_rv_userspace.h"
|
||||
|
@ -253,4 +254,4 @@ void sbi_late_initialize(void)
|
|||
riscv_append_pmp_region(NAPOT_RW, 0, SIZE_HALF);
|
||||
riscv_append_pmp_region(NAPOT_RWX, SIZE_HALF, SIZE_HALF);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -41,6 +41,7 @@
|
|||
#include "qemu_rv_rptun.h"
|
||||
|
||||
#include "riscv_internal.h"
|
||||
#include "riscv_sbi.h"
|
||||
#include "romfs.h"
|
||||
|
||||
#ifdef CONFIG_USERLED
|
||||
|
|
Loading…
Reference in New Issue