From 12485f45ebb7f96dc60951bf4365533652ac5139 Mon Sep 17 00:00:00 2001
From: Nathaniel Graff <nathaniel.graff@sifive.com>
Date: Thu, 23 May 2019 14:16:04 -0700
Subject: Update BSPs

Signed-off-by: Nathaniel Graff <nathaniel.graff@sifive.com>
---
 bsp/freedom-e310-arty/metal-inline.h       |  2 +-
 bsp/freedom-e310-arty/metal-platform.h     |  2 +-
 bsp/freedom-e310-arty/metal.default.lds    |  3 ++-
 bsp/freedom-e310-arty/metal.h              | 16 ++++++++--------
 bsp/freedom-e310-arty/metal.ramrodata.lds  |  3 ++-
 bsp/freedom-e310-arty/metal.scratchpad.lds |  3 ++-
 bsp/freedom-e310-arty/settings.mk          |  4 +++-
 7 files changed, 19 insertions(+), 14 deletions(-)

(limited to 'bsp/freedom-e310-arty')

diff --git a/bsp/freedom-e310-arty/metal-inline.h b/bsp/freedom-e310-arty/metal-inline.h
index fafb3ec..7d8fa14 100644
--- a/bsp/freedom-e310-arty/metal-inline.h
+++ b/bsp/freedom-e310-arty/metal-inline.h
@@ -1,7 +1,7 @@
 /* Copyright 2019 SiFive, Inc */
 /* SPDX-License-Identifier: Apache-2.0 */
 /* ----------------------------------- */
-/* [XXXXX] 23-05-2019 13-29-50        */
+/* [XXXXX] 28-05-2019 10-06-21        */
 /* ----------------------------------- */
 
 #ifndef ASSEMBLY
diff --git a/bsp/freedom-e310-arty/metal-platform.h b/bsp/freedom-e310-arty/metal-platform.h
index 35d7e0a..5b0bfdc 100644
--- a/bsp/freedom-e310-arty/metal-platform.h
+++ b/bsp/freedom-e310-arty/metal-platform.h
@@ -1,7 +1,7 @@
 /* Copyright 2019 SiFive, Inc */
 /* SPDX-License-Identifier: Apache-2.0 */
 /* ----------------------------------- */
-/* [XXXXX] 23-05-2019 13-29-50        */
+/* [XXXXX] 28-05-2019 10-06-22        */
 /* ----------------------------------- */
 
 #ifndef FREEDOM_E310_ARTY__METAL_PLATFORM_H
diff --git a/bsp/freedom-e310-arty/metal.default.lds b/bsp/freedom-e310-arty/metal.default.lds
index f9dcdbd..2e769fc 100644
--- a/bsp/freedom-e310-arty/metal.default.lds
+++ b/bsp/freedom-e310-arty/metal.default.lds
@@ -1,7 +1,7 @@
 /* Copyright 2019 SiFive, Inc */
 /* SPDX-License-Identifier: Apache-2.0 */
 /* ----------------------------------- */
-/* [XXXXX] 23-05-2019 13-29-50        */
+/* [XXXXX] 28-05-2019 10-06-21        */
 /* ----------------------------------- */
 
 OUTPUT_ARCH("riscv")
@@ -30,6 +30,7 @@ SECTIONS
 	PROVIDE(__stack_size = __stack_size);
 	__heap_size = DEFINED(__heap_size) ? __heap_size : 0x400;
 	PROVIDE(__metal_boot_hart = 0);
+	PROVIDE(__metal_chicken_bit = 0);
 
 
 	.init 		:
diff --git a/bsp/freedom-e310-arty/metal.h b/bsp/freedom-e310-arty/metal.h
index c1c3dca..74865cb 100644
--- a/bsp/freedom-e310-arty/metal.h
+++ b/bsp/freedom-e310-arty/metal.h
@@ -1,7 +1,7 @@
 /* Copyright 2019 SiFive, Inc */
 /* SPDX-License-Identifier: Apache-2.0 */
 /* ----------------------------------- */
-/* [XXXXX] 23-05-2019 13-29-50        */
+/* [XXXXX] 28-05-2019 10-06-21        */
 /* ----------------------------------- */
 
 #ifndef ASSEMBLY
