From 087b7cd52839be60a18efc52bff788f0e2e512c9 Mon Sep 17 00:00:00 2001
From: "xiao-xuan.ngew" <xiao-xuan.ngew.xc@renesas.com>
Date: Mon, 29 Nov 2021 12:23:50 +0800
Subject: [PATCH 1/2] [RESG][Update] Updated PG xml to support RX671

---
 configuration/freertos.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/configuration/freertos.xml b/configuration/freertos.xml
index f6caa8f626..820aed34fc 100644
--- a/configuration/freertos.xml
+++ b/configuration/freertos.xml
@@ -28,6 +28,7 @@
         <group>RX65N</group>
         <group>RX66T</group>
         <group>RX66N</group>
+        <group>RX671</group>
         <group>RX71M</group>
         <group>RX72T</group>
         <group>RX72N</group>
@@ -37,6 +38,7 @@
         <board>RSKRX65N-2MB</board>
         <board>RSKRX66T</board>
         <board>RSKRX66N</board>
+        <board>RSKRX671</board>
         <board>RSKRX71M</board>
         <board>RSKRX72T</board>
         <board>RSKRX72N</board>
@@ -58,6 +60,7 @@
         <group>RX65N</group>
         <group>RX66T</group>
         <group>RX66N</group>
+        <group>RX671</group>
         <group>RX71M</group>
         <group>RX72T</group>
         <group>RX72N</group>
@@ -67,6 +70,7 @@
         <board>RSKRX65N-2MB</board>
         <board>RSKRX66T</board>
         <board>RSKRX66N</board>
+        <board>RSKRX671</board>
         <board>RSKRX71M</board>
         <board>RSKRX72T</board>
         <board>RSKRX72N</board>
@@ -105,6 +109,7 @@
             <group>RX65N</group>
             <group>RX66T</group>
             <group>RX66N</group>
+            <group>RX671</group>
             <group>RX71M</group>
             <group>RX72T</group>
             <group>RX72N</group>
@@ -134,6 +139,7 @@
             <group>RX65N</group>
             <group>RX66T</group>
             <group>RX66N</group>
+            <group>RX671</group>
             <group>RX71M</group>
             <group>RX72T</group>
             <group>RX72N</group>
@@ -213,6 +219,7 @@
             <group>RX65N</group>
             <group>RX66T</group>
             <group>RX66N</group>
+            <group>RX671</group>
             <group>RX71M</group>
             <group>RX72T</group>
             <group>RX72N</group>
@@ -241,6 +248,7 @@
             <group>RX65N</group>
             <group>RX66T</group>
             <group>RX66N</group>
+            <group>RX671</group>
             <group>RX71M</group>
             <group>RX72T</group>
             <group>RX72N</group>
@@ -338,6 +346,7 @@
             <group>RX65N</group>
             <group>RX66T</group>
             <group>RX66N</group>
+            <group>RX671</group>
             <group>RX71M</group>
             <group>RX72T</group>
             <group>RX72N</group>
@@ -367,6 +376,7 @@
             <group>RX65N</group>
             <group>RX66T</group>
             <group>RX66N</group>
+            <group>RX671</group>
             <group>RX71M</group>
             <group>RX72T</group>
             <group>RX72N</group>

From ffae57f63cfe590bf0810aaa3ee991b752b440d6 Mon Sep 17 00:00:00 2001
From: "xiao-xuan.ngew" <xiao-xuan.ngew.xc@renesas.com>
Date: Tue, 15 Mar 2022 17:27:55 +0800
Subject: [PATCH 2/2] [Fix] Fix project generation CPU portable layer import
 path (various devices)

---
 configuration/freertos.xml | 98 ++++++++++++++++++++++++--------------
 1 file changed, 62 insertions(+), 36 deletions(-)

diff --git a/configuration/freertos.xml b/configuration/freertos.xml
index 820aed34fc..8aa42d3ffb 100644
--- a/configuration/freertos.xml
+++ b/configuration/freertos.xml
@@ -98,7 +98,7 @@
             <group>RX230</group>
             <group>RX231</group>
             <group>RX23W</group>
-            <path>src/FreeRTOS/Source/portable/GCC/RX200</path>
+            <path>src/FreeRTOS/Source/portable/GCC/RX600v2</path>
         </incdir>
         <incdir>
             <toolchain>GNURX</toolchain>
