Skip to content

Commit 37678b0

Browse files
JoeBenczarskijbenczarskichinglee-iotkar-rahul-awsSkptak
authored
Support configurable RISC-V chip extension (#773)
* Support configurable RISC-V chip extension Added the FREERTOS_RISCV_EXTENSION option to allow the user to select which chip extension they want included. Removed the port for pulpino to instead use the new option. * Add port GCC_RISC_V_GENERIC and IAR_RISC_V_GENERIC * Add two rics-v generic ports to support FREERTOS_RISCV_EXTENSION config --------- Co-authored-by: Joe Benczarski <[email protected]> Co-authored-by: chinglee-iot <[email protected]> Co-authored-by: Ching-Hsin Lee <[email protected]> Co-authored-by: kar-rahul-aws <[email protected]> Co-authored-by: Soren Ptak <[email protected]>
1 parent 5281427 commit 37678b0

File tree

4 files changed

+61
-0
lines changed

4 files changed

+61
-0
lines changed

‎CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ if(NOT FREERTOS_PORT)
106106
" GCC_PPC440_XILINX - Compiler: GCC Target: Xilinx PPC440\n"
107107
" GCC_RISC_V - Compiler: GCC Target: RISC-V\n"
108108
" GCC_RISC_V_PULPINO_VEGA_RV32M1RM - Compiler: GCC Target: RISC-V Pulpino Vega RV32M1RM\n"
109+
" GCC_RISC_V_GENERIC - Compiler: GCC Target: RISC-V with FREERTOS_RISCV_EXTENSION\n"
109110
" GCC_RL78 - Compiler: GCC Target: Renesas RL78\n"
110111
" GCC_RX100 - Compiler: GCC Target: Renesas RX100\n"
111112
" GCC_RX200 - Compiler: GCC Target: Renesas RX200\n"
@@ -156,6 +157,7 @@ if(NOT FREERTOS_PORT)
156157
" IAR_MSP430 - Compiler: IAR Target: MSP430\n"
157158
" IAR_MSP430X - Compiler: IAR Target: MSP430X\n"
158159
" IAR_RISC_V - Compiler: IAR Target: RISC-V\n"
160+
" IAR_RISC_V_GENERIC - Compiler: IAR Target: RISC-V with FREERTOS_RISCV_EXTENSION\n"
159161
" IAR_RL78 - Compiler: IAR Target: Renesas RL78\n"
160162
" IAR_RX100 - Compiler: IAR Target: Renesas RX100\n"
161163
" IAR_RX600 - Compiler: IAR Target: Renesas RX600\n"

‎portable/CMakeLists.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
if( FREERTOS_PORT STREQUAL "GCC_RISC_V_GENERIC" )
2+
include( GCC/RISC-V/chip_extensions.cmake )
3+
endif()
4+
5+
if( FREERTOS_PORT STREQUAL "IAR_RISC_V_GENERIC" )
6+
include( IAR/RISC-V/chip_extensions.cmake )
7+
endif()
8+
19
# FreeRTOS internal cmake file. Do not use it in user top-level project
210

311
if (FREERTOS_PORT STREQUAL "A_CUSTOM_PORT")
@@ -292,6 +300,10 @@ add_library(freertos_kernel_port STATIC
292300
GCC/RISC-V/port.c
293301
GCC/RISC-V/portASM.S>
294302

303+
$<$<STREQUAL:${FREERTOS_PORT},GCC_RISC_V_GENERIC>:
304+
GCC/RISC-V/port.c
305+
GCC/RISC-V/portASM.S>
306+
295307
# Renesas RL78 port for GCC
296308
$<$<STREQUAL:${FREERTOS_PORT},GCC_RL78>:
297309
GCC/RL78/port.c
@@ -497,6 +509,10 @@ add_library(freertos_kernel_port STATIC
497509
IAR/RISC-V/port.c
498510
IAR/RISC-V/portASM.s>
499511

512+
$<$<STREQUAL:${FREERTOS_PORT},IAR_RISC_V_GENERIC>:
513+
IAR/RISC-V/port.c
514+
IAR/RISC-V/portASM.s>
515+
500516
# Renesas RL78 port for IAR EWRL78
501517
$<$<STREQUAL:${FREERTOS_PORT},IAR_RL78>:
502518
IAR/RL78/port.c
@@ -845,6 +861,10 @@ target_include_directories(freertos_kernel_port PUBLIC
845861
${CMAKE_CURRENT_LIST_DIR}/GCC/RISC-V
846862
${CMAKE_CURRENT_LIST_DIR}/GCC/RISC-V/chip_specific_extensions/Pulpino_Vega_RV32M1RM>
847863

864+
$<$<STREQUAL:${FREERTOS_PORT},GCC_RISC_V_GENERIC>:
865+
${CMAKE_CURRENT_LIST_DIR}/GCC/RISC-V
866+
${CMAKE_CURRENT_LIST_DIR}/GCC/RISC-V/chip_specific_extensions/${FREERTOS_RISCV_EXTENSION}>
867+
848868
# Renesas RL78 port for GCC
849869
$<$<STREQUAL:${FREERTOS_PORT},GCC_RL78>:${CMAKE_CURRENT_LIST_DIR}/GCC/RL78>
850870

@@ -942,6 +962,10 @@ target_include_directories(freertos_kernel_port PUBLIC
942962
${CMAKE_CURRENT_LIST_DIR}/IAR/RISC-V
943963
${CMAKE_CURRENT_LIST_DIR}/IAR/RISC-V/chip_specific_extensions/RV32I_CLINT_no_extensions>
944964

965+
$<$<STREQUAL:${FREERTOS_PORT},IAR_RISC_V_GENERIC>:
966+
${CMAKE_CURRENT_LIST_DIR}/IAR/RISC-V
967+
${CMAKE_CURRENT_LIST_DIR}/IAR/RISC-V/chip_specific_extensions/${FREERTOS_RISCV_EXTENSION}>
968+
945969
# Renesas RL78 port for IAR EWRL78
946970
$<$<STREQUAL:${FREERTOS_PORT},IAR_RL78>:${CMAKE_CURRENT_LIST_DIR}/IAR/RL78>
947971

‎portable/GCC/RISC-V/chip_extensions.cmake

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
if( FREERTOS_PORT STREQUAL "GCC_RISC_V_GENERIC" )
2+
set( VALID_CHIP_EXTENSIONS
3+
"Pulpino_Vega_RV32M1RM"
4+
"RISCV_MTIME_CLINT_no_extensions"
5+
"RISCV_no_extensions"
6+
"RV32I_CLINT_no_extensions" )
7+
8+
if( ( NOT FREERTOS_RISCV_EXTENSION ) OR ( NOT ( ${FREERTOS_RISCV_EXTENSION} IN_LIST VALID_CHIP_EXTENSIONS ) ) )
9+
message(FATAL_ERROR
10+
"FREERTOS_RISCV_EXTENSION \"${FREERTOS_RISCV_EXTENSION}\" is not set or unsupported.\n"
11+
"Please specify it from top-level CMake file (example):\n"
12+
" set(FREERTOS_RISCV_EXTENSION RISCV_MTIME_CLINT_no_extensions CACHE STRING \"\")\n"
13+
" or from CMake command line option:\n"
14+
" -DFREERTOS_RISCV_EXTENSION=RISCV_MTIME_CLINT_no_extensions\n"
15+
"\n"
16+
" Available extension options:\n"
17+
" ${VALID_CHIP_EXTENSIONS} \n")
18+
endif()
19+
endif()

‎portable/IAR/RISC-V/chip_extensions.cmake

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
if( FREERTOS_PORT STREQUAL "IAR_RISC_V_GENERIC" )
2+
set( VALID_CHIP_EXTENSIONS
3+
"RV32I_CLINT_no_extensions" )
4+
5+
if( ( NOT FREERTOS_RISCV_EXTENSION ) OR ( NOT ( ${FREERTOS_RISCV_EXTENSION} IN_LIST VALID_CHIP_EXTENSIONS ) ) )
6+
message(FATAL_ERROR
7+
"FREERTOS_RISCV_EXTENSION \"${FREERTOS_RISCV_EXTENSION}\" is not set or unsupported.\n"
8+
"Please specify it from top-level CMake file (example):\n"
9+
" set(FREERTOS_RISCV_EXTENSION RISCV_MTIME_CLINT_no_extensions CACHE STRING \"\")\n"
10+
" or from CMake command line option:\n"
11+
" -DFREERTOS_RISCV_EXTENSION=RISCV_MTIME_CLINT_no_extensions\n"
12+
"\n"
13+
" Available extension options:\n"
14+
" ${VALID_CHIP_EXTENSIONS} \n")
15+
endif()
16+
endif()

0 commit comments

Comments
 (0)