@@ -73,14 +73,14 @@
 
 #include <metal/drivers/fixed-clock.h>
 #include <metal/memory.h>
-#include <metal/drivers/riscv,clint0.h>
-#include <metal/drivers/riscv,cpu.h>
-#include <metal/drivers/riscv,plic0.h>
+#include <metal/drivers/riscv_clint0.h>
+#include <metal/drivers/riscv_cpu.h>
+#include <metal/drivers/riscv_plic0.h>
 #include <metal/pmp.h>
-#include <metal/drivers/sifive,local-external-interrupts0.h>
-#include <metal/drivers/sifive,gpio0.h>
-#include <metal/drivers/sifive,spi0.h>
-#include <metal/drivers/sifive,uart0.h>
+#include <metal/drivers/sifive_local-external-interrupts0.h>
+#include <metal/drivers/sifive_gpio0.h>
+#include <metal/drivers/sifive_spi0.h>
+#include <metal/drivers/sifive_uart0.h>
 
 /* From clock@0 */
 struct __metal_driver_fixed_clock __metal_dt_clock_0;
diff --git a/bsp/freedom-e310-arty/metal.ramrodata.lds b/bsp/freedom-e310-arty/metal.ramrodata.lds
index d5d7b5b..74a982f 100644
--- a/bsp/freedom-e310-arty/metal.ramrodata.lds
+++ b/bsp/freedom-e310-arty/metal.ramrodata.lds
@@ -1,7 +1,7 @@
 /* Copyright 2019 SiFive, Inc */
 /* SPDX-License-Identifier: Apache-2.0 */
 /* ----------------------------------- */
-/* [XXXXX] 23-05-2019 13-29-50        */
+/* [XXXXX] 28-05-2019 10-06-21        */
 /* ----------------------------------- */
 
 OUTPUT_ARCH("riscv")
@@ -30,6 +30,7 @@ SECTIONS
 	PROVIDE(__stack_size = __stack_size);
 	__heap_size = DEFINED(__heap_size) ? __heap_size : 0x400;
 	PROVIDE(__metal_boot_hart = 0);
+	PROVIDE(__metal_chicken_bit = 0);
 
 
 	.init 		:
diff --git a/bsp/freedom-e310-arty/metal.scratchpad.lds b/bsp/freedom-e310-arty/metal.scratchpad.lds
index dfdf485..7bf4a03 100644
--- a/bsp/freedom-e310-arty/metal.scratchpad.lds
+++ b/bsp/freedom-e310-arty/metal.scratchpad.lds
@@ -1,7 +1,7 @@
 /* Copyright 2019 SiFive, Inc */
 /* SPDX-License-Identifier: Apache-2.0 */
 /* ----------------------------------- */
-/* [XXXXX] 23-05-2019 13-29-50        */
+/* [XXXXX] 28-05-2019 10-06-21        */
 /* ----------------------------------- */
 
 OUTPUT_ARCH("riscv")
@@ -30,6 +30,7 @@ SECTIONS
 	PROVIDE(__stack_size = __stack_size);
 	__heap_size = DEFINED(__heap_size) ? __heap_size : 0x400;
 	PROVIDE(__metal_boot_hart = 0);
+	PROVIDE(__metal_chicken_bit = 0);
 
 
 	.init 		:
diff --git a/bsp/freedom-e310-arty/settings.mk b/bsp/freedom-e310-arty/settings.mk
index d3d0bfc..cd417c4 100644
--- a/bsp/freedom-e310-arty/settings.mk
+++ b/bsp/freedom-e310-arty/settings.mk
@@ -1,12 +1,14 @@
 # Copyright 2019 SiFive, Inc #
 # SPDX-License-Identifier: Apache-2.0 #
 # ----------------------------------- #
-# [XXXXX] 23-05-2019 13-29-50        #
+# [XXXXX] 28-05-2019 10-06-21        #
 # ----------------------------------- #
 
 RISCV_ARCH=rv32imac
 RISCV_ABI=ilp32
 RISCV_CMODEL=medlow
+RISCV_SERIES=sifive-3-series
 
 TARGET_TAGS=fpga openocd
 TARGET_DHRY_ITERS=20000000
+TARGET_CORE_ITERS=5000
-- 
cgit v1.2.3