@@ -108,13 +108,19 @@
             <group>RX651</group>
             <group>RX65N</group>
             <group>RX66T</group>
-            <group>RX66N</group>
-            <group>RX671</group>
             <group>RX71M</group>
             <group>RX72T</group>
+            <path>src/FreeRTOS/Source/portable/GCC/RX600v2</path>
+        </incdir>
+        <incdir>
+            <toolchain>GNURX</toolchain>
+            <series>RX600</series>
+            <series>RX700</series>
+            <group>RX66N</group>
+            <group>RX671</group>
             <group>RX72N</group>
             <group>RX72M</group>
-            <path>src/FreeRTOS/Source/portable/GCC/RX600v2</path>
+            <path>src/FreeRTOS/Source/portable/GCC/RX700v3_DPFPU</path>
         </incdir>
         <incdir>
             <toolchain>RXC</toolchain>
@@ -128,7 +134,7 @@
             <group>RX230</group>
             <group>RX231</group>
             <group>RX23W</group>
-            <path>src/FreeRTOS/Source/portable/Renesas/RX200</path>
+            <path>src/FreeRTOS/Source/portable/Renesas/RX600v2</path>
         </incdir>
         <incdir>
             <toolchain>RXC</toolchain>
@@ -138,13 +144,19 @@
             <group>RX651</group>
             <group>RX65N</group>
             <group>RX66T</group>
-            <group>RX66N</group>
-            <group>RX671</group>
             <group>RX71M</group>
             <group>RX72T</group>
+            <path>src/FreeRTOS/Source/portable/Renesas/RX600v2</path>
+        </incdir>
+        <incdir>
+            <toolchain>RXC</toolchain>
+            <series>RX600</series>
+            <series>RX700</series>
+            <group>RX66N</group>
+            <group>RX671</group>
             <group>RX72N</group>
             <group>RX72M</group>
-            <path>src/FreeRTOS/Source/portable/Renesas/RX600v2</path>
+            <path>src/FreeRTOS/Source/portable/Renesas/RX700v3_DPFPU</path>
         </incdir>
         <incdir>
             <path>src/frtos_startup</path>
@@ -209,8 +221,8 @@
             <group>RX230</group>
             <group>RX231</group>
             <group>RX23W</group>
-            <folder>portable/Renesas/RX200</folder>
-            <path>src/FreeRTOS/Source/portable/Renesas/RX200</path>
+            <folder>portable/Renesas/RX600v2</folder>
+            <path>src/FreeRTOS/Source/portable/Renesas/RX600v2</path>
         </impdir>
         <impdir>
             <toolchain>RXC</toolchain>
@@ -218,15 +230,20 @@
             <group>RX651</group>
             <group>RX65N</group>
             <group>RX66T</group>
-            <group>RX66N</group>
-            <group>RX671</group>
             <group>RX71M</group>
             <group>RX72T</group>
-            <group>RX72N</group>
-            <group>RX72M</group>
             <folder>portable/Renesas/RX600v2</folder>
             <path>src/FreeRTOS/Source/portable/Renesas/RX600v2</path>
         </impdir>
+        <impdir>
+            <toolchain>RXC</toolchain>
+            <group>RX66N</group>
+            <group>RX671</group>
+            <group>RX72N</group>
+            <group>RX72M</group>
+            <folder>portable/Renesas/RX700v3_DPFPU</folder>
+            <path>src/FreeRTOS/Source/portable/Renesas/RX700v3_DPFPU</path>
+        </impdir>
         <impdir>
             <toolchain>GNURX</toolchain>
             <group>RX130</group>
@@ -238,8 +255,8 @@
             <group>RX230</group>
             <group>RX231</group>
             <group>RX23W</group>
-            <folder>portable/GCC/RX200</folder>
-            <path>src/FreeRTOS/Source/portable/GCC/RX200</path>
+            <folder>portable/GCC/RX600v2</folder>
+            <path>src/FreeRTOS/Source/portable/GCC/RX600v2</path>
         </impdir>
         <impdir>
             <toolchain>GNURX</toolchain>
@@ -247,15 +264,20 @@
             <group>RX651</group>
             <group>RX65N</group>
             <group>RX66T</group>
-            <group>RX66N</group>
-            <group>RX671</group>
             <group>RX71M</group>
             <group>RX72T</group>
