build(Examples,Tools): Upgrade RISC-V Toolchain, Update Project Files (…

…#628)

.github/workflows/Build_Examples.yml

@@ -104,6 +104,20 @@ jobs:
           # Add riscv tools to path
           echo "/home/runner/riscv-none-embed-gcc/$TOOL_VER/.content/bin" >> $GITHUB_PATH
 
+      - name: Install RISCV GCC Toolchain (riscv-none-elf-gcc)
+        if: ${{ steps.check_watch.outputs.RUN_TEST == '1' }}
+        run: |
+          # Install RISCV tools (updated)
+          npm install --global xpm@latest
+          
+          # https://www.npmjs.com/package/@xpack-dev-tools/riscv-none-elf-gcc
+          TOOL_VER=12.2.0-3.1
+          xpm install --global @xpack-dev-tools/riscv-none-elf-gcc@$TOOL_VER
+          cp -r /home/runner/.local/xPacks/@xpack-dev-tools/riscv-none-elf-gcc /home/runner/riscv-none-elf-gcc
+          
+          # Add riscv tools to path
+          echo "/home/runner/riscv-none-elf-gcc/$TOOL_VER/.content/bin" >> $GITHUB_PATH
+
       - name: Install ccache
         if: ${{ steps.check_watch.outputs.RUN_TEST == '1' }}
         run: |

Examples/MAX32520/AES/.vscode/settings.json

@@ -28,11 +28,11 @@
     "RV_OCD_target_file":"${config:target}_riscv.cfg",
 
     "v_Arm_GCC":"10.3",
-    "v_xPack_GCC":"10.2.0-1.2",
+    "v_xPack_GCC":"12.2.0-3.1",
 
     "OCD_path":"${config:MAXIM_PATH}/Tools/OpenOCD",
     "ARM_GCC_path":"${config:MAXIM_PATH}/Tools/GNUTools/${config:v_Arm_GCC}",
-    "xPack_GCC_path":"${config:MAXIM_PATH}/Tools/xPack/riscv-none-embed-gcc/${config:v_xPack_GCC}",
+    "xPack_GCC_path":"${config:MAXIM_PATH}/Tools/xPack/riscv-none-elf-gcc/${config:v_xPack_GCC}",
     "Make_path":"${config:MAXIM_PATH}/Tools/MSYS2/usr/bin",
 
     "C_Cpp.default.includePath": [
@@ -67,10 +67,10 @@
         "${config:MAXIM_PATH}/Libraries/MiscDrivers"
     ],
     "C_Cpp.default.defines": [
-        "${config:board}",
-        "TARGET=${config:target}",
-        "TARGET_REV=0x4131",
-        "__GNUC__"
+
+    ],
+    "C_Cpp.default.forcedInclude": [
+        "${workspaceFolder}/build/project_defines.h"
     ]
 }
 

Examples/MAX32520/ARM-DSP/arm_bayes_example/.vscode/settings.json

@@ -28,11 +28,11 @@
     "RV_OCD_target_file":"${config:target}_riscv.cfg",
 
     "v_Arm_GCC":"10.3",
-    "v_xPack_GCC":"10.2.0-1.2",
+    "v_xPack_GCC":"12.2.0-3.1",
 
     "OCD_path":"${config:MAXIM_PATH}/Tools/OpenOCD",
     "ARM_GCC_path":"${config:MAXIM_PATH}/Tools/GNUTools/${config:v_Arm_GCC}",
-    "xPack_GCC_path":"${config:MAXIM_PATH}/Tools/xPack/riscv-none-embed-gcc/${config:v_xPack_GCC}",
+    "xPack_GCC_path":"${config:MAXIM_PATH}/Tools/xPack/riscv-none-elf-gcc/${config:v_xPack_GCC}",
     "Make_path":"${config:MAXIM_PATH}/Tools/MSYS2/usr/bin",
 
     "C_Cpp.default.includePath": [
@@ -72,11 +72,10 @@
     "C_Cpp.default.defines": [
         "ARM_MATH_CM4",
         "__FPU_PRESENT",
-        "SEMIHOSTING",
-        "${config:board}",
-        "TARGET=${config:target}",
-        "TARGET_REV=0x4131",
-        "__GNUC__"
+        "SEMIHOSTING"
+    ],
+    "C_Cpp.default.forcedInclude": [
+        "${workspaceFolder}/build/project_defines.h"
     ]
 }
 

Examples/MAX32520/ARM-DSP/arm_class_marks_example/.vscode/settings.json

@@ -28,11 +28,11 @@
     "RV_OCD_target_file":"${config:target}_riscv.cfg",
 
     "v_Arm_GCC":"10.3",
-    "v_xPack_GCC":"10.2.0-1.2",
+    "v_xPack_GCC":"12.2.0-3.1",
 
     "OCD_path":"${config:MAXIM_PATH}/Tools/OpenOCD",
     "ARM_GCC_path":"${config:MAXIM_PATH}/Tools/GNUTools/${config:v_Arm_GCC}",
-    "xPack_GCC_path":"${config:MAXIM_PATH}/Tools/xPack/riscv-none-embed-gcc/${config:v_xPack_GCC}",
+    "xPack_GCC_path":"${config:MAXIM_PATH}/Tools/xPack/riscv-none-elf-gcc/${config:v_xPack_GCC}",
     "Make_path":"${config:MAXIM_PATH}/Tools/MSYS2/usr/bin",
 
     "C_Cpp.default.includePath": [
@@ -72,11 +72,10 @@
     "C_Cpp.default.defines": [
         "ARM_MATH_CM4",
         "__FPU_PRESENT",
-        "SEMIHOSTING",
-        "${config:board}",
-        "TARGET=${config:target}",
-        "TARGET_REV=0x4131",
-        "__GNUC__"
+        "SEMIHOSTING"
+    ],
+    "C_Cpp.default.forcedInclude": [
+        "${workspaceFolder}/build/project_defines.h"
     ]
 }
 

Examples/MAX32520/ARM-DSP/arm_convolution_example/.vscode/settings.json

@@ -28,11 +28,11 @@
     "RV_OCD_target_file":"${config:target}_riscv.cfg",
 
     "v_Arm_GCC":"10.3",
-    "v_xPack_GCC":"10.2.0-1.2",
+    "v_xPack_GCC":"12.2.0-3.1",
 
     "OCD_path":"${config:MAXIM_PATH}/Tools/OpenOCD",
     "ARM_GCC_path":"${config:MAXIM_PATH}/Tools/GNUTools/${config:v_Arm_GCC}",
-    "xPack_GCC_path":"${config:MAXIM_PATH}/Tools/xPack/riscv-none-embed-gcc/${config:v_xPack_GCC}",
+    "xPack_GCC_path":"${config:MAXIM_PATH}/Tools/xPack/riscv-none-elf-gcc/${config:v_xPack_GCC}",
     "Make_path":"${config:MAXIM_PATH}/Tools/MSYS2/usr/bin",
 
     "C_Cpp.default.includePath": [
@@ -72,11 +72,10 @@
     "C_Cpp.default.defines": [
         "ARM_MATH_CM4",
         "__FPU_PRESENT",
-        "SEMIHOSTING",
-        "${config:board}",
-        "TARGET=${config:target}",
-        "TARGET_REV=0x4131",
-        "__GNUC__"
+        "SEMIHOSTING"
+    ],
+    "C_Cpp.default.forcedInclude": [
+        "${workspaceFolder}/build/project_defines.h"
     ]
 }