From 66901a72d41fb1f350e1d972b5b920c6d61b33a1 Mon Sep 17 00:00:00 2001 From: Bunnaroath Sou Date: Thu, 21 Mar 2019 18:04:29 -0700 Subject: Update lds files to exclude itim in .text and PLIC subinterrupts --- bsp/coreip-e34-rtl/metal.default.lds | 1 - bsp/coreip-e34-rtl/metal.h | 9 ++++++++- bsp/coreip-e34-rtl/metal.ramrodata.lds | 1 - bsp/coreip-e34-rtl/metal.scratchpad.lds | 1 - bsp/coreip-e34-rtl/settings.mk | 6 +++--- 5 files changed, 11 insertions(+), 7 deletions(-) (limited to 'bsp/coreip-e34-rtl') diff --git a/bsp/coreip-e34-rtl/metal.default.lds b/bsp/coreip-e34-rtl/metal.default.lds index 0b495c2..3fd5c5f 100644 --- a/bsp/coreip-e34-rtl/metal.default.lds +++ b/bsp/coreip-e34-rtl/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-e34-rtl/metal.h b/bsp/coreip-e34-rtl/metal.h index 091b759..f089ba7 100644 --- a/bsp/coreip-e34-rtl/metal.h +++ b/bsp/coreip-e34-rtl/metal.h @@ -5,6 +5,11 @@ #ifdef __METAL_MACHINE_MACROS +#define __METAL_PLIC_SUBINTERRUPTS 128 + +#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 128 + #define METAL_MAX_PLIC_INTERRUPTS 1 #define METAL_MAX_CLIC_INTERRUPTS 0 @@ -115,7 +122,7 @@ struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000 = { .control_base = 201326592UL, .control_size = 67108864UL, .max_priority = 7UL, - .num_interrupts = 127UL, + .num_interrupts = 128UL, .interrupt_controller = 1, }; diff --git a/bsp/coreip-e34-rtl/metal.ramrodata.lds b/bsp/coreip-e34-rtl/metal.ramrodata.lds index 1851d65..1946306 100644 --- a/bsp/coreip-e34-rtl/metal.ramrodata.lds +++ b/bsp/coreip-e34-rtl/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-e34-rtl/metal.scratchpad.lds b/bsp/coreip-e34-rtl/metal.scratchpad.lds index f07f9ed..3c1fe99 100644 --- a/bsp/coreip-e34-rtl/metal.scratchpad.lds +++ b/bsp/coreip-e34-rtl/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-e34-rtl/settings.mk b/bsp/coreip-e34-rtl/settings.mk index f60f250..93a732a 100644 --- a/bsp/coreip-e34-rtl/settings.mk +++ b/bsp/coreip-e34-rtl/settings.mk @@ -1,6 +1,6 @@ -RISCV_ARCH=rv32imac -RISCV_ABI=ilp32 -RISCV_CMODEL=medlow +RISCV_ARCH=rv32imafc +RISCV_ABI=ilp32f +RISCV_CMODEL=medany COREIP_MEM_WIDTH=32 -- cgit v1.2.1-18-gbd029