From 66901a72d41fb1f350e1d972b5b920c6d61b33a1 Mon Sep 17 00:00:00 2001
From: Bunnaroath Sou <bsou@sifive.com>
Date: Thu, 21 Mar 2019 18:04:29 -0700
Subject: Update lds files to exclude itim in .text and PLIC subinterrupts

---
 bsp/coreip-s54-arty/metal.default.lds    | 1 -
 bsp/coreip-s54-arty/metal.h              | 9 ++++++++-
 bsp/coreip-s54-arty/metal.ramrodata.lds  | 1 -
 bsp/coreip-s54-arty/metal.scratchpad.lds | 1 -
 bsp/coreip-s54-arty/settings.mk          | 4 ++--
 5 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'bsp/coreip-s54-arty')

diff --git a/bsp/coreip-s54-arty/metal.default.lds b/bsp/coreip-s54-arty/metal.default.lds
index bb593e9..965607a 100644
--- a/bsp/coreip-s54-arty/metal.default.lds
+++ b/bsp/coreip-s54-arty/metal.default.lds
@@ -37,7 +37,6 @@ SECTIONS
 		*(.text.unlikely .text.unlikely.*)
 		*(.text.startup .text.startup.*)
 		*(.text .text.*)
-		*(.itim .itim.*)
 		*(.gnu.linkonce.t.*)
 	} >flash AT>flash :flash
 
diff --git a/bsp/coreip-s54-arty/metal.h b/bsp/coreip-s54-arty/metal.h
index a757691..55f2a7a 100644
--- a/bsp/coreip-s54-arty/metal.h
+++ b/bsp/coreip-s54-arty/metal.h
@@ -5,6 +5,11 @@
 
 #ifdef __METAL_MACHINE_MACROS
 
+#define __METAL_PLIC_SUBINTERRUPTS 27
+
+#ifndef __METAL_PLIC_SUBINTERRUPTS
+#define __METAL_PLIC_SUBINTERRUPTS 0
+#endif
 #ifndef __METAL_CLIC_SUBINTERRUPTS
 #define __METAL_CLIC_SUBINTERRUPTS 0
 #endif
@@ -17,6 +22,8 @@
 
 #define __METAL_INTERRUPT_CONTROLLER_C000000_INTERRUPTS 1
 
+#define __METAL_PLIC_SUBINTERRUPTS 27
+
 #define METAL_MAX_PLIC_INTERRUPTS 1
 
 #define METAL_MAX_CLIC_INTERRUPTS 0
@@ -192,7 +199,7 @@ struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000 = {
     .control_base = 201326592UL,
     .control_size = 67108864UL,
     .max_priority = 7UL,
-    .num_interrupts = 26UL,
+    .num_interrupts = 27UL,
     .interrupt_controller = 1,
 };
 
diff --git a/bsp/coreip-s54-arty/metal.ramrodata.lds b/bsp/coreip-s54-arty/metal.ramrodata.lds
index ed516b5..8faa8d0 100644
--- a/bsp/coreip-s54-arty/metal.ramrodata.lds
+++ b/bsp/coreip-s54-arty/metal.ramrodata.lds
@@ -137,7 +137,6 @@ SECTIONS
 		*(.text.startup .text.startup.*)
 		*(.text .text.*)
 		*(.gnu.linkonce.t.*)
-		*(.itim .itim.*)
 	} >flash AT>flash :flash
 
 
diff --git a/bsp/coreip-s54-arty/metal.scratchpad.lds b/bsp/coreip-s54-arty/metal.scratchpad.lds
index 5dc9cc8..0edadd5 100644
--- a/bsp/coreip-s54-arty/metal.scratchpad.lds
+++ b/bsp/coreip-s54-arty/metal.scratchpad.lds
@@ -37,7 +37,6 @@ SECTIONS
 		*(.text.unlikely .text.unlikely.*)
 		*(.text.startup .text.startup.*)
 		*(.text .text.*)
-		*(.itim .itim.*)
 		*(.gnu.linkonce.t.*)
 	} >ram AT>ram :ram
 
diff --git a/bsp/coreip-s54-arty/settings.mk b/bsp/coreip-s54-arty/settings.mk
index 2832d7c..d001dee 100644
--- a/bsp/coreip-s54-arty/settings.mk
+++ b/bsp/coreip-s54-arty/settings.mk
@@ -1,5 +1,5 @@
-RISCV_ARCH=rv64imac
-RISCV_ABI=lp64
+RISCV_ARCH=rv64imafdc
+RISCV_ABI=lp64d
 RISCV_CMODEL=medany
 
 TARGET_TAGS=fpga openocd
-- 
cgit v1.2.1-18-gbd029