-            <group>RX72N</group>
-            <group>RX72M</group>
             <folder>portable/GCC/RX600v2</folder>
             <path>src/FreeRTOS/Source/portable/GCC/RX600v2</path>
         </impdir>
+        <impdir>
+            <toolchain>GNURX</toolchain>
+            <group>RX66N</group>
+            <group>RX671</group>
+            <group>RX72N</group>
+            <group>RX72M</group>
+            <folder>portable/GCC/RX700v3_DPFPU</folder>
+            <path>src/FreeRTOS/Source/portable/GCC/RX700v3_DPFPU</path>
+        </impdir>
         <impdir>
             <file>portable/readme.txt</file>
             <path>src/FreeRTOS/Source/portable</path>
@@ -273,14 +295,6 @@
             <file>configuration/patch_files/portable/Renesas/RX100/port.c</file>
             <path>src/FreeRTOS/Source/portable/Renesas/RX100</path>
         </impdir>
-        <impdir>
-            <toolchain>RXC</toolchain>
-            <group>RX230</group>
-            <group>RX231</group>
-            <group>RX23W</group>
-            <file>configuration/patch_files/portable/Renesas/RX200/port.c</file>
-            <path>src/FreeRTOS/Source/portable/Renesas/RX200</path>
-        </impdir>
     </package>
     <!-- Heap Information. The purpose is to provide information to estimate Heap Size -->
     <!-- The redundant zero number before a numerical data may cause it to be wrong, because some numerical data are input of an javascript engine -->
@@ -335,7 +349,7 @@
             <group>RX230</group>
             <group>RX231</group>
             <group>RX23W</group>
-            <path>src/FreeRTOS/Source/portable/Renesas/RX200/portmacro.h</path>
+            <path>src/FreeRTOS/Source/portable/Renesas/RX600v2/portmacro.h</path>
         </property>
         <property id="portBYTE_ALIGNMENT">
             <toolchain>RXC</toolchain>
@@ -345,13 +359,19 @@
             <group>RX651</group>
             <group>RX65N</group>
             <group>RX66T</group>
-            <group>RX66N</group>
-            <group>RX671</group>
             <group>RX71M</group>
             <group>RX72T</group>
+            <path>src/FreeRTOS/Source/portable/Renesas/RX600v2/portmacro.h</path>
+        </property>
+        <property id="portBYTE_ALIGNMENT">
+            <toolchain>RXC</toolchain>
+            <series>RX600</series>
+            <series>RX700</series>
+            <group>RX66N</group>
+            <group>RX671</group>
             <group>RX72N</group>
             <group>RX72M</group>
-            <path>src/FreeRTOS/Source/portable/Renesas/RX600v2/portmacro.h</path>
+            <path>src/FreeRTOS/Source/portable/Renesas/RX700v3_DPFPU/portmacro.h</path>
         </property>
         <property id="portBYTE_ALIGNMENT">
             <toolchain>GNURX</toolchain>
@@ -365,7 +385,7 @@
             <group>RX230</group>
             <group>RX231</group>
             <group>RX23W</group>
-            <path>src/FreeRTOS/Source/portable/GCC/RX200/portmacro.h</path>
+            <path>src/FreeRTOS/Source/portable/GCC/RX600v2/portmacro.h</path>
         </property>
         <property id="portBYTE_ALIGNMENT">
             <toolchain>GNURX</toolchain>
@@ -375,13 +395,19 @@
             <group>RX651</group>
             <group>RX65N</group>
             <group>RX66T</group>
-            <group>RX66N</group>
-            <group>RX671</group>
             <group>RX71M</group>
             <group>RX72T</group>
+            <path>src/FreeRTOS/Source/portable/GCC/RX600v2/portmacro.h</path>
+        </property>
+        <property id="portBYTE_ALIGNMENT">
+            <toolchain>GNURX</toolchain>
+            <series>RX600</series>
+            <series>RX700</series>
+            <group>RX66N</group>
+            <group>RX671</group>
             <group>RX72N</group>
             <group>RX72M</group>
-            <path>src/FreeRTOS/Source/portable/GCC/RX600v2/portmacro.h</path>
+            <path>src/FreeRTOS/Source/portable/GCC/RX700v3_DPFPU/portmacro.h</path>
         </property>
         <property id="portBYTE_ALIGNMENT_MASK">
             <path>src/FreeRTOS/Source/include/portable.h</path>