Merge branch 'rx_development_202012.00' into 'rx_development_202012.00'

[Fix] Disable Smart Configurator's auto-generate code See merge request products/common/rtos/amazon-freertos/amazon-freertos!34
renesas · Oct 26, 2022 · 8e52e9e · 8e52e9e
2 parents 99a958e + f3f770d
commit 8e52e9e
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 25 deletions.
diff --git a/projects/renesas/rx65n-cloud-kit-uart-sx-ulpgn/e2studio-gcc/aws_demos/.project b/projects/renesas/rx65n-cloud-kit-uart-sx-ulpgn/e2studio-gcc/aws_demos/.project
@@ -1,24 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>aws_demos</name>
-	<comment/>
-	<projects/>
+	<comment></comment>
+	<projects></projects>
 	<buildSpec>
+		<buildCommand>
+			<name>com.renesas.smc.ui.pgsupport.SCContentBuilder</name>
+			<triggers></triggers>
+			<arguments></arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
 			<triggers>clean,full,incremental,</triggers>
-			<arguments/>
+			<arguments></arguments>
 		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
 			<triggers>full,incremental,</triggers>
-			<arguments/>
+			<arguments></arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments></arguments>
 		</buildCommand>
-        <buildCommand>
-            <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-            <arguments>
-            </arguments>
-        </buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.cdt.core.cnature</nature>

diff --git a/projects/renesas/rx65n-cloud-kit-uart-sx-ulpgn/e2studio-gcc/aws_demos/aws_demos.scfg b/projects/renesas/rx65n-cloud-kit-uart-sx-ulpgn/e2studio-gcc/aws_demos/aws_demos.scfg
@@ -691,8 +691,8 @@
                 <gridItem id="configWINDOWS_MAC_INTERRUPT_SIMULATOR_DELAY" selectedIndex="20 / portTICK_PERIOD_MS"/>
                 <gridItem id="ipconfigPACKET_FILLER_SIZE" selectedIndex="2"/>
                 <gridItem id="ipconfigTCP_WIN_SEG_COUNT" selectedIndex="240"/>
-                <gridItem id="ipconfigTCP_RX_BUFFER_LENGTH" selectedIndex="1460 * 3"/>
-                <gridItem id="ipconfigTCP_TX_BUFFER_LENGTH" selectedIndex="1460 * 3"/>
+                <gridItem id="ipconfigTCP_RX_BUFFER_LENGTH" selectedIndex="1460 * 8"/>
+                <gridItem id="ipconfigTCP_TX_BUFFER_LENGTH" selectedIndex="1460 * 8"/>
                 <gridItem id="ipconfigTCP_KEEP_ALIVE" selectedIndex="0"/>
                 <gridItem id="ipconfigTCP_KEEP_ALIVE_INTERVAL" selectedIndex="20"/>
                 <gridItem id="ipconfigSOCKET_HAS_USER_SEMAPHORE" selectedIndex="1"/>

diff --git a/projects/renesas/rx65n-cloud-kit-uart-sx-ulpgn/e2studio-gcc/boot_loader/.project b/projects/renesas/rx65n-cloud-kit-uart-sx-ulpgn/e2studio-gcc/boot_loader/.project
@@ -6,7 +6,8 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<name>com.renesas.smc.ui.pgsupport.SCContentBuilder</name>
+			<triggers></triggers>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -19,8 +20,11 @@
 		<buildCommand>
 			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
 			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
+			<arguments></arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments></arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>

diff --git a/projects/renesas/rx65n-rsk/e2studio-gcc/aws_tests/.cproject b/projects/renesas/rx65n-rsk/e2studio-gcc/aws_tests/.cproject
@@ -16,7 +16,7 @@
 			</storageModule>
 			<storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
 				<option id="toolchain.id" value="RENESAS_GCC_RX"/>
-				<option id="toolchain.version" value="8.3.0.202004"/>
+				<option id="toolchain.version" value="8.3.0.202104"/>
 				<option id="toolchain.enable" value="true"/>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

diff --git a/projects/renesas/rx65n-rsk/e2studio-gcc/boot_loader/.cproject b/projects/renesas/rx65n-rsk/e2studio-gcc/boot_loader/.cproject
@@ -15,7 +15,7 @@
 			</storageModule>
 			<storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
 				<option id="toolchain.id" value="RENESAS_GCC_RX"/>
-				<option id="toolchain.version" value="8.3.0.202004"/>
+				<option id="toolchain.version" value="8.3.0.202104"/>
 				<option id="toolchain.enable" value="true"/>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

