arch/risc-v/src: Cleanups for opensbi

- remove some unneeded includes
- tab/space fixes
- change DEBUGPANIC to PANIC in noreturn function, otherwise it compiles only in DEBUG builds

Signed-off-by: Jukka Laitinen <jukkax@ssrc.tii.ae>

arch/risc-v/src/Makefile

@@ -38,9 +38,9 @@ INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip}
 INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common}
 INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
 INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
-#ifeq ($(CONFIG_OPENSBI),y)
+ifeq ($(CONFIG_OPENSBI),y)
 INCLUDES += $(shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)opensbi$(DELIM)opensbi-3rdparty$(DELIM)include)
-#endif
+endif
 
 CPPFLAGS += $(INCLUDES)
 CFLAGS += $(INCLUDES)

arch/risc-v/src/mpfs/mpfs_opensbi.c

@@ -26,7 +26,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <stdint.h>
-#include <riscv_arch.h>
+#include "riscv_arch.h"
 
 #include <hardware/mpfs_plic.h>
 #include <hardware/mpfs_memorymap.h>
@@ -41,16 +41,9 @@
   #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>
 #include <sbi_utils/irqchip/plic.h>
@@ -563,5 +556,5 @@ void __attribute__((noreturn)) mpfs_opensbi_setup(void)
 
   /* Will never get here */
 
-  DEBUGPANIC();
+  PANIC();
 }

arch/risc-v/src/opensbi/Kconfig

@@ -9,4 +9,4 @@ config OPENSBI
 	default n
 	---help---
 		Enable or disable Open Source Supervisor Binary Interface (OpenSBI) features
-                for RISC-V.
+		for RISC-V.