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 #535 from sifive/bump_freertos-metal
Browse files Browse the repository at this point in the history 
Bump all FreeRTOS needed to support RV32E / FPU (and remove Segger SystemView)
  • Loading branch information
@bsousi5
bsousi5 authored Sep 4, 2020
2 parents 8b7b5be + 730a97c commit 08e2fb4
Show file tree
Hide file tree
Showing 35 changed files with 100 additions and 91 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,6 @@
[submodule "software/example-freertos-minimal"]
path = software/example-freertos-minimal
url = https://github.com/sifive/example-freertos-minimal.git
[submodule "software/example-freertos-blinky-systemview"]
path = software/example-freertos-blinky-systemview
url = https://github.com/sifive/example-freertos-blinky-systemview.git
[submodule "scripts/devicetree-overlay-generator"]
path = scripts/devicetree-overlay-generator
url = https://github.com/sifive/devicetree-overlay-generator.git
Expand Down
2 changes: 1 addition & 1 deletion FreeRTOS-metal
Submodule FreeRTOS-metal updated 5 files
+1 −1 FreeRTOS-Kernel/portable/GCC/RISC-V/port.c
+0 −22 FreeRTOS-Kernel/portable/GCC/RISC-V/portASM.S
+0 −44 FreeRTOS-Kernel/tasks.c
+0 −9 scripts/FreeRTOS.mk
+0 −6 templates/Bridge_Freedom-metal_FreeRTOS.h.in
1 change: 0 additions & 1 deletion bsp/freedom-e310-arty/metal.default.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ SECTIONS
*(.srodata.cst4)
*(.srodata.cst2)
*(.srodata .srodata.*)

} >rom :rom

/* ITIM SECTION
Expand Down
16 changes: 10 additions & 6 deletions bsp/freedom-e310-arty/metal.freertos.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,15 +132,16 @@ SECTIONS
PROVIDE_HIDDEN ( metal_destructors_end = .);
} >rom :rom

.privileged_functions : ALIGN (4) {
.privileged_functions : ALIGN (32) {
__privileged_functions_start__ = .;
KEEP(*(privileged_functions))
. = ALIGN(4);
. = ALIGN(32);
__privileged_functions_end__ = .;
} >rom


.ctors : {
. = ALIGN(32);
__unprivileged_section_start__ = .;
KEEP (*crtbegin.o(.ctors))
KEEP (*crtbegin?.o(.ctors))
Expand Down Expand Up @@ -169,8 +170,6 @@ SECTIONS
*(.srodata.cst4)
*(.srodata.cst2)
*(.srodata .srodata.*)
__unprivileged_section_end__ = .;

} >rom :rom

/* ITIM SECTION
Expand Down Expand Up @@ -202,6 +201,9 @@ SECTIONS
*(.text.startup .text.startup.*)
*(.text .text.*)
*(.gnu.linkonce.t.*)
*(freertos_system_calls)
. = ALIGN(32);
__unprivileged_section_end__ = .;
} >rom :text

/* RAM SECTION
Expand All @@ -218,6 +220,7 @@ SECTIONS
*/

.data : ALIGN(8) {
. = ALIGN(32);
__unprivileged_data_section_start__ = .;
*(.data .data.*)
*(.gnu.linkonce.d.*)
Expand Down Expand Up @@ -257,19 +260,20 @@ SECTIONS
*(.bss .bss.*)
*(.gnu.linkonce.b.*)
*(COMMON)
. = ALIGN(32);
__unprivileged_data_section_end__ = .;
} >ram :ram

PROVIDE( metal_segment_bss_source_start = LOADADDR(.tbss) );
PROVIDE( metal_segment_bss_target_start = ADDR(.tbss) );
PROVIDE( metal_segment_bss_target_end = ADDR(.bss) + SIZEOF(.bss) );

.privileged_data (NOLOAD) : ALIGN(8) {
.privileged_data (NOLOAD) : ALIGN(32) {
__privileged_data_start__ = .;
*(privileged_data)
/* Non kernel data is kept out of the first _Privileged_Data_Region_Size
bytes of SRAM. */
. = ALIGN(4);
. = ALIGN(32);
__privileged_data_end__ = .;
} >ram

Expand Down
1 change: 0 additions & 1 deletion bsp/freedom-e310-arty/metal.scratchpad.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ SECTIONS
*(.srodata.cst4)
*(.srodata.cst2)
*(.srodata .srodata.*)

} >ram :rom