diff --git a/projects/renesas/rx65n-rsk/e2studio-gcc/boot_loader/.project b/projects/renesas/rx65n-rsk/e2studio-gcc/boot_loader/.project
@@ -7,6 +7,7 @@
 	<buildSpec>
 		<buildCommand>
 			<name>com.renesas.smc.ui.pgsupport.SCContentBuilder</name>
+			<triggers></triggers>
 			<arguments>
 			</arguments>
 		</buildCommand>

diff --git a/projects/renesas/rx671-rsk/e2studio-gcc/boot_loader/.project b/projects/renesas/rx671-rsk/e2studio-gcc/boot_loader/.project
@@ -7,6 +7,7 @@
 	<buildSpec>
 		<buildCommand>
 			<name>com.renesas.smc.ui.pgsupport.SCContentBuilder</name>
+			<triggers></triggers>
 			<arguments>
 			</arguments>
 		</buildCommand>

diff --git a/projects/renesas/rx72n-envision-kit-wifi/e2studio-gcc/aws_tests/.project b/projects/renesas/rx72n-envision-kit-wifi/e2studio-gcc/aws_tests/.project
@@ -7,6 +7,7 @@
 	<buildSpec>
 		<buildCommand>
 			<name>com.renesas.smc.ui.pgsupport.SCContentBuilder</name>
+			<triggers></triggers>
 			<arguments>
 			</arguments>
 		</buildCommand>

diff --git a/projects/renesas/rx72n-envision-kit-wifi/e2studio-gcc/boot_loader/.project b/projects/renesas/rx72n-envision-kit-wifi/e2studio-gcc/boot_loader/.project
@@ -7,6 +7,7 @@
 	<buildSpec>
 		<buildCommand>
 			<name>com.renesas.smc.ui.pgsupport.SCContentBuilder</name>
+			<triggers></triggers>
 			<arguments>
 			</arguments>
 		</buildCommand>

diff --git a/projects/renesas/rx72n-envision-kit/e2studio-gcc/aws_demos/aws_demos.scfg b/projects/renesas/rx72n-envision-kit/e2studio-gcc/aws_demos/aws_demos.scfg
@@ -866,7 +866,7 @@
                 <gridItem id="ipconfigMAX_ARP_RETRANSMISSIONS" selectedIndex="5"/>
                 <gridItem id="ipconfigMAX_ARP_AGE" selectedIndex="150"/>
                 <gridItem id="ipconfigINCLUDE_FULL_INET_ADDR" selectedIndex="0"/>
-                <gridItem id="ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS" selectedIndex="8"/>
+                <gridItem id="ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS" selectedIndex="ETHER_CFG_EMAC_TX_DESCRIPTORS"/>
                 <gridItem id="ipconfigEVENT_QUEUE_LENGTH" selectedIndex="ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS + 5"/>
                 <gridItem id="ipconfigALLOW_SOCKET_SEND_WITHOUT_BIND" selectedIndex="0"/>
                 <gridItem id="ipconfigUDP_TIME_TO_LIVE" selectedIndex="128"/>
@@ -903,7 +903,7 @@
                 <gridItem id="mqttconfigKEEP_ALIVE_INTERVAL_SECONDS" selectedIndex="100"/>
                 <gridItem id="mqttconfigKEEP_ALIVE_ACTUAL_INTERVAL_TICKS" selectedIndex="pdMS_TO_TICKS( 300000 )"/>
                 <gridItem id="mqttconfigKEEP_ALIVE_TIMEOUT_TICKS" selectedIndex="1000"/>
-                <gridItem id="mqttconfigMQTT_TASK_STACK_DEPTH" selectedIndex="6114"/>
+                <gridItem id="mqttconfigMQTT_TASK_STACK_DEPTH" selectedIndex="6144"/>
                 <gridItem id="mqttconfigMQTT_TASK_PRIORITY" selectedIndex="configMAX_PRIORITIES - 3"/>
                 <gridItem id="mqttconfigMAX_BROKERS" selectedIndex="2"/>
                 <gridItem id="mqttconfigMAX_PARALLEL_OPS" selectedIndex="5"/>

diff --git a/projects/renesas/rx72n-envision-kit/e2studio-gcc/boot_loader/.project b/projects/renesas/rx72n-envision-kit/e2studio-gcc/boot_loader/.project
@@ -7,6 +7,7 @@
 	<buildSpec>
 		<buildCommand>
 			<name>com.renesas.smc.ui.pgsupport.SCContentBuilder</name>
