[GitHub] [incubator-nuttx] jlaitine commented on a change in pull request #5323: Fix opensbi build

[GitBox <gi...@apache.org>]

jlaitine commented on a change in pull request #5323:
URL: https://github.com/apache/incubator-nuttx/pull/5323#discussion_r790752876



##########
File path: arch/risc-v/src/mpfs/mpfs_opensbi.c
##########
@@ -23,27 +23,36 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-
 #include <assert.h>
 #include <errno.h>
 #include <stdint.h>
-
-#include "riscv_internal.h"
-#include "riscv_arch.h"
+#include <riscv_arch.h>
 
 #include <hardware/mpfs_plic.h>
 #include <hardware/mpfs_memorymap.h>
 #include <hardware/mpfs_clint.h>
 #include <hardware/mpfs_sysreg.h>
 
+/* OpenSBI will also define NULL. Undefine NULL in order to avoid warning:
+ * 'warning: "NULL" redefined'
+ */
+
+#ifdef NULL
+  #undef NULL
+#endif
+
 #include <sbi/sbi_types.h>
 #include <sbi/riscv_atomic.h>
+#include <sbi/riscv_asm.h>
 #include <sbi/riscv_io.h>
+#include <sbi/riscv_encoding.h>
 #include <sbi/sbi_hart.h>
 #include <sbi/sbi_console.h>
 #include <sbi/sbi_platform.h>
+#include <sbi/sbi_domain.h>
 #include <sbi/sbi_timer.h>
 #include <sbi/sbi_init.h>
+#include <sbi/sbi_scratch.h>

Review comment:
       struct sbi_scratch comes from there




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org