/* ITIM SECTION
Expand Down
1 change: 0 additions & 1 deletion bsp/qemu-sifive-e31/metal.default.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ SECTIONS
*(.srodata.cst4)
*(.srodata.cst2)
*(.srodata .srodata.*)

} >rom :rom

/* ITIM SECTION
Expand Down
16 changes: 10 additions & 6 deletions bsp/qemu-sifive-e31/metal.freertos.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,16 @@ SECTIONS
PROVIDE_HIDDEN ( metal_destructors_end = .);
} >rom :rom

.privileged_functions : ALIGN (4) {
.privileged_functions : ALIGN (32) {
__privileged_functions_start__ = .;
KEEP(*(privileged_functions))
. = ALIGN(4);
. = ALIGN(32);
__privileged_functions_end__ = .;
} >rom


.ctors : {
. = ALIGN(32);
__unprivileged_section_start__ = .;
KEEP (*crtbegin.o(.ctors))
KEEP (*crtbegin?.o(.ctors))
Expand Down Expand Up @@ -168,8 +169,6 @@ SECTIONS
*(.srodata.cst4)
*(.srodata.cst2)
*(.srodata .srodata.*)
__unprivileged_section_end__ = .;

} >rom :rom

/* ITIM SECTION
Expand Down Expand Up @@ -201,6 +200,9 @@ SECTIONS
*(.text.startup .text.startup.*)
*(.text .text.*)
*(.gnu.linkonce.t.*)
*(freertos_system_calls)
. = ALIGN(32);
__unprivileged_section_end__ = .;
} >rom :text

/* RAM SECTION
Expand All @@ -217,6 +219,7 @@ SECTIONS
*/

.data : ALIGN(8) {
. = ALIGN(32);
__unprivileged_data_section_start__ = .;
*(.data .data.*)
*(.gnu.linkonce.d.*)
Expand Down Expand Up @@ -256,19 +259,20 @@ SECTIONS
*(.bss .bss.*)
*(.gnu.linkonce.b.*)
*(COMMON)
. = ALIGN(32);
__unprivileged_data_section_end__ = .;
} >ram :ram

PROVIDE( metal_segment_bss_source_start = LOADADDR(.tbss) );
PROVIDE( metal_segment_bss_target_start = ADDR(.tbss) );
PROVIDE( metal_segment_bss_target_end = ADDR(.bss) + SIZEOF(.bss) );

.privileged_data (NOLOAD) : ALIGN(8) {
.privileged_data (NOLOAD) : ALIGN(32) {
__privileged_data_start__ = .;
*(privileged_data)
/* Non kernel data is kept out of the first _Privileged_Data_Region_Size
bytes of SRAM. */
. = ALIGN(4);
. = ALIGN(32);
__privileged_data_end__ = .;
} >ram

Expand Down
1 change: 0 additions & 1 deletion bsp/qemu-sifive-e31/metal.scratchpad.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ SECTIONS
*(.srodata.cst4)
*(.srodata.cst2)
*(.srodata .srodata.*)

} >ram :rom

/* ITIM SECTION
Expand Down
1 change: 0 additions & 1 deletion bsp/qemu-sifive-s51/metal.default.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ SECTIONS
*(.srodata.cst4)
*(.srodata.cst2)
*(.srodata .srodata.*)

} >rom :rom

/* ITIM SECTION
Expand Down
16 changes: 10 additions & 6 deletions bsp/qemu-sifive-s51/metal.freertos.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,16 @@ SECTIONS
PROVIDE_HIDDEN ( metal_destructors_end = .);
} >rom :rom

.privileged_functions : ALIGN (4) {
.privileged_functions : ALIGN (32) {
__privileged_functions_start__ = .;
KEEP(*(privileged_functions))
. = ALIGN(4);
. = ALIGN(32);
__privileged_functions_end__ = .;
} >rom


.ctors : {
. = ALIGN(32);
__unprivileged_section_start__ = .;
KEEP (*crtbegin.o(.ctors))
KEEP (*crtbegin?.o(.ctors))
Expand Down Expand Up @@ -168,8 +169,6 @@ SECTIONS
*(.srodata.cst4)
*(.srodata.cst2)
*(.srodata .srodata.*)
__unprivileged_section_end__ = .;

} >rom :rom

/* ITIM SECTION
Expand Down Expand Up @@ -201,6 +200,9 @@ SECTIONS
*(.text.startup .text.startup.*)
*(.text .text.*)
*(.gnu.linkonce.t.*)
*(freertos_system_calls)
. = ALIGN(32);
__unprivileged_section_end__ = .;
} >rom :text

/* RAM SECTION
Expand All @@ -217,6 +219,7 @@ SECTIONS
*/