+			<triggers></triggers>
 			<arguments>
 			</arguments>
 		</buildCommand>

diff --git a/...enesas/boards/rx65n-cloud-kit-uart-sx-ulpgn-gcc/aws_demos/config_files/FreeRTOSIPConfig.h b/...enesas/boards/rx65n-cloud-kit-uart-sx-ulpgn-gcc/aws_demos/config_files/FreeRTOSIPConfig.h
@@ -281,11 +281,11 @@ uint32_t ulRand(void);
 /* Each TCP socket has a circular buffers for Rx and Tx, which have a fixed
  * maximum size.  Define the size of Rx buffer for TCP sockets. */
 //#define ipconfigTCP_RX_BUFFER_LENGTH                   (4380)
-#define ipconfigTCP_RX_BUFFER_LENGTH                   (1480*10)	
+#define ipconfigTCP_RX_BUFFER_LENGTH                   (1460 * 8)	
 
 /* Define the size of Tx buffer for TCP sockets. */
 //#define ipconfigTCP_TX_BUFFER_LENGTH                   (4380)
-#define ipconfigTCP_TX_BUFFER_LENGTH                   (1480*10)	
+#define ipconfigTCP_TX_BUFFER_LENGTH                   (1460 * 8)	
 
 /* When using call-back handlers, the driver may check if the handler points to
  * real program memory (RAM or flash) or just has a random non-zero value. */

diff --git a/vendors/renesas/boards/rx72n-envision-kit-gcc/aws_tests/config_files/FreeRTOSConfig.h b/vendors/renesas/boards/rx72n-envision-kit-gcc/aws_tests/config_files/FreeRTOSConfig.h
@@ -277,7 +277,7 @@ uint32_t ulRand(void);
 #define configRAND32()    ulRand()
 
 /* The platform FreeRTOS is running on. */
-#define configPLATFORM_NAME    "RenesasRX65N"
+#define configPLATFORM_NAME    "RenesasRX72N"
 
 /* Header required for the tracealyzer recorder library. */
 //#include "trcRecorder.h"

diff --git a/vendors/renesas/boards/rx72n-envision-kit-gcc/aws_tests/config_files/aws_test_tcp_config.h b/vendors/renesas/boards/rx72n-envision-kit-gcc/aws_tests/config_files/aws_test_tcp_config.h
@@ -61,6 +61,6 @@
  */
 #define         integrationtestportableSEND_TIMEOUT                20000
 
-
+#define 		tcptestECHO_TEST_SYNC_TIMEOUT                      800000
 
 #endif /*AWS_INTEGRATION_TEST_TCP_CONFIG_H */
diff --git a/vendors/renesas/boards/rx72n-envision-kit-wifi-gcc/aws_demos/config_files/FreeRTOSIPConfig.h b/vendors/renesas/boards/rx72n-envision-kit-wifi-gcc/aws_demos/config_files/FreeRTOSIPConfig.h
@@ -279,10 +279,10 @@ uint32_t ulRand(void);
 
 /* Each TCP socket has a circular buffers for Rx and Tx, which have a fixed
  * maximum size.  Define the size of Rx buffer for TCP sockets. */
-#define ipconfigTCP_RX_BUFFER_LENGTH                   (3000)
+#define ipconfigTCP_RX_BUFFER_LENGTH                   (1460 * 3)
 
 /* Define the size of Tx buffer for TCP sockets. */
-#define ipconfigTCP_TX_BUFFER_LENGTH                   (3000)
+#define ipconfigTCP_TX_BUFFER_LENGTH                   (1460 * 3)
 /* When using call-back handlers, the driver may check if the handler points to
  * real program memory (RAM or flash) or just has a random non-zero value. */
 #define ipconfigIS_VALID_PROG_ADDRESS( x )    ( ( x ) != NULL )

diff --git a/...s/renesas/boards/rx72n-envision-kit-wifi-gcc/aws_tests/config_files/aws_test_tcp_config.h b/...s/renesas/boards/rx72n-envision-kit-wifi-gcc/aws_tests/config_files/aws_test_tcp_config.h
@@ -61,7 +61,7 @@
  */
 #define         integrationtestportableSEND_TIMEOUT                20000
 
-#define			tcptestECHO_TEST_SYNC_TIMEOUT					   800000
+#define         tcptestECHO_TEST_SYNC_TIMEOUT                      800000
 #define			integrationtestportableMAX_NUM_UNSECURE_SOCKETS	   4u
 
 #endif /*AWS_INTEGRATION_TEST_TCP_CONFIG_H */