From fe2cd01ba71a04b5c11eae8ade7969ac1db8640d Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Fri, 22 Jun 2018 08:01:48 +0200
Subject: bsp/riscv: Add device tree support

Update #3433.
---
 bsps/riscv/riscv/include/bsp.h |  2 ++
 bsps/riscv/riscv/start/start.S | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'bsps')

diff --git a/bsps/riscv/riscv/include/bsp.h b/bsps/riscv/riscv/include/bsp.h
index 79f359ac34..6298966a8c 100644
--- a/bsps/riscv/riscv/include/bsp.h
+++ b/bsps/riscv/riscv/include/bsp.h
@@ -44,6 +44,8 @@
 extern "C" {
 #endif
 
+#define BSP_FDT_IS_SUPPORTED
+
 /**
   * @defgroup riscv_generic Register Definitions
   *
diff --git a/bsps/riscv/riscv/start/start.S b/bsps/riscv/riscv/start/start.S
index 1d0bde164b..f40ceeff50 100644
--- a/bsps/riscv/riscv/start/start.S
+++ b/bsps/riscv/riscv/start/start.S
@@ -27,10 +27,11 @@
  * SUCH DAMAGE.
  */
 
-#include <bsp/linker-symbols.h>
-#include <rtems/score/riscv-utility.h>
-#include <rtems/score/cpu.h>
 #include <rtems/asm.h>
+#include <rtems/score/cpu.h>
+#include <rtems/score/riscv-utility.h>
+#include <bsp/linker-symbols.h>
+#include <bspopts.h>
 
 EXTERN(bsp_section_bss_begin)
 EXTERN(bsp_section_bss_end)
@@ -57,12 +58,17 @@ SYM(_start):
 	bnez	s0, .Lloop_forever
 #endif
 
-	la	t0, ISR_Handler
-	csrw	mtvec, t0
-
 	/* load stack and frame pointers */
 	la	sp, _Configuration_Interrupt_stack_area_end
 
+#ifdef BSP_START_COPY_FDT_FROM_U_BOOT
+	mv	a0, a1
+	call	bsp_fdt_copy
+#endif
+
+	la	t0, ISR_Handler
+	csrw	mtvec, t0
+
 	/* Clear .bss */
 	la	a0, bsp_section_bss_begin
 	li	a1, 0
-- 
cgit v1.2.3