.data : ALIGN(8) {
. = ALIGN(32);
__unprivileged_data_section_start__ = .;
*(.data .data.*)
*(.gnu.linkonce.d.*)
Expand Down Expand Up @@ -256,19 +259,20 @@ SECTIONS
*(.bss .bss.*)
*(.gnu.linkonce.b.*)
*(COMMON)
. = ALIGN(32);
__unprivileged_data_section_end__ = .;
} >ram :ram

PROVIDE( metal_segment_bss_source_start = LOADADDR(.tbss) );
PROVIDE( metal_segment_bss_target_start = ADDR(.tbss) );
PROVIDE( metal_segment_bss_target_end = ADDR(.bss) + SIZEOF(.bss) );

.privileged_data (NOLOAD) : ALIGN(8) {
.privileged_data (NOLOAD) : ALIGN(32) {
__privileged_data_start__ = .;
*(privileged_data)
/* Non kernel data is kept out of the first _Privileged_Data_Region_Size
bytes of SRAM. */
. = ALIGN(4);
. = ALIGN(32);
__privileged_data_end__ = .;
} >ram

Expand Down
1 change: 0 additions & 1 deletion bsp/qemu-sifive-s51/metal.scratchpad.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ SECTIONS
*(.srodata.cst4)
*(.srodata.cst2)
*(.srodata .srodata.*)

} >ram :rom

/* ITIM SECTION
Expand Down
1 change: 0 additions & 1 deletion bsp/qemu-sifive-u54/metal.default.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ SECTIONS
*(.srodata.cst4)
*(.srodata.cst2)
*(.srodata .srodata.*)

} >testram :rom

/* ITIM SECTION
Expand Down
16 changes: 10 additions & 6 deletions bsp/qemu-sifive-u54/metal.freertos.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,16 @@ SECTIONS
PROVIDE_HIDDEN ( metal_destructors_end = .);
} >testram :rom

.privileged_functions : ALIGN (4) {
.privileged_functions : ALIGN (32) {
__privileged_functions_start__ = .;
KEEP(*(privileged_functions))
. = ALIGN(4);
. = ALIGN(32);
__privileged_functions_end__ = .;
} >testram


.ctors : {
. = ALIGN(32);
__unprivileged_section_start__ = .;
KEEP (*crtbegin.o(.ctors))
KEEP (*crtbegin?.o(.ctors))
Expand Down Expand Up @@ -167,8 +168,6 @@ SECTIONS
*(.srodata.cst4)
*(.srodata.cst2)
*(.srodata .srodata.*)
__unprivileged_section_end__ = .;

} >testram :rom

/* ITIM SECTION
Expand Down Expand Up @@ -200,6 +199,9 @@ SECTIONS
*(.text.startup .text.startup.*)
*(.text .text.*)
*(.gnu.linkonce.t.*)
*(freertos_system_calls)
. = ALIGN(32);
__unprivileged_section_end__ = .;
} >testram :text

/* RAM SECTION
Expand All @@ -216,6 +218,7 @@ SECTIONS
*/

.data : ALIGN(8) {
. = ALIGN(32);
__unprivileged_data_section_start__ = .;
*(.data .data.*)
*(.gnu.linkonce.d.*)
Expand Down Expand Up @@ -255,19 +258,20 @@ SECTIONS
*(.bss .bss.*)
*(.gnu.linkonce.b.*)
*(COMMON)
. = ALIGN(32);
__unprivileged_data_section_end__ = .;
} >testram :ram

PROVIDE( metal_segment_bss_source_start = LOADADDR(.tbss) );
PROVIDE( metal_segment_bss_target_start = ADDR(.tbss) );
PROVIDE( metal_segment_bss_target_end = ADDR(.bss) + SIZEOF(.bss) );

.privileged_data (NOLOAD) : ALIGN(8) {
.privileged_data (NOLOAD) : ALIGN(32) {
__privileged_data_start__ = .;
*(privileged_data)
/* Non kernel data is kept out of the first _Privileged_Data_Region_Size
bytes of SRAM. */
. = ALIGN(4);
. = ALIGN(32);
__privileged_data_end__ = .;
} >testram

Expand Down
1 change: 0 additions & 1 deletion bsp/qemu-sifive-u54/metal.scratchpad.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ SECTIONS
*(.srodata.cst4)
*(.srodata.cst2)
*(.srodata .srodata.*)

} >testram :rom

/* ITIM SECTION
Expand Down
1 change: 0 additions & 1 deletion bsp/qemu-sifive-u54mc/metal.default.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ SECTIONS
*(.srodata.cst4)
*(.srodata.cst2)
*(.srodata .srodata.*)

} >testram :rom

/* ITIM SECTION
Expand Down
Loading

0 comments on commit 08e2fb4

Please sign in to comment.