Skip to content
This repository has been archived by the owner on Jul 3, 2024. It is now read-only.

Commit

Permalink
Merge pull request #399 from sifive/bump-submodules
Browse files Browse the repository at this point in the history 
Bump Metal and Devicetree tools
  • Loading branch information
@nategraff-sifive
nategraff-sifive authored Oct 23, 2019
2 parents ba3a878 + 6f09273 commit 7f31466
Show file tree
Hide file tree
Showing 32 changed files with 33 additions and 35 deletions.
2 changes: 1 addition & 1 deletion bsp/freedom-e310-arty/metal.default.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/freedom-e310-arty/metal.ramrodata.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/freedom-e310-arty/metal.scratchpad.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/qemu-sifive-e31/metal.default.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/qemu-sifive-e31/metal.ramrodata.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/qemu-sifive-e31/metal.scratchpad.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/qemu-sifive-s51/metal.default.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/qemu-sifive-s51/metal.ramrodata.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/qemu-sifive-s51/metal.scratchpad.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/qemu-sifive-u54/metal.default.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/qemu-sifive-u54/metal.ramrodata.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/qemu-sifive-u54/metal.scratchpad.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
3 changes: 1 addition & 2 deletions bsp/qemu-sifive-u54/settings.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
# ----------------------------------- #
# ----------------------------------- #

RISCV_ARCH=rv64imafdc
RISCV_ARCH=rv64imafdcsu
RISCV_ABI=lp64d
RISCV_CMODEL=medany
RISCV_SERIES=sifive-5-series

TARGET_TAGS=qemu
TARGET_DHRY_ITERS=20000000
Expand Down
2 changes: 1 addition & 1 deletion bsp/qemu-sifive-u54mc/metal.default.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/qemu-sifive-u54mc/metal.ramrodata.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/qemu-sifive-u54mc/metal.scratchpad.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
3 changes: 1 addition & 2 deletions bsp/qemu-sifive-u54mc/settings.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
# ----------------------------------- #
# ----------------------------------- #

RISCV_ARCH=rv64imafdc
RISCV_ARCH=rv64imafdcsu
RISCV_ABI=lp64d
RISCV_CMODEL=medany
RISCV_SERIES=sifive-5-series

TARGET_TAGS=qemu
TARGET_DHRY_ITERS=20000000
Expand Down
2 changes: 1 addition & 1 deletion bsp/sifive-hifive-unleashed/metal.default.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/sifive-hifive-unleashed/metal.ramrodata.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/sifive-hifive-unleashed/metal.scratchpad.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/sifive-hifive1-revb/metal.default.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/sifive-hifive1-revb/metal.ramrodata.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/sifive-hifive1-revb/metal.scratchpad.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/sifive-hifive1/metal.default.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/sifive-hifive1/metal.ramrodata.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/sifive-hifive1/metal.scratchpad.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/spike/metal.default.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/spike/metal.ramrodata.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion bsp/spike/metal.scratchpad.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ SECTIONS

.heap : {
PROVIDE( metal_segment_heap_target_start = . );
. = __heap_size;
. = DEFINED(__heap_max) ? LENGTH(ram) - ( . - ORIGIN(ram) ) : __heap_size;
PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram
Expand Down
2 changes: 1 addition & 1 deletion freedom-devicetree-tools
Submodule freedom-devicetree-tools updated 2 files
+7 −5 linker_script/freedom-ldscript-generator.c++
+4 −1 linker_script/sections/uninit_group.c++
2 changes: 1 addition & 1 deletion freedom-metal
Submodule freedom-metal updated 2 files
+8 −4 src/drivers/riscv_plic0.c
+11 −5 src/drivers/sifive_clic0.c
4 changes: 2 additions & 2 deletions wit-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[
{
"commit": "f2ad4771ea34b18c2d7ad86667c47d57bf3e60db",
"commit": "5bb9f91dd5b6115cc6ae0b73b9b0221d1c90e03f",
"name": "freedom-devicetree-tools",
"source": "git@github.com:sifive/freedom-devicetree-tools.git"
},
{
"commit": "61737c07c64c332e9bcb23a19cad9ba7019fe117",
"commit": "2d0d3c1fa0874caf2e22e0377360656a97d21039",
"name": "freedom-metal",
"source": "git@github.com:sifive/freedom-metal.git"
},
Expand Down

0 comments on commit 7f31466

Please sign in to comment.