diff --git a/Configuration/freertos.xml b/Configuration/freertos.xml
deleted file mode 100644
index 0c715784..00000000
--- a/Configuration/freertos.xml
+++ /dev/null
@@ -1,6718 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<refinfo>
-	<!-- multiple versions permitted -->
-	<toolchain>
-		<brand>Renesas</brand>
-		<product>RXC</product>
-		<version>3.05.00</version>
-	</toolchain>
-	<target>
-		<toolchain>RXC</toolchain>
-		<board>CK-RX65N(DUAL)</board>
-		<board>CK-RX65N</board>
-		<board>CK-RX65N-V2(DUAL)</board>
-		<board>CK-RX65N-V2</board>
-		<family>RX</family>
-		<series>RX600</series>
-		<group>RX65N</group>
-	</target>
-	<!-- only one package entry allowed -->
-	<package>
-		<type>rtosmodule</type>
-		<name>FreeRTOSLTS</name>
-		<version>202210.01-LTS-rx-1.2.1</version>
-		<!-- define RTOS libraries component -->
-		<component>
-			<name>FreeRTOS_IP</name>
-			<display>FreeRTOS TCP/IP component</display>
-			<detail>FreeRTOS TCP/IP component detail</detail>
-			<configgenpath>
-				<path>src/frtos_config/FreeRTOSIPConfig.h</path>
-			</configgenpath>
-			<category>rtos.library</category>
-		</component>
-		<component>
-			<name>FreeRTOS_Kernel</name>
-			<display>FreeRTOS Kernel component</display>
-			<detail>FreeRTOS Kernel component detail</detail>
-			<configgenpath>
-				<path>src/frtos_config/FreeRTOSConfig.h</path>
-			</configgenpath>
-			<category>rtos.kernel</category>
-		</component>
-		<component>
-			<name>LittleFS</name>
-			<display>LittleFS component</display>
-			<detail>LittleFS component detail</detail>
-			<configgenpath>
-				<path>src/frtos_config/rm_littlefs_flash_config.h</path>
-			</configgenpath>
-			<category>rtos.library</category>
-		</component>
-		<!-- define more RTOS components -->
-		<!-- define package location for linked resource -->
-		<linkedresource isPackageRoot="true">
-			<key>AWS_IOT_MCU_ROOT</key>
-		</linkedresource>
-		<!-- Object generate path -->
-		<objectgenpath>
-			<path>src</path>
-		</objectgenpath>
-		<!-- define applications supported -->
-		<apps>
-			<app id="application" value="bootloader" name="Secure bootloader sample project" description="This demonstration is used together with OTA sample project to provide a secure boot.">
-				<toolchain>RXC</toolchain>
-				<board>CK-RX65N(DUAL)</board>
-				<board>CK-RX65N</board>
-				<board>CK-RX65N-V2(DUAL)</board>
-				<board>CK-RX65N-V2</board>
-				<linkdir>
-					<folder linkedfolder="true">Middleware/3rdparty/tinycrypt</folder>
-					<path>src/tinycrypt</path>
-				</linkdir>
-				<!-- impdir section -->
-				<impdir>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<folder>Projects/boot_loader_ck_rx65n/e2studio_ccrx/src/key</folder>
-					<path>src/key</path>
-				</impdir>
-				<impdir>
-					<board>CK-RX65N-V2(DUAL)</board>
-					<board>CK-RX65N-V2</board>
-					<folder>Projects/boot_loader_ck_rx65n_v2/e2studio_ccrx/src/key</folder>
-					<path>src/key</path>
-				</impdir>
-				<impdir>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<folder>Projects/boot_loader_ck_rx65n/e2studio_ccrx/src/src</folder>
-					<path>src/src</path>
-				</impdir>
-				<impdir>
-					<board>CK-RX65N-V2(DUAL)</board>
-					<board>CK-RX65N-V2</board>
-					<folder>Projects/boot_loader_ck_rx65n_v2/e2studio_ccrx/src/src</folder>
-					<path>src/src</path>
-				</impdir>
-				<impdir>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<file>Projects/boot_loader_ck_rx65n/e2studio_ccrx/src/boot_loader.c</file>
-					<path>src</path>
-				</impdir>
-				<impdir>
-					<board>CK-RX65N-V2(DUAL)</board>
-					<board>CK-RX65N-V2</board>
-					<file>Projects/boot_loader_ck_rx65n_v2/e2studio_ccrx/src/boot_loader.c</file>
-					<path>src</path>
-				</impdir>
-				<impdir>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<file>Projects/boot_loader_ck_rx65n/e2studio_ccrx/src/boot_loader.h</file>
-					<path>src</path>
-				</impdir>
-				<impdir>
-					<board>CK-RX65N-V2(DUAL)</board>
-					<board>CK-RX65N-V2</board>
-					<file>Projects/boot_loader_ck_rx65n_v2/e2studio_ccrx/src/boot_loader.h</file>
-					<path>src</path>
-				</impdir>
-				<impdir>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<folder>Configuration/samples/bootloader/ck-rx65n/src/smc_gen</folder>
-					<path>src/smc_gen</path>
-				</impdir>
-				<impdir>
-					<board>CK-RX65N-V2(DUAL)</board>
-					<board>CK-RX65N-V2</board>
-					<folder>Configuration/samples/bootloader/ck-rx65n-v2/src/smc_gen</folder>
-					<path>src/smc_gen</path>
-				</impdir>
-				<impdir>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<file>Projects/boot_loader_ck_rx65n/e2studio_ccrx/src/smc_gen/r_fwup/src/r_fwup_wrap_verify.c</file>
-					<path>src/smc_gen/r_fwup/src/</path>
-				</impdir>
-				<impdir>
-					<board>CK-RX65N-V2(DUAL)</board>
-					<board>CK-RX65N-V2</board>
-					<file>Projects/boot_loader_ck_rx65n_v2/e2studio_ccrx/src/smc_gen/r_fwup/src/r_fwup_wrap_verify.c</file>
-					<path>src/smc_gen/r_fwup/src/</path>
-				</impdir>
-				<impdir>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<file>Projects/boot_loader_ck_rx65n/e2studio_ccrx/src/smc_gen/r_fwup/src/r_fwup_wrap_verify.h</file>
-					<path>src/smc_gen/r_fwup/src/</path>
-				</impdir>
-				<impdir>
-					<board>CK-RX65N-V2(DUAL)</board>
-					<board>CK-RX65N-V2</board>
-					<file>Projects/boot_loader_ck_rx65n_v2/e2studio_ccrx/src/smc_gen/r_fwup/src/r_fwup_wrap_verify.h</file>
-					<path>src/smc_gen/r_fwup/src/</path>
-				</impdir>
-				<impdir>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<file>Configuration/samples/bootloader/ck-rx65n/linker_section_sample.esi</file>
-					<path>src</path>
-				</impdir>
-				<impdir>
-					<board>CK-RX65N-V2(DUAL)</board>
-					<board>CK-RX65N-V2</board>
-					<file>Configuration/samples/bootloader/ck-rx65n-v2/linker_section_sample.esi</file>
-					<path>src</path>
-				</impdir>
-				<impdir>
-					<file>Configuration/samples/bootloader/ck-rx65n/README.md</file>
-					<path>.</path>
-				</impdir>
-				<!-- resource filter for tinycript libraries -->
-				<resourcefilter>
-					<name>src/src/tinycrypt</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>test</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>src/tinycrypt/lib/source</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>ecc_dsa.c|ecc.c|sha256.c|utils.c</file>
-					</arguments>
-				</resourcefilter>
-				<!-- indir section -->
-				<incdir>
-					<path>src</path>
-					<path>src/src</path>
-					<path>src/key</path>
-					<path>src/tinycrypt/lib/include</path>
-					<path>src/smc_gen</path>
-					<path>src/smc_gen/r_bsp</path>
-					<path>src/smc_gen/general</path>
-					<path>src/smc_gen/r_config</path>
-					<path>src/smc_gen/r_pincfg</path>
-					<path>src/smc_gen/r_sci_rx</path>
-					<path>src/smc_gen/r_sci_rx/src</path>
-					<path>src/smc_gen/r_byteq</path>
-					<path>src/smc_gen/r_byteq/src</path>
-					<path>src/smc_gen/r_fwup</path>
-					<path>src/smc_gen/r_fwup/src</path>
-					<path>src/smc_gen/r_flash_rx</path>
-					<path>src/smc_gen/r_flash_rx/src</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_1</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_3</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_4</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_5</path>
-					<path>src/smc_gen/r_flash_rx/src/targets</path>
-				</incdir>
-				<!-- template section -->
-				<scfgtemplate>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<path>Configuration/samples/bootloader/ck-rx65n/CK-RX65N_boot_loader_scfg.ftl</path>
-				</scfgtemplate>
-				<scfgtemplate>
-					<board>CK-RX65N-V2(DUAL)</board>
-					<board>CK-RX65N-V2</board>
-					<path>Configuration/samples/bootloader/ck-rx65n-v2/CK-RX65N_boot_loader_scfg.ftl</path>
-				</scfgtemplate>
-				<!-- linker section -->
-				<sections>
-					<toolchain>RXC</toolchain>
-					<section>
-						<name>SU</name>
-						<name>SI</name>
-						<name>B_1</name>
-						<name>R_1</name>
-						<name>B_2</name>
-						<name>R_2</name>
-						<name>B</name>
-						<name>R</name>
-						<name>RPFRAM2</name>
-						<address>0x00000004</address>
-					</section>
-					<section>
-						<name>C_1</name>
-						<name>C_2</name>
-						<name>C</name>
-						<name>C$*</name>
-						<name>D*</name>
-						<name>W*</name>
-						<name>L</name>
-						<name>P</name>
-						<name>PResetPRG</name>
-						<name>PFRAM2</name>
-						<address>0xFFFF0000</address>
-					</section>
-					<section>
-						<name>EXCEPTVECT</name>
-						<address>0xFFFFFF80</address>
-					</section>
-					<section>
-						<name>RESETVECT</name>
-						<address>0xFFFFFFFC</address>
-					</section>
-					<mappedramrom>PFRAM2=RPFRAM2</mappedramrom>
-				</sections>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.converter</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.separated.form.motorolaFile</optionid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.outputHexFile</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.common</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch.none</value>
-				</option>
-			</app>
-			<app id="application" value="pubsub_ether" name="(Ethernet) PubSub/MQTT sample project" description="This demonstration illustrates PubSub functionality using AWS services with Ethernet connection.">
-				<toolchain>RXC</toolchain>
-				<board>CK-RX65N(DUAL)</board>
-				<board>CK-RX65N</board>
-				<!-- impdir section -->
-				<impdir>
-					<folder>configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config</folder>
-					<path>src/frtos_config</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_ether_ck_rx65n/e2studio_ccrx/src/application_code/main.c</file>
-					<file>Projects/aws_ether_ck_rx65n/e2studio_ccrx/src/application_code/user_init.c</file>
-					<path>src/application_code</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_ether_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.h</file>
-					<file>Projects/aws_ether_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.c</file>
-					<path>src/frtos_startup</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/pubsub/ck-rx65n/ether/linker_section_sample.esi</file>
-					<path>src</path>
-				</impdir>
-				<impdir>
-					<folder>configuration/samples/common/ck-rx65n/ether/src/smc_gen</folder>
-					<path>src/smc_gen</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/common/ck-rx65n/ether/README.md</file>
-					<path>.</path>
-				</impdir>
-				<!-- linkdir section -->
-				<linkdir>
-					<folder linkedfolder="true">Common</folder>
-					<path>Common</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Common/ports</folder>
-					<path>src/application_code/ports</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos</folder>
-					<path>Demos</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Middleware</folder>
-					<path>Middleware</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos/include</folder>
-					<path>src/application_code/include</path>
-				</linkdir>
-				<!-- incdir section -->
-				<incdir>
-					<path>src/smc_gen/r_bsp</path>
-					<path>src/smc_gen/general</path>
-					<path>src/smc_gen/r_config</path>
-					<path>src/smc_gen/r_pincfg</path>
-					<path>src/smc_gen/r_ether_rx</path>
-					<path>src/smc_gen/r_s12ad_rx</path>
-					<path>src/smc_gen/r_s12ad_rx/src</path>
-					<path>src/smc_gen/r_sci_rx</path>
-					<path>src/smc_gen/r_sci_rx/src</path>
-					<path>src/smc_gen/r_byteq</path>
-					<path>src/smc_gen/r_byteq/src</path>
-					<path>src/smc_gen/r_flash_rx</path>
-					<path>src/smc_gen/r_flash_rx/src</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_1</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_3</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_4</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_5</path>
-					<path>src/smc_gen/r_flash_rx/src/targets</path>
-					<path>Common/FreeRTOS_common</path>
-					<path>Common/littlefs_common</path>
-					<path>Common/littlefs_common/rm_littlefs_df/targets/rx65n</path>
-					<path>Common/common_api</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx/implicitlyinclude.h</path>
-					<path>Demos/cli</path>
-					<path>Demos/mqtt_agent</path>
-					<path>Demos/common/pkcs11_helpers</path>
-					<path>Demos/dev_mode_key_provisioning/include</path>
-					<path>Demos/common/mqtt-agent-interface/include</path>
-					<path>Demos/common/mqtt-agent-interface</path>
-					<path>Demos/common/Mqtt_Demo_Helpers</path>
-					<path>Demos/Fleet_Provisioning_With_CSR_Demo</path>
-					<path>Middleware/freertos_plus/standard/crypto/include</path>
-					<path>Middleware/logging/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/include</path>
-					<path>Middleware/FreeRTOS-Plus-CLI</path>
-					<path>Middleware/FreeRTOS/coreMQTT/source/include</path>
-					<path>Middleware/FreeRTOS/coreMQTT/source/interface</path>
-					<path>Middleware/3rdparty/tinycbor/src</path>
-					<path>Middleware/FreeRTOS/coreJSON/source/include</path>
-					<path>Middleware/FreeRTOS/coreMQTT-Agent/source/include</path>
-					<path>Middleware/FreeRTOS/backoffAlgorithm/source/include</path>
-					<path>Middleware/network_transport/using_mbedtls_pkcs11</path>
-					<path>Middleware/pkcs11/published/2-40-errata-1</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/include</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/dependency/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/littlefs</path>
-					<path>Middleware/3rdparty/base64_decode</path>
-					<path>Middleware/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/mbedtls/include/mbedtls</path>
-					<path>Middleware/3rdparty/mbedtls/include</path>
-					<path>Middleware/3rdparty/mbedtls/library</path>
-					<path>Middleware/3rdparty/mbedtls_config</path>
-					<path>Middleware/network_transport/sockets_wrapper/include</path>
-					<path>Middleware/AWS/Fleet-Provisioning-for-AWS-IoT-embedded-sdk/source/include</path>
-					<path>src/application_code</path>
-					<path>src/application_code/include</path>
-					<path>src/frtos_config</path>
-					<path>src/frtos_startup</path>
-				</incdir>
-				<incdir>
-					<series>RX600</series>
-					<group>RX65N</group>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas/RX600v2</path>
-				</incdir>
-				<incdir>
-					<toolchain>RXC</toolchain>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler/Renesas</path>
-				</incdir>
-				<!-- resource filter for linked files/folders -->
-				<resourcefilter>
-					<name>Common</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ports</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Demos</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Demos</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>OtaOverMqtt</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/littlefs</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>*</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include|library</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls_utils</name>
-					<type>6</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>mbedtls_bio_freertos_plus_cellular.c|mbedtls_bio_freertos_plus_wifi_da16600.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>tinycrypt</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/network_transport/sockets_wrapper/ports</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>freertos_plus_tcp</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Fleet-Provisioning-for-AWS-IoT-embedded-sdk</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/Fleet-Provisioning-for-AWS-IoT-embedded-sdk</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>backoffAlgorithm|coreJSON|coreMQTT|coreMQTT-Agent|corePKCS11|FreeRTOS-Kernel|FreeRTOS-Plus-TCP|FreeRTOS-Plus-CLI</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/backoffAlgorithm</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<casesensitive>false</casesensitive>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreJSON</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11/source/dependency/3rdparty</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>mbedtls_utils</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent/source</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>dependency</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11/source/portable</name>
-					<type>13</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>mbedtls</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas|MemMang</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/MemMang</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>heap_4.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<series>RX600</series>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX600v2</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/BufferManagement</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>BufferAllocation_2.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<toolchain>RXC</toolchain>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/NetworkInterface</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>wifi</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>src/application_code/ports</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>pkcs11</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>src/application_code/ports</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ota_pal</folder>
-					</arguments>
-				</resourcefilter>
-				<!-- template section -->
-				<scfgtemplate>
-					<path>configuration/samples/common/ck-rx65n/ether/CK-RX65N_ether_scfg.ftl</path>
-				</scfgtemplate>
-				<!-- linker section -->
-				<sections>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<section>
-						<name>SU</name>
-						<name>SI</name>
-						<name>R_1</name>
-						<name>B_2</name>
-						<name>R</name>
-						<name>RPFRAM2</name>
-						<address>0x00000004</address>
-					</section>
-					<section>
-						<name>C_LITTLEFS_MANAGEMENT_AREA</name>
-						<address>0x00100000</address>
-					</section>
-					<section>
-						<name>C_USER_APPLICATION_AREA</name>
-						<address>0x00102300</address>
-					</section>
-					<section>
-						<name>B_ETHERNET_BUFFERS*</name>
-						<name>B_RX_DESC*</name>
-						<name>B_TX_DESC*</name>
-						<name>B</name>
-						<name>B_1</name>
-						<name>R_2</name>
-						<address>0x00800000</address>
-					</section>
-					<section>
-						<name>PResetPRG</name>
-						<name>C_1</name>
-						<name>C_2</name>
-						<name>C</name>
-						<name>C$*</name>
-						<name>D*</name>
-						<name>W*</name>
-						<name>L</name>
-						<name>P</name>
-						<name>PFRAM2</name>
-						<address>0xFFF00300</address>
-					</section>
-				</sections>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.gOptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.assembler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.assembler.option.goptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize.all</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.converter</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.separated.form.motorolaFile</optionid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.outputHexFile</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.common</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch.none</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.nomessage</optionid>
-					<value>11174,21644,20010,23034,23035,20177,23033</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.useCustomLinkageOrder</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWchar</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWcType</optionid>
-					<value>true</value>
-				</option>
-				<!-- RXC standard library -->
-				<standardlibrary>
-					<toolchain>RXC</toolchain>
-					<libname>ctype.h</libname>
-					<libname>math.h</libname>
-					<libname>mathf.h</libname>
-					<libname>stdio.h</libname>
-					<libname>stdlib.h</libname>
-					<libname>string.h</libname>
-					<libname>new.h</libname>
-					<libname>fenv.h</libname>
-					<libname>inttypes.h</libname>
-					<libname>ctype.h</libname>
-					<libname>wchar.h</libname>
-					<libname>wctype.h</libname>
-				</standardlibrary>
-				<!-- Macro definition -->
-				<macrodefinition>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<compiler>MBEDTLS_CONFIG_FILE=&lt;&quot;aws_mbedtls_config.h&quot;&gt;</compiler>
-					<compiler>CONFIG_MEDTLS_USE_AFR_MEMORY</compiler>
-					<compiler>MBEDTLS_CMAC_C</compiler>
-					<compiler>MBEDTLS_ERROR_C</compiler>
-					<compiler>MBEDTLS_THREADING_C</compiler>
-					<compiler>MBEDTLS_ALLOW_PRIVATE_ACCESS</compiler>
-					<compiler>__LITTLE_ENDIAN__</compiler>
-				</macrodefinition>
-			</app>
-			<app id="application" value="pubsub_cell" name="(Cellular) PubSub/MQTT sample project" description="This demonstration illustrates PubSub functionality using AWS services with Cellular(RYZ014A) connection.">
-				<toolchain>RXC</toolchain>
-				<board>CK-RX65N(DUAL)</board>
-				<board>CK-RX65N</board>
-				<!-- impdir section -->
-				<impdir>
-					<folder>configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config</folder>
-					<path>src/frtos_config</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_ryz014a_ck_rx65n/e2studio_ccrx/src/application_code/main.c</file>
-					<file>Projects/aws_ryz014a_ck_rx65n/e2studio_ccrx/src/application_code/user_init.c</file>
-					<path>src/application_code</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_ryz014a_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.h</file>
-					<file>Projects/aws_ryz014a_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.c</file>
-					<path>src/frtos_startup</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/pubsub/ck-rx65n/cellular/linker_section_sample.esi</file>
-					<path>src</path>
-				</impdir>
-				<impdir>
-					<folder>configuration/samples/common/ck-rx65n/cellular/src/smc_gen</folder>
-					<path>src/smc_gen</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/common/ck-rx65n/cellular/README.md</file>
-					<path>.</path>
-				</impdir>
-				<!-- linkdir section -->
-				<linkdir>
-					<folder linkedfolder="true">Common</folder>
-					<path>Common</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Common/ports</folder>
-					<path>src/application_code/ports</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos</folder>
-					<path>Demos</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Middleware</folder>
-					<path>Middleware</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos/include</folder>
-					<path>src/application_code/include</path>
-				</linkdir>
-				<!-- incdir section -->
-				<incdir>
-					<path>src/smc_gen/r_bsp</path>
-					<path>src/smc_gen/general</path>
-					<path>src/smc_gen/r_config</path>
-					<path>src/smc_gen/r_pincfg</path>
-					<path>src/smc_gen/r_ether_rx</path>
-					<path>src/smc_gen/r_s12ad_rx</path>
-					<path>src/smc_gen/r_s12ad_rx/src</path>
-					<path>src/smc_gen/r_sci_rx</path>
-					<path>src/smc_gen/r_sci_rx/src</path>
-					<path>src/smc_gen/r_byteq</path>
-					<path>src/smc_gen/r_byteq/src</path>
-					<path>src/smc_gen/r_flash_rx</path>
-					<path>src/smc_gen/r_flash_rx/src</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_1</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_3</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_4</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_5</path>
-					<path>src/smc_gen/r_flash_rx/src/targets</path>
-					<path>Common/FreeRTOS_common</path>
-					<path>Common/littlefs_common</path>
-					<path>Common/littlefs_common/rm_littlefs_df/targets/rx65n</path>
-					<path>Common/common_api</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx/implicitlyinclude.h</path>
-					<path>Demos/cli</path>
-					<path>Demos/mqtt_agent</path>
-					<path>Demos/common/pkcs11_helpers</path>
-					<path>Demos/dev_mode_key_provisioning/include</path>
-					<path>Demos/common/mqtt-agent-interface/include</path>
-					<path>Demos/common/mqtt-agent-interface</path>
-					<path>Demos/common/Mqtt_Demo_Helpers</path>
-					<path>Demos/Fleet_Provisioning_With_CSR_Demo</path>
-					<path>Middleware/freertos_plus/standard/crypto/include</path>
-					<path>Middleware/logging/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/include</path>
-					<path>Middleware/FreeRTOS-Plus-CLI</path>
-					<path>Middleware/FreeRTOS/coreMQTT/source/include</path>	
-					<path>Middleware/FreeRTOS/coreMQTT/source/interface</path>
-					<path>Middleware/3rdparty/tinycbor/src</path>
-					<path>Middleware/3rdparty/tinycrypt/lib/include</path>
-					<path>Middleware/FreeRTOS/coreJSON/source/include</path>
-					<path>Middleware/FreeRTOS/coreMQTT-Agent/source/include</path>
-					<path>Middleware/FreeRTOS/backoffAlgorithm/source/include</path>
-					<path>Middleware/network_transport/using_mbedtls_pkcs11</path>
-					<path>Middleware/pkcs11/published/2-40-errata-1</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/include</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/dependency/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/littlefs</path>
-					<path>Middleware/3rdparty/base64_decode</path>
-					<path>Middleware/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/mbedtls/include/mbedtls</path>
-					<path>Middleware/3rdparty/mbedtls/include</path>
-					<path>Middleware/3rdparty/mbedtls/library</path>
-					<path>Middleware/3rdparty/mbedtls_config</path>
-					<path>Middleware/network_transport/sockets_wrapper/include</path>
-					<path>Middleware/AWS/Fleet-Provisioning-for-AWS-IoT-embedded-sdk/source/include</path>
-					<path>src/application_code</path>
-					<path>src/application_code/include</path>
-					<path>src/frtos_config</path>
-					<path>src/frtos_startup</path>
-				</incdir>
-				<incdir>
-					<series>RX600</series>
-					<group>RX65N</group>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas/RX600v2</path>
-				</incdir>
-				<incdir>
-					<toolchain>RXC</toolchain>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler/Renesas</path>
-				</incdir>
-				<!-- resource filter for linked files/folders -->
-				<resourcefilter>
-					<name>Common</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ports</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Common/FreeRTOS_common</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>network_support</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Demos</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include|OtaOverMqtt</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/littlefs</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>*</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include|library</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls_utils</name>
-					<type>6</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>mbedtls_bio_tcp_sockets_wrapper.c|mbedtls_bio_freertos_plus_wifi_da16600.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>tinycrypt</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/network_transport/sockets_wrapper/ports</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>cellular_ryz014a</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Fleet-Provisioning-for-AWS-IoT-embedded-sdk</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/Fleet-Provisioning-for-AWS-IoT-embedded-sdk</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/pkcs11</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>published</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>backoffAlgorithm|coreJSON|coreMQTT|coreMQTT-Agent|corePKCS11|FreeRTOS-Kernel|FreeRTOS-Plus-CLI</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/backoffAlgorithm</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<casesensitive>false</casesensitive>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreJSON</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11/source/dependency/3rdparty</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>mbedtls_utils</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent/source</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>dependency</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11/source/portable</name>
-					<type>13</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>mbedtls</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas|MemMang</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/MemMang</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>heap_4.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<series>RX600</series>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX600v2</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/BufferManagement</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>BufferAllocation_2.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<toolchain>RXC</toolchain>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/NetworkInterface</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>wifi</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>src/application_code/ports</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>pkcs11</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>src/application_code/ports</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ota_pal</folder>
-					</arguments>
-				</resourcefilter>
-				<!-- template section -->
-				<scfgtemplate>
-					<path>configuration/samples/common/ck-rx65n/cellular/CK-RX65N_cellular_scfg.ftl</path>
-				</scfgtemplate>
-				<!-- linker section -->
-				<sections>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<section>
-						<name>SU</name>
-						<name>SI</name>
-						<name>R_1</name>
-						<name>B_2</name>
-						<name>R</name>
-						<name>RPFRAM2</name>
-						<address>0x00000004</address>
-					</section>
-					<section>
-						<name>C_LITTLEFS_MANAGEMENT_AREA</name>
-						<address>0x00100000</address>
-					</section>
-					<section>
-						<name>C_USER_APPLICATION_AREA</name>
-						<address>0x00102300</address>
-					</section>
-					<section>
-						<name>B</name>
-						<name>B_1</name>
-						<name>R_2</name>
-						<address>0x00800000</address>
-					</section>
-					<section>
-						<name>PResetPRG</name>
-						<name>C_1</name>
-						<name>C_2</name>
-						<name>C</name>
-						<name>C$*</name>
-						<name>D*</name>
-						<name>W*</name>
-						<name>L</name>
-						<name>P</name>
-						<name>PFRAM2</name>
-						<address>0xFFF00300</address>
-					</section>
-				</sections>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.gOptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.assembler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.assembler.option.goptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize.all</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.converter</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.separated.form.motorolaFile</optionid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.outputHexFile</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.common</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch.none</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.nomessage</optionid>
-					<value>11174,21644,20010,23034,23035,20177,23033</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.useCustomLinkageOrder</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWchar</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWcType</optionid>
-					<value>true</value>
-				</option>
-				<!-- RXC standard library -->
-				<standardlibrary>
-					<toolchain>RXC</toolchain>
-					<libname>ctype.h</libname>
-					<libname>math.h</libname>
-					<libname>mathf.h</libname>
-					<libname>stdio.h</libname>
-					<libname>stdlib.h</libname>
-					<libname>string.h</libname>
-					<libname>new.h</libname>
-					<libname>fenv.h</libname>
-					<libname>inttypes.h</libname>
-					<libname>ctype.h</libname>
-					<libname>wchar.h</libname>
-					<libname>wctype.h</libname>
-				</standardlibrary>
-				<!-- Macro definition -->
-				<macrodefinition>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<compiler>MBEDTLS_CONFIG_FILE=&lt;&quot;aws_mbedtls_config.h&quot;&gt;</compiler>
-					<compiler>CONFIG_MEDTLS_USE_AFR_MEMORY</compiler>
-					<compiler>MBEDTLS_CMAC_C</compiler>
-					<compiler>MBEDTLS_ERROR_C</compiler>
-					<compiler>MBEDTLS_THREADING_C</compiler>
-					<compiler>MBEDTLS_ALLOW_PRIVATE_ACCESS</compiler>
-					<compiler>__LITTLE_ENDIAN__</compiler>
-				</macrodefinition>
-			</app>
-			<app id="application" value="pubsub_wifi" name="(Wi-Fi) PubSub/MQTT sample project" description="This demonstration illustrates PubSub functionality using AWS services with Wi-Fi(DA16600) connection.">
-				<toolchain>RXC</toolchain>
-				<board>CK-RX65N-V2(DUAL)</board>
-				<board>CK-RX65N-V2</board>
-				<!-- impdir section -->
-				<impdir>
-					<folder>configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config</folder>
-					<path>src/frtos_config</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/application_code/main.c</file>
-					<file>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/application_code/user_init.c</file>
-					<path>src/application_code</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.h</file>
-					<file>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.c</file>
-					<path>src/frtos_startup</path>
-				</impdir>
-				<impdir>
-					<folder>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/smc_gen/r_wifi_da16xxx</folder>
-					<path>src/smc_gen/r_wifi_da16xxx</path>
-				</impdir>
-				<impdir>
-					<folder>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/smc_gen/r_fwup</folder>
-					<path>src/smc_gen/r_fwup</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/pubsub/ck-rx65n/wifi/linker_section_sample.esi</file>
-					<path>src</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/common/ck-rx65n/wifi/README.md</file>
-					<path>.</path>
-				</impdir>
-				<!-- linkdir section -->
-				<linkdir>
-					<folder linkedfolder="true">Common</folder>
-					<path>Common</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Common/ports</folder>
-					<path>src/application_code/ports</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos</folder>
-					<path>Demos</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Middleware</folder>
-					<path>Middleware</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos/include</folder>
-					<path>src/application_code/include</path>
-				</linkdir>
-				<!-- incdir section -->
-				<incdir>
-					<path>src/smc_gen/r_bsp</path>
-					<path>src/smc_gen/general</path>
-					<path>src/smc_gen/r_config</path>
-					<path>src/smc_gen/r_pincfg</path>
-					<path>src/smc_gen/r_ether_rx</path>
-					<path>src/smc_gen/r_s12ad_rx</path>
-					<path>src/smc_gen/r_s12ad_rx/src</path>
-					<path>src/smc_gen/r_sci_rx</path>
-					<path>src/smc_gen/r_sci_rx/src</path>
-					<path>src/smc_gen/r_byteq</path>
-					<path>src/smc_gen/r_byteq/src</path>
-					<path>src/smc_gen/r_flash_rx</path>
-					<path>src/smc_gen/r_flash_rx/src</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_1</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_3</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_4</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_5</path>
-					<path>src/smc_gen/r_flash_rx/src/targets</path>
-					<path>src/smc_gen/r_wifi_da16xxx/src</path>
-					<path>src/smc_gen/r_wifi_da16xxx</path>
-					<path>Common/FreeRTOS_common</path>
-					<path>Common/littlefs_common</path>
-					<path>Common/littlefs_common/rm_littlefs_df/targets/rx65n</path>
-					<path>Common/common_api</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx/implicitlyinclude.h</path>
-					<path>Demos/cli</path>
-					<path>Demos/mqtt_agent</path>
-					<path>Demos/common/pkcs11_helpers</path>
-					<path>Demos/dev_mode_key_provisioning/include</path>
-					<path>Demos/common/mqtt-agent-interface/include</path>
-					<path>Demos/common/mqtt-agent-interface</path>
-					<path>Demos/common/Mqtt_Demo_Helpers</path>
-					<path>Demos/Fleet_Provisioning_With_CSR_Demo</path>
-					<path>Middleware/freertos_plus/standard/crypto/include</path>
-					<path>Middleware/logging/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/include</path>
-					<path>Middleware/FreeRTOS-Plus-CLI</path>
-					<path>Middleware/FreeRTOS/coreMQTT/source/include</path>	
-					<path>Middleware/FreeRTOS/coreMQTT/source/interface</path>
-					<path>Middleware/3rdparty/tinycbor/src</path>
-					<path>Middleware/3rdparty/tinycrypt/lib/include</path>
-					<path>Middleware/FreeRTOS/coreJSON/source/include</path>
-					<path>Middleware/FreeRTOS/coreMQTT-Agent/source/include</path>
-					<path>Middleware/FreeRTOS/backoffAlgorithm/source/include</path>
-					<path>Middleware/network_transport/using_mbedtls_pkcs11</path>
-					<path>Middleware/pkcs11/published/2-40-errata-1</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/include</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/dependency/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/littlefs</path>
-					<path>Middleware/3rdparty/base64_decode</path>
-					<path>Middleware/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/mbedtls/include/mbedtls</path>
-					<path>Middleware/3rdparty/mbedtls/include</path>
-					<path>Middleware/3rdparty/mbedtls/library</path>
-					<path>Middleware/3rdparty/mbedtls_config</path>
-					<path>Middleware/network_transport/sockets_wrapper/include</path>
-					<path>Middleware/AWS/Fleet-Provisioning-for-AWS-IoT-embedded-sdk/source/include</path>
-					<path>Middleware/wifi/include</path>
-					<path>src/application_code</path>
-					<path>src/application_code/include</path>
-					<path>src/frtos_config</path>
-					<path>src/frtos_startup</path>
-				</incdir>
-				<incdir>
-					<series>RX600</series>
-					<group>RX65N</group>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas/RX600v2</path>
-				</incdir>
-				<incdir>
-					<toolchain>RXC</toolchain>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler/Renesas</path>
-				</incdir>
-				<!-- resource filter for linked files/folders -->
-				<resourcefilter>
-					<name>Common</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ports</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Common/FreeRTOS_common</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>network_support</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Demos</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include|OtaOverMqtt</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/littlefs</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>*</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include|library</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls_utils</name>
-					<type>6</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>mbedtls_bio_freertos_plus_cellular.c|mbedtls_bio_tcp_sockets_wrapper.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>tinycrypt</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/network_transport/sockets_wrapper/ports</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>wifi_da16600</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Fleet-Provisioning-for-AWS-IoT-embedded-sdk</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/Fleet-Provisioning-for-AWS-IoT-embedded-sdk</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/pkcs11</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>published</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>backoffAlgorithm|coreJSON|coreMQTT|coreMQTT-Agent|corePKCS11|FreeRTOS-Kernel|FreeRTOS-Plus-CLI</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/backoffAlgorithm</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<casesensitive>false</casesensitive>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreJSON</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11/source/dependency/3rdparty</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>mbedtls_utils</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent/source</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>dependency</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11/source/portable</name>
-					<type>13</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>mbedtls</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas|MemMang</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/MemMang</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>heap_4.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<series>RX600</series>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX600v2</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/BufferManagement</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>BufferAllocation_2.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<toolchain>RXC</toolchain>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/NetworkInterface</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/wifi</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include|ports</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>src/application_code/ports</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>pkcs11</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>src/application_code/ports</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ota_pal</folder>
-					</arguments>
-				</resourcefilter>
-				<!-- template section -->
-				<scfgtemplate>
-					<path>configuration/samples/common/ck-rx65n/wifi/CK-RX65N_wifi_scfg.ftl</path>
-				</scfgtemplate>
-				<!-- linker section -->
-				<sections>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N-V2(DUAL)</board>
-					<board>CK-RX65N-V2</board>
-					<section>
-						<name>SU</name>
-						<name>SI</name>
-						<name>R_1</name>
-						<name>B_2</name>
-						<name>R</name>
-						<name>RPFRAM2</name>
-						<address>0x00000004</address>
-					</section>
-					<section>
-						<name>C_LITTLEFS_MANAGEMENT_AREA</name>
-						<address>0x00100000</address>
-					</section>
-					<section>
-						<name>C_USER_APPLICATION_AREA</name>
-						<address>0x00102300</address>
-					</section>
-					<section>
-						<name>B</name>
-						<name>B_1</name>
-						<name>R_2</name>
-						<address>0x00800000</address>
-					</section>
-					<section>
-						<name>PResetPRG</name>
-						<name>C_1</name>
-						<name>C_2</name>
-						<name>C</name>
-						<name>C$*</name>
-						<name>D*</name>
-						<name>W*</name>
-						<name>L</name>
-						<name>P</name>
-						<name>PFRAM2</name>
-						<address>0xFFF00300</address>
-					</section>
-				</sections>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.gOptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.assembler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.assembler.option.goptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize.all</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.converter</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.separated.form.motorolaFile</optionid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.outputHexFile</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.common</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch.none</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.nomessage</optionid>
-					<value>11174,21644,20010,23034,23035,20177,23033</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.useCustomLinkageOrder</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWchar</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWcType</optionid>
-					<value>true</value>
-				</option>
-				<!-- RXC standard library -->
-				<standardlibrary>
-					<toolchain>RXC</toolchain>
-					<libname>ctype.h</libname>
-					<libname>math.h</libname>
-					<libname>mathf.h</libname>
-					<libname>stdio.h</libname>
-					<libname>stdlib.h</libname>
-					<libname>string.h</libname>
-					<libname>new.h</libname>
-					<libname>fenv.h</libname>
-					<libname>inttypes.h</libname>
-					<libname>ctype.h</libname>
-					<libname>wchar.h</libname>
-					<libname>wctype.h</libname>
-				</standardlibrary>
-				<!-- Macro definition -->
-				<macrodefinition>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N-V2(DUAL)</board>
-					<board>CK-RX65N-V2</board>
-					<compiler>MBEDTLS_CONFIG_FILE=&lt;&quot;aws_mbedtls_config.h&quot;&gt;</compiler>
-					<compiler>CONFIG_MEDTLS_USE_AFR_MEMORY</compiler>
-					<compiler>MBEDTLS_CMAC_C</compiler>
-					<compiler>MBEDTLS_ERROR_C</compiler>
-					<compiler>MBEDTLS_THREADING_C</compiler>
-					<compiler>MBEDTLS_ALLOW_PRIVATE_ACCESS</compiler>
-					<compiler>__LITTLE_ENDIAN__</compiler>
-				</macrodefinition>
-			</app>
-			<app id="application" value="fleetps_ether" name="(Ethernet) PubSub/MQTT with Fleet Provisioning sample project" description="This demonstration illustrates Fleet Provisioning functionality, followed by PubSub using AWS services with Ethernet connection.">
-				<toolchain>RXC</toolchain>
-				<board>CK-RX65N(DUAL)</board>
-				<board>CK-RX65N</board>
-				<!-- impdir section -->
-				<impdir>
-					<folder>configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config</folder>
-					<path>src/frtos_config</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_ether_ck_rx65n/e2studio_ccrx/src/application_code/main.c</file>
-					<file>Projects/aws_ether_ck_rx65n/e2studio_ccrx/src/application_code/user_init.c</file>
-					<path>src/application_code</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_ether_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.h</file>
-					<file>Projects/aws_ether_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.c</file>
-					<path>src/frtos_startup</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/fleetps/ck-rx65n/ether/linker_section_sample.esi</file>
-					<path>src</path>
-				</impdir>
-				<impdir>
-					<folder>configuration/samples/common/ck-rx65n/ether/src/smc_gen</folder>
-					<path>src/smc_gen</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/common/ck-rx65n/ether/README.md</file>
-					<path>.</path>
-				</impdir>
-				<!-- linkdir section -->
-				<linkdir>
-					<folder linkedfolder="true">Common</folder>
-					<path>Common</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Common/ports</folder>
-					<path>src/application_code/ports</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos</folder>
-					<path>Demos</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Middleware</folder>
-					<path>Middleware</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos/include</folder>
-					<path>src/application_code/include</path>
-				</linkdir>
-				<!-- incdir section -->
-				<incdir>
-					<path>src/smc_gen/r_bsp</path>
-					<path>src/smc_gen/general</path>
-					<path>src/smc_gen/r_config</path>
-					<path>src/smc_gen/r_pincfg</path>
-					<path>src/smc_gen/r_ether_rx</path>
-					<path>src/smc_gen/r_s12ad_rx</path>
-					<path>src/smc_gen/r_s12ad_rx/src</path>
-					<path>src/smc_gen/r_sci_rx</path>
-					<path>src/smc_gen/r_sci_rx/src</path>
-					<path>src/smc_gen/r_byteq</path>
-					<path>src/smc_gen/r_byteq/src</path>
-					<path>src/smc_gen/r_flash_rx</path>
-					<path>src/smc_gen/r_flash_rx/src</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_1</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_3</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_4</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_5</path>
-					<path>src/smc_gen/r_flash_rx/src/targets</path>
-					<path>src/smc_gen/r_tsip_rx</path>
-					<path>Common/FreeRTOS_common</path>
-					<path>Common/littlefs_common</path>
-					<path>Common/littlefs_common/rm_littlefs_df/targets/rx65n</path>
-					<path>Common/common_api</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx/implicitlyinclude.h</path>
-					<path>Demos/cli</path>
-					<path>Demos/mqtt_agent</path>
-					<path>Demos/common/pkcs11_helpers</path>
-					<path>Demos/dev_mode_key_provisioning/include</path>
-					<path>Demos/common/mqtt-agent-interface/include</path>
-					<path>Demos/common/mqtt-agent-interface</path>
-					<path>Demos/common/Mqtt_Demo_Helpers</path>
-					<path>Demos/Fleet_Provisioning_With_CSR_Demo</path>
-					<path>Middleware/freertos_plus/standard/crypto/include</path>
-					<path>Middleware/logging/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/include</path>
-					<path>Middleware/FreeRTOS-Plus-CLI</path>
-					<path>Middleware/FreeRTOS/coreMQTT/source/include</path>
-					<path>Middleware/FreeRTOS/coreMQTT/source/interface</path>
-					<path>Middleware/3rdparty/tinycbor/src</path>
-					<path>Middleware/3rdparty/tinycrypt/lib/include</path>
-					<path>Middleware/FreeRTOS/coreJSON/source/include</path>
-					<path>Middleware/FreeRTOS/coreMQTT-Agent/source/include</path>
-					<path>Middleware/FreeRTOS/backoffAlgorithm/source/include</path>
-					<path>Middleware/network_transport/using_mbedtls_pkcs11</path>
-					<path>Middleware/pkcs11/published/2-40-errata-1</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/include</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/dependency/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/littlefs</path>
-					<path>Middleware/3rdparty/base64_decode</path>
-					<path>Middleware/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/mbedtls/include/mbedtls</path>
-					<path>Middleware/3rdparty/mbedtls/include</path>
-					<path>Middleware/3rdparty/mbedtls/library</path>
-					<path>Middleware/3rdparty/mbedtls_config</path>
-					<path>Middleware/network_transport/sockets_wrapper/include</path>
-					<path>Middleware/AWS/Fleet-Provisioning-for-AWS-IoT-embedded-sdk/source/include</path>
-					<path>src/application_code</path>
-					<path>src/application_code/include</path>
-					<path>src/frtos_config</path>
-					<path>src/frtos_startup</path>
-				</incdir>
-				<incdir>
-					<series>RX600</series>
-					<group>RX65N</group>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas/RX600v2</path>
-				</incdir>
-				<incdir>
-					<toolchain>RXC</toolchain>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler/Renesas</path>
-				</incdir>
-				<!-- resource filter for linked files/folders -->
-				<resourcefilter>
-					<name>Common</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ports</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Demos</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Demos</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>OtaOverMqtt</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/littlefs</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>*</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include|library</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls_utils</name>
-					<type>6</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>mbedtls_bio_freertos_plus_cellular.c|mbedtls_bio_freertos_plus_wifi_da16600.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>tinycrypt</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/network_transport/sockets_wrapper/ports</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>freertos_plus_tcp</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Fleet-Provisioning-for-AWS-IoT-embedded-sdk</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/Fleet-Provisioning-for-AWS-IoT-embedded-sdk</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>backoffAlgorithm|coreJSON|coreMQTT|coreMQTT-Agent|corePKCS11|FreeRTOS-Kernel|FreeRTOS-Plus-TCP|FreeRTOS-Plus-CLI</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/backoffAlgorithm</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<casesensitive>false</casesensitive>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreJSON</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11/source/dependency/3rdparty</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>mbedtls_utils</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent/source</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>dependency</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11/source/portable</name>
-					<type>13</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>mbedtls</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas|MemMang</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/MemMang</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>heap_4.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<series>RX600</series>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX600v2</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/BufferManagement</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>BufferAllocation_2.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<toolchain>RXC</toolchain>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/NetworkInterface</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>wifi</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>src/application_code/ports</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>pkcs11</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>src/application_code/ports</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ota_pal</folder>
-					</arguments>
-				</resourcefilter>
-				<!-- template section -->
-				<scfgtemplate>
-					<path>configuration/samples/common/ck-rx65n/ether/CK-RX65N_ether_scfg.ftl</path>
-				</scfgtemplate>
-				<!-- linker section -->
-				<sections>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<section>
-						<name>SU</name>
-						<name>SI</name>
-						<name>R_1</name>
-						<name>B_2</name>
-						<name>R</name>
-						<name>RPFRAM2</name>
-						<address>0x00000004</address>
-					</section>
-					<section>
-						<name>C_LITTLEFS_MANAGEMENT_AREA</name>
-						<address>0x00100000</address>
-					</section>
-					<section>
-						<name>C_USER_APPLICATION_AREA</name>
-						<address>0x00102300</address>
-					</section>
-					<section>
-						<name>B_ETHERNET_BUFFERS*</name>
-						<name>B_RX_DESC*</name>
-						<name>B_TX_DESC*</name>
-						<name>B</name>
-						<name>B_1</name>
-						<name>R_2</name>
-						<address>0x00800000</address>
-					</section>
-					<section>
-						<name>PResetPRG</name>
-						<name>C_1</name>
-						<name>C_2</name>
-						<name>C</name>
-						<name>C$*</name>
-						<name>D*</name>
-						<name>W*</name>
-						<name>L</name>
-						<name>P</name>
-						<name>PFRAM2</name>
-						<address>0xFFF00300</address>
-					</section>
-				</sections>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.gOptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.assembler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.assembler.option.goptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize.all</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.converter</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.separated.form.motorolaFile</optionid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.outputHexFile</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.common</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch.none</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.nomessage</optionid>
-					<value>11174,21644,20010,23034,23035,20177,23033</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.useCustomLinkageOrder</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWchar</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWcType</optionid>
-					<value>true</value>
-				</option>
-				<!-- RXC standard library -->
-				<standardlibrary>
-					<toolchain>RXC</toolchain>
-					<libname>ctype.h</libname>
-					<libname>math.h</libname>
-					<libname>mathf.h</libname>
-					<libname>stdio.h</libname>
-					<libname>stdlib.h</libname>
-					<libname>string.h</libname>
-					<libname>new.h</libname>
-					<libname>fenv.h</libname>
-					<libname>inttypes.h</libname>
-					<libname>ctype.h</libname>
-					<libname>wchar.h</libname>
-					<libname>wctype.h</libname>
-				</standardlibrary>
-				<!-- Macro definition -->
-				<macrodefinition>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<compiler>MBEDTLS_CONFIG_FILE=&lt;&quot;aws_mbedtls_config.h&quot;&gt;</compiler>
-					<compiler>CONFIG_MEDTLS_USE_AFR_MEMORY</compiler>
-					<compiler>MBEDTLS_CMAC_C</compiler>
-					<compiler>MBEDTLS_ERROR_C</compiler>
-					<compiler>MBEDTLS_THREADING_C</compiler>
-					<compiler>MBEDTLS_ALLOW_PRIVATE_ACCESS</compiler>
-					<compiler>__LITTLE_ENDIAN__</compiler>
-				</macrodefinition>
-			</app>
-			<app id="application" value="fleetps_cell" name="(Cellular) PubSub/MQTT with Fleet Provisioning sample project" description="This demonstration illustrates Fleet Provisioning functionality, followed by PubSub using AWS services with Cellular(RYZ014A) connection.">
-				<toolchain>RXC</toolchain>
-				<board>CK-RX65N(DUAL)</board>
-				<board>CK-RX65N</board>
-				<!-- impdir section -->
-				<impdir>
-					<folder>configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config</folder>
-					<path>src/frtos_config</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_ryz014a_ck_rx65n/e2studio_ccrx/src/application_code/main.c</file>
-					<file>Projects/aws_ryz014a_ck_rx65n/e2studio_ccrx/src/application_code/user_init.c</file>
-					<path>src/application_code</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_ryz014a_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.h</file>
-					<file>Projects/aws_ryz014a_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.c</file>
-					<path>src/frtos_startup</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/fleetps/ck-rx65n/cellular/linker_section_sample.esi</file>
-					<path>src</path>
-				</impdir>
-				<impdir>
-					<folder>configuration/samples/common/ck-rx65n/cellular/src/smc_gen</folder>
-					<path>src/smc_gen</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/common/ck-rx65n/cellular/README.md</file>
-					<path>.</path>
-				</impdir>
-				<!-- linkdir section -->
-				<linkdir>
-					<folder linkedfolder="true">Common</folder>
-					<path>Common</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Common/ports</folder>
-					<path>src/application_code/ports</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos</folder>
-					<path>Demos</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Middleware</folder>
-					<path>Middleware</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos/include</folder>
-					<path>src/application_code/include</path>
-				</linkdir>
-				<!-- incdir section -->
-				<incdir>
-					<path>src/smc_gen/r_bsp</path>
-					<path>src/smc_gen/general</path>
-					<path>src/smc_gen/r_config</path>
-					<path>src/smc_gen/r_pincfg</path>
-					<path>src/smc_gen/r_ether_rx</path>
-					<path>src/smc_gen/r_s12ad_rx</path>
-					<path>src/smc_gen/r_s12ad_rx/src</path>
-					<path>src/smc_gen/r_sci_rx</path>
-					<path>src/smc_gen/r_sci_rx/src</path>
-					<path>src/smc_gen/r_byteq</path>
-					<path>src/smc_gen/r_byteq/src</path>
-					<path>src/smc_gen/r_flash_rx</path>
-					<path>src/smc_gen/r_flash_rx/src</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_1</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_3</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_4</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_5</path>
-					<path>src/smc_gen/r_flash_rx/src/targets</path>
-					<path>Common/FreeRTOS_common</path>
-					<path>Common/littlefs_common</path>
-					<path>Common/littlefs_common/rm_littlefs_df/targets/rx65n</path>
-					<path>Common/common_api</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx/implicitlyinclude.h</path>
-					<path>Demos/cli</path>
-					<path>Demos/mqtt_agent</path>
-					<path>Demos/common/pkcs11_helpers</path>
-					<path>Demos/dev_mode_key_provisioning/include</path>
-					<path>Demos/common/mqtt-agent-interface/include</path>
-					<path>Demos/common/mqtt-agent-interface</path>
-					<path>Demos/common/Mqtt_Demo_Helpers</path>
-					<path>Demos/Fleet_Provisioning_With_CSR_Demo</path>
-					<path>Middleware/freertos_plus/standard/crypto/include</path>
-					<path>Middleware/logging/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/include</path>
-					<path>Middleware/FreeRTOS-Plus-CLI</path>
-					<path>Middleware/FreeRTOS/coreMQTT/source/include</path>
-					<path>Middleware/FreeRTOS/coreMQTT/source/interface</path>
-					<path>Middleware/3rdparty/tinycbor/src</path>
-					<path>Middleware/3rdparty/tinycrypt/lib/include</path>
-					<path>Middleware/FreeRTOS/coreJSON/source/include</path>
-					<path>Middleware/FreeRTOS/coreMQTT-Agent/source/include</path>
-					<path>Middleware/FreeRTOS/backoffAlgorithm/source/include</path>
-					<path>Middleware/network_transport/using_mbedtls_pkcs11</path>
-					<path>Middleware/pkcs11/published/2-40-errata-1</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/include</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/dependency/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/littlefs</path>
-					<path>Middleware/3rdparty/base64_decode</path>
-					<path>Middleware/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/mbedtls/include/mbedtls</path>
-					<path>Middleware/3rdparty/mbedtls/include</path>
-					<path>Middleware/3rdparty/mbedtls/library</path>
-					<path>Middleware/3rdparty/mbedtls_config</path>
-					<path>Middleware/network_transport/sockets_wrapper/include</path>
-					<path>Middleware/AWS/Fleet-Provisioning-for-AWS-IoT-embedded-sdk/source/include</path>
-					<path>src/application_code</path>
-					<path>src/application_code/include</path>
-					<path>src/frtos_config</path>
-					<path>src/frtos_startup</path>
-				</incdir>
-				<incdir>
-					<series>RX600</series>
-					<group>RX65N</group>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas/RX600v2</path>
-				</incdir>
-				<incdir>
-					<toolchain>RXC</toolchain>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler/Renesas</path>
-				</incdir>
-				<!-- resource filter for linked files/folders -->
-				<resourcefilter>
-					<name>Common</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ports</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Common/FreeRTOS_common</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>network_support</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Demos</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include|OtaOverMqtt</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/littlefs</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>*</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include|library</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls_utils</name>
-					<type>6</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>mbedtls_bio_tcp_sockets_wrapper.c|mbedtls_bio_freertos_plus_wifi_da16600.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>tinycrypt</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/network_transport/sockets_wrapper/ports</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>cellular_ryz014a</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Fleet-Provisioning-for-AWS-IoT-embedded-sdk</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/Fleet-Provisioning-for-AWS-IoT-embedded-sdk</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/pkcs11</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>published</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>backoffAlgorithm|coreJSON|coreMQTT|coreMQTT-Agent|corePKCS11|FreeRTOS-Kernel|FreeRTOS-Plus-CLI</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/backoffAlgorithm</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<casesensitive>false</casesensitive>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreJSON</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11/source/dependency/3rdparty</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>mbedtls_utils</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent/source</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>dependency</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11/source/portable</name>
-					<type>13</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>mbedtls</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas|MemMang</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/MemMang</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>heap_4.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<series>RX600</series>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX600v2</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/BufferManagement</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>BufferAllocation_2.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<toolchain>RXC</toolchain>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/NetworkInterface</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>wifi</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>src/application_code/ports</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>pkcs11</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>src/application_code/ports</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ota_pal</folder>
-					</arguments>
-				</resourcefilter>
-				<!-- template section -->
-				<scfgtemplate>
-					<path>configuration/samples/common/ck-rx65n/cellular/CK-RX65N_cellular_scfg.ftl</path>
-				</scfgtemplate>
-				<!-- linker section -->
-				<sections>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<section>
-						<name>SU</name>
-						<name>SI</name>
-						<name>R_1</name>
-						<name>B_2</name>
-						<name>R</name>
-						<name>RPFRAM2</name>
-						<address>0x00000004</address>
-					</section>
-					<section>
-						<name>C_LITTLEFS_MANAGEMENT_AREA</name>
-						<address>0x00100000</address>
-					</section>
-					<section>
-						<name>C_USER_APPLICATION_AREA</name>
-						<address>0x00102300</address>
-					</section>
-					<section>
-						<name>B</name>
-						<name>B_1</name>
-						<name>R_2</name>
-						<address>0x00800000</address>
-					</section>
-					<section>
-						<name>PResetPRG</name>
-						<name>C_1</name>
-						<name>C_2</name>
-						<name>C</name>
-						<name>C$*</name>
-						<name>D*</name>
-						<name>W*</name>
-						<name>L</name>
-						<name>P</name>
-						<name>PFRAM2</name>
-						<address>0xFFF00300</address>
-					</section>
-				</sections>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.gOptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.assembler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.assembler.option.goptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize.all</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.converter</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.separated.form.motorolaFile</optionid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.outputHexFile</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.common</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch.none</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.nomessage</optionid>
-					<value>11174,21644,20010,23034,23035,20177,23033</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.useCustomLinkageOrder</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWchar</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWcType</optionid>
-					<value>true</value>
-				</option>
-				<!-- RXC standard library -->
-				<standardlibrary>
-					<toolchain>RXC</toolchain>
-					<libname>ctype.h</libname>
-					<libname>math.h</libname>
-					<libname>mathf.h</libname>
-					<libname>stdio.h</libname>
-					<libname>stdlib.h</libname>
-					<libname>string.h</libname>
-					<libname>new.h</libname>
-					<libname>fenv.h</libname>
-					<libname>inttypes.h</libname>
-					<libname>ctype.h</libname>
-					<libname>wchar.h</libname>
-					<libname>wctype.h</libname>
-				</standardlibrary>
-				<!-- Macro definition -->
-				<macrodefinition>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<compiler>MBEDTLS_CONFIG_FILE=&lt;&quot;aws_mbedtls_config.h&quot;&gt;</compiler>
-					<compiler>CONFIG_MEDTLS_USE_AFR_MEMORY</compiler>
-					<compiler>MBEDTLS_CMAC_C</compiler>
-					<compiler>MBEDTLS_ERROR_C</compiler>
-					<compiler>MBEDTLS_THREADING_C</compiler>
-					<compiler>MBEDTLS_ALLOW_PRIVATE_ACCESS</compiler>
-					<compiler>__LITTLE_ENDIAN__</compiler>
-				</macrodefinition>
-			</app>
-			<app id="application" value="fleetps_wifi" name="(Wi-Fi) PubSub/MQTT with Fleet Provisioning sample project" description="This demonstration illustrates Fleet Provisioning functionality, followed by PubSub using AWS services with Wi-Fi(DA16600) connection.">
-				<toolchain>RXC</toolchain>
-				<board>CK-RX65N-V2(DUAL)</board>
-				<board>CK-RX65N-V2</board>
-				<!-- impdir section -->
-				<impdir>
-					<folder>configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config</folder>
-					<path>src/frtos_config</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/application_code/main.c</file>
-					<file>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/application_code/user_init.c</file>
-					<path>src/application_code</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.h</file>
-					<file>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.c</file>
-					<path>src/frtos_startup</path>
-				</impdir>
-				<impdir>
-					<folder>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/smc_gen/r_wifi_da16xxx</folder>
-					<path>src/smc_gen/r_wifi_da16xxx</path>
-				</impdir>
-				<impdir>
-					<folder>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/smc_gen/r_fwup</folder>
-					<path>src/smc_gen/r_fwup</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/fleetps/ck-rx65n/wifi/linker_section_sample.esi</file>
-					<path>src</path>
-				</impdir>
-				<impdir>
-					<folder>configuration/samples/common/ck-rx65n/wifi/src/smc_gen</folder>
-					<path>src/smc_gen</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/common/ck-rx65n/wifi/README.md</file>
-					<path>.</path>
-				</impdir>
-				<!-- linkdir section -->
-				<linkdir>
-					<folder linkedfolder="true">Common</folder>
-					<path>Common</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Common/ports</folder>
-					<path>src/application_code/ports</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos</folder>
-					<path>Demos</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Middleware</folder>
-					<path>Middleware</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos/include</folder>
-					<path>src/application_code/include</path>
-				</linkdir>
-				<!-- incdir section -->
-				<incdir>
-					<path>src/smc_gen/r_bsp</path>
-					<path>src/smc_gen/general</path>
-					<path>src/smc_gen/r_config</path>
-					<path>src/smc_gen/r_pincfg</path>
-					<path>src/smc_gen/r_ether_rx</path>
-					<path>src/smc_gen/r_s12ad_rx</path>
-					<path>src/smc_gen/r_s12ad_rx/src</path>
-					<path>src/smc_gen/r_sci_rx</path>
-					<path>src/smc_gen/r_sci_rx/src</path>
-					<path>src/smc_gen/r_byteq</path>
-					<path>src/smc_gen/r_byteq/src</path>
-					<path>src/smc_gen/r_flash_rx</path>
-					<path>src/smc_gen/r_flash_rx/src</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_1</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_3</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_4</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_5</path>
-					<path>src/smc_gen/r_flash_rx/src/targets</path>
-					<path>src/smc_gen/r_wifi_da16xxx/src</path>
-					<path>src/smc_gen/r_wifi_da16xxx</path>
-					<path>Common/FreeRTOS_common</path>
-					<path>Common/littlefs_common</path>
-					<path>Common/littlefs_common/rm_littlefs_df/targets/rx65n</path>
-					<path>Common/common_api</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx/implicitlyinclude.h</path>
-					<path>Demos/cli</path>
-					<path>Demos/mqtt_agent</path>
-					<path>Demos/common/pkcs11_helpers</path>
-					<path>Demos/dev_mode_key_provisioning/include</path>
-					<path>Demos/common/mqtt-agent-interface/include</path>
-					<path>Demos/common/mqtt-agent-interface</path>
-					<path>Demos/common/Mqtt_Demo_Helpers</path>
-					<path>Demos/Fleet_Provisioning_With_CSR_Demo</path>
-					<path>Middleware/freertos_plus/standard/crypto/include</path>
-					<path>Middleware/logging/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/include</path>
-					<path>Middleware/FreeRTOS-Plus-CLI</path>
-					<path>Middleware/FreeRTOS/coreMQTT/source/include</path>
-					<path>Middleware/FreeRTOS/coreMQTT/source/interface</path>
-					<path>Middleware/3rdparty/tinycbor/src</path>
-					<path>Middleware/3rdparty/tinycrypt/lib/include</path>
-					<path>Middleware/FreeRTOS/coreJSON/source/include</path>
-					<path>Middleware/FreeRTOS/coreMQTT-Agent/source/include</path>
-					<path>Middleware/FreeRTOS/backoffAlgorithm/source/include</path>
-					<path>Middleware/network_transport/using_mbedtls_pkcs11</path>
-					<path>Middleware/pkcs11/published/2-40-errata-1</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/include</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/dependency/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/littlefs</path>
-					<path>Middleware/3rdparty/base64_decode</path>
-					<path>Middleware/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/mbedtls/include/mbedtls</path>
-					<path>Middleware/3rdparty/mbedtls/include</path>
-					<path>Middleware/3rdparty/mbedtls/library</path>
-					<path>Middleware/3rdparty/mbedtls_config</path>
-					<path>Middleware/network_transport/sockets_wrapper/include</path>
-					<path>Middleware/AWS/Fleet-Provisioning-for-AWS-IoT-embedded-sdk/source/include</path>
-					<path>Middleware/wifi/include</path>
-					<path>src/application_code</path>
-					<path>src/application_code/include</path>
-					<path>src/frtos_config</path>
-					<path>src/frtos_startup</path>
-				</incdir>
-				<incdir>
-					<series>RX600</series>
-					<group>RX65N</group>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas/RX600v2</path>
-				</incdir>
-				<incdir>
-					<toolchain>RXC</toolchain>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler/Renesas</path>
-				</incdir>
-				<!-- resource filter for linked files/folders -->
-				<resourcefilter>
-					<name>Common</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ports</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Common/FreeRTOS_common</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>network_support</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Demos</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include|OtaOverMqtt</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/littlefs</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>*</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include|library</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls_utils</name>
-					<type>6</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>mbedtls_bio_freertos_plus_cellular.c|mbedtls_bio_tcp_sockets_wrapper.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>tinycrypt</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/network_transport/sockets_wrapper/ports</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>wifi_da16600</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Fleet-Provisioning-for-AWS-IoT-embedded-sdk</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/Fleet-Provisioning-for-AWS-IoT-embedded-sdk</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/pkcs11</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>published</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>backoffAlgorithm|coreJSON|coreMQTT|coreMQTT-Agent|corePKCS11|FreeRTOS-Kernel|FreeRTOS-Plus-CLI</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/backoffAlgorithm</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<casesensitive>false</casesensitive>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreJSON</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11/source/dependency/3rdparty</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>mbedtls_utils</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent/source</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>dependency</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11/source/portable</name>
-					<type>13</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>mbedtls</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas|MemMang</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/MemMang</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>heap_4.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<series>RX600</series>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX600v2</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/BufferManagement</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>BufferAllocation_2.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<toolchain>RXC</toolchain>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/NetworkInterface</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/wifi</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include|ports</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>src/application_code/ports</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>pkcs11</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>src/application_code/ports</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ota_pal</folder>
-					</arguments>
-				</resourcefilter>
-				<!-- template section -->
-				<scfgtemplate>
-					<path>configuration/samples/common/ck-rx65n/wifi/CK-RX65N_wifi_scfg.ftl</path>
-				</scfgtemplate>
-				<!-- linker section -->
-				<sections>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N-V2(DUAL)</board>
-					<board>CK-RX65N-V2</board>
-					<section>
-						<name>SU</name>
-						<name>SI</name>
-						<name>R_1</name>
-						<name>B_2</name>
-						<name>R</name>
-						<name>RPFRAM2</name>
-						<address>0x00000004</address>
-					</section>
-					<section>
-						<name>C_LITTLEFS_MANAGEMENT_AREA</name>
-						<address>0x00100000</address>
-					</section>
-					<section>
-						<name>C_USER_APPLICATION_AREA</name>
-						<address>0x00102300</address>
-					</section>
-					<section>
-						<name>B</name>
-						<name>B_1</name>
-						<name>R_2</name>
-						<address>0x00800000</address>
-					</section>
-					<section>
-						<name>PResetPRG</name>
-						<name>C_1</name>
-						<name>C_2</name>
-						<name>C</name>
-						<name>C$*</name>
-						<name>D*</name>
-						<name>W*</name>
-						<name>L</name>
-						<name>P</name>
-						<name>PFRAM2</name>
-						<address>0xFFF00300</address>
-					</section>
-				</sections>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.gOptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.assembler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.assembler.option.goptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize.all</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.converter</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.separated.form.motorolaFile</optionid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.outputHexFile</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.common</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch.none</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.nomessage</optionid>
-					<value>11174,21644,20010,23034,23035,20177,23033</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.useCustomLinkageOrder</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWchar</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWcType</optionid>
-					<value>true</value>
-				</option>
-				<!-- RXC standard library -->
-				<standardlibrary>
-					<toolchain>RXC</toolchain>
-					<libname>ctype.h</libname>
-					<libname>math.h</libname>
-					<libname>mathf.h</libname>
-					<libname>stdio.h</libname>
-					<libname>stdlib.h</libname>
-					<libname>string.h</libname>
-					<libname>new.h</libname>
-					<libname>fenv.h</libname>
-					<libname>inttypes.h</libname>
-					<libname>ctype.h</libname>
-					<libname>wchar.h</libname>
-					<libname>wctype.h</libname>
-				</standardlibrary>
-				<!-- Macro definition -->
-				<macrodefinition>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N-V2(DUAL)</board>
-					<board>CK-RX65N-V2</board>
-					<compiler>MBEDTLS_CONFIG_FILE=&lt;&quot;aws_mbedtls_config.h&quot;&gt;</compiler>
-					<compiler>CONFIG_MEDTLS_USE_AFR_MEMORY</compiler>
-					<compiler>MBEDTLS_CMAC_C</compiler>
-					<compiler>MBEDTLS_ERROR_C</compiler>
-					<compiler>MBEDTLS_THREADING_C</compiler>
-					<compiler>MBEDTLS_ALLOW_PRIVATE_ACCESS</compiler>
-					<compiler>__LITTLE_ENDIAN__</compiler>
-				</macrodefinition>
-			</app>
-			<app id="application" value="pso_ether" name="(Ethernet) PubSub/MQTT with Over-the-air (OTA) update sample project" description="This demonstration illustrates PubSub and OTA update functionality (simultaneously) using AWS services with Ethernet connection. Note: This project requires bootloader project.">
-				<toolchain>RXC</toolchain>
-				<board>CK-RX65N(DUAL)</board>
-				<board>CK-RX65N</board>
-				<!-- impdir section -->
-				<impdir>
-					<folder>configuration/samples/pso/ck-rx65n/ether/src/frtos_config</folder>
-					<path>src/frtos_config</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_ether_ck_rx65n/e2studio_ccrx/src/application_code/main.c</file>
-					<file>Projects/aws_ether_ck_rx65n/e2studio_ccrx/src/application_code/user_init.c</file>
-					<path>src/application_code</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_ether_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.h</file>
-					<file>Projects/aws_ether_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.c</file>
-					<path>src/frtos_startup</path>
-				</impdir>
-				<impdir>
-					<folder>Projects/aws_ether_ck_rx65n/e2studio_ccrx/src/smc_gen/r_fwup</folder>
-					<path>src/smc_gen/r_fwup</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/pso/ck-rx65n/ether/linker_section_sample.esi</file>
-					<path>src</path>
-				</impdir>
-				<impdir>
-					<folder>configuration/samples/common/ck-rx65n/ether/src/smc_gen</folder>
-					<path>src/smc_gen</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/common/ck-rx65n_ota/ether/src/smc_gen/r_config/r_fwup_config.h</file>
-					<path>src/smc_gen/r_config</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/common/ck-rx65n/ether/README.md</file>
-					<path>.</path>
-				</impdir>
-				<!-- linkdir section -->
-				<linkdir>
-					<folder linkedfolder="true">Common</folder>
-					<path>Common</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Common/ports</folder>
-					<path>src/application_code/ports</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos</folder>
-					<path>Demos</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Middleware</folder>
-					<path>Middleware</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos/include</folder>
-					<path>src/application_code/include</path>
-				</linkdir>
-				<!-- incdir section -->
-				<incdir>
-					<path>src/smc_gen/r_bsp</path>
-					<path>src/smc_gen/general</path>
-					<path>src/smc_gen/r_config</path>
-					<path>src/smc_gen/r_pincfg</path>
-					<path>src/smc_gen/r_ether_rx</path>
-					<path>src/smc_gen/r_s12ad_rx</path>
-					<path>src/smc_gen/r_s12ad_rx/src</path>
-					<path>src/smc_gen/r_sci_rx</path>
-					<path>src/smc_gen/r_sci_rx/src</path>
-					<path>src/smc_gen/r_byteq</path>
-					<path>src/smc_gen/r_byteq/src</path>
-					<path>src/smc_gen/r_fwup</path>
-					<path>src/smc_gen/r_fwup/src</path>
-					<path>src/smc_gen/r_flash_rx</path>
-					<path>src/smc_gen/r_flash_rx/src</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_1</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_3</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_4</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_5</path>
-					<path>src/smc_gen/r_flash_rx/src/targets</path>
-					<path>Common/FreeRTOS_common</path>
-					<path>Common/littlefs_common</path>
-					<path>Common/littlefs_common/rm_littlefs_df/targets/rx65n</path>
-					<path>Common/common_api</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx/implicitlyinclude.h</path>
-					<path>Demos/cli</path>
-					<path>Demos/mqtt_agent</path>
-					<path>Demos/OtaOverMqtt</path>
-					<path>Demos/common/pkcs11_helpers</path>
-					<path>Demos/dev_mode_key_provisioning/include</path>
-					<path>Demos/common/mqtt-agent-interface/include</path>
-					<path>Demos/common/mqtt-agent-interface</path>
-					<path>Demos/common/Mqtt_Demo_Helpers</path>
-					<path>Demos/Fleet_Provisioning_With_CSR_Demo</path>
-					<path>Middleware/freertos_plus/standard/crypto/include</path>
-					<path>Middleware/logging/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/include</path>
-					<path>Middleware/FreeRTOS-Plus-CLI</path>
-					<path>Middleware/FreeRTOS/coreMQTT/source/include</path>
-					<path>Middleware/FreeRTOS/coreMQTT/source/interface</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/include</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/portable</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/portable/os</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source</path>
-					<path>Middleware/3rdparty/tinycbor/src</path>
-					<path>Middleware/3rdparty/tinycrypt/lib/include</path>
-					<path>Middleware/FreeRTOS/coreJSON/source/include</path>
-					<path>Middleware/FreeRTOS/coreMQTT-Agent/source/include</path>
-					<path>Middleware/FreeRTOS/backoffAlgorithm/source/include</path>
-					<path>Middleware/network_transport/using_mbedtls_pkcs11</path>
-					<path>Middleware/pkcs11/published/2-40-errata-1</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/include</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/dependency/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/littlefs</path>
-					<path>Middleware/3rdparty/base64_decode</path>
-					<path>Middleware/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/mbedtls/include/mbedtls</path>
-					<path>Middleware/3rdparty/mbedtls/include</path>
-					<path>Middleware/3rdparty/mbedtls/library</path>
-					<path>Middleware/3rdparty/mbedtls_config</path>
-					<path>Middleware/network_transport/sockets_wrapper/include</path>
-					<path>src/application_code</path>
-					<path>src/application_code/include</path>
-					<path>src/application_code/ports/ota_pal</path>
-					<path>src/frtos_config</path>
-					<path>src/frtos_startup</path>
-				</incdir>
-				<incdir>
-					<series>RX600</series>
-					<group>RX65N</group>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas/RX600v2</path>
-				</incdir>
-				<incdir>
-					<toolchain>RXC</toolchain>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler/Renesas</path>
-				</incdir>
-				<!-- resource filter for linked files/folders -->
-				<resourcefilter>
-					<name>Common</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ports</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Demos</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Demos/Fleet_Provisioning_With_CSR_Demo</name>
-					<type>6</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>tinycbor_serializer.c|FleetProvisioningDemoExample.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/littlefs</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>*</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include|library</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls_utils</name>
-					<type>6</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>mbedtls_bio_freertos_plus_cellular.c|mbedtls_bio_freertos_plus_wifi_da16600.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/tinycrypt/lib/source</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>ecc_dsa.c|ecc.c|sha256.c|utils.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/network_transport/sockets_wrapper/ports</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>freertos_plus_tcp</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ota-for-aws-iot-embedded-sdk</folder>
-						<!-- <folder>ota-for-aws-iot-embedded-sdk</folder> -->
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/ota-for-aws-iot-embedded-sdk</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>dependency</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/portable/os</name>
-					<type>6</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>ota_os_posix.c|ota_os_posix.h</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>backoffAlgorithm|coreJSON|coreMQTT|coreMQTT-Agent|corePKCS11|FreeRTOS-Kernel|FreeRTOS-Plus-TCP|FreeRTOS-Plus-CLI</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/backoffAlgorithm</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<casesensitive>false</casesensitive>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreJSON</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent/source</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>dependency</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11/source/portable</name>
-					<type>13</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>mbedtls</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas|MemMang</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/MemMang</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>heap_4.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<series>RX600</series>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX600v2</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/BufferManagement</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>BufferAllocation_2.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<toolchain>RXC</toolchain>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/NetworkInterface</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>wifi</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>src/application_code/ports</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>pkcs11</folder>
-					</arguments>
-				</resourcefilter>
-				<!-- template section -->
-				<scfgtemplate>
-					<path>configuration/samples/common/ck-rx65n_ota/ether/CK-RX65N_ether_scfg.ftl</path>
-				</scfgtemplate>
-				<!-- linker section -->
-				<sections>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<section>
-						<name>SU</name>
-						<name>SI</name>
-						<name>R_1</name>
-						<name>B_2</name>
-						<name>R</name>
-						<name>RPFRAM2</name>
-						<address>0x00000004</address>
-					</section>
-					<section>
-						<name>C_LITTLEFS_MANAGEMENT_AREA</name>
-						<address>0x00100000</address>
-					</section>
-					<section>
-						<name>C_USER_APPLICATION_AREA</name>
-						<address>0x00102300</address>
-					</section>
-					<section>
-						<name>B_ETHERNET_BUFFERS*</name>
-						<name>B_RX_DESC*</name>
-						<name>B_TX_DESC*</name>
-						<name>B</name>
-						<name>B_1</name>
-						<name>R_2</name>
-						<address>0x00800000</address>
-					</section>
-					<section>
-						<name>PResetPRG</name>
-						<name>C_1</name>
-						<name>C_2</name>
-						<name>C</name>
-						<name>C$*</name>
-						<name>D*</name>
-						<name>W*</name>
-						<name>L</name>
-						<name>P</name>
-						<name>PFRAM2</name>
-						<address>0xFFF00300</address>
-					</section>
-					<section>
-						<name>EXCEPTVECT</name>
-						<address>0xFFFEFF80</address>
-					</section>
-					<section>
-						<name>RESETVECT</name>
-						<address>0xFFFEFFFC</address>
-					</section>
-				</sections>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.gOptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.assembler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.assembler.option.goptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize.all</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.converter</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.separated.form.motorolaFile</optionid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.outputHexFile</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.common</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch.none</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.nomessage</optionid>
-					<value>11174,21644,20010,23034,23035,20177,23033</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.useCustomLinkageOrder</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWchar</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWcType</optionid>
-					<value>true</value>
-				</option>
-				<!-- RXC standard library -->
-				<standardlibrary>
-					<toolchain>RXC</toolchain>
-					<libname>ctype.h</libname>
-					<libname>math.h</libname>
-					<libname>mathf.h</libname>
-					<libname>stdarg.h</libname>
-					<libname>stdio.h</libname>
-					<libname>stdlib.h</libname>
-					<libname>string.h</libname>
-					<libname>new.h</libname>
-					<libname>fenv.h</libname>
-					<libname>inttypes.h</libname>
-					<libname>ctype.h</libname>
-				</standardlibrary>
-				<!-- Macro definition -->
-				<macrodefinition>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<compiler>MBEDTLS_CONFIG_FILE=&lt;&quot;aws_mbedtls_config.h&quot;&gt;</compiler>
-					<compiler>CONFIG_MEDTLS_USE_AFR_MEMORY</compiler>
-					<compiler>MBEDTLS_CMAC_C</compiler>
-					<compiler>MBEDTLS_ERROR_C</compiler>
-					<compiler>MBEDTLS_THREADING_C</compiler>
-					<compiler>MBEDTLS_ALLOW_PRIVATE_ACCESS</compiler>
-					<compiler>__LITTLE_ENDIAN__</compiler>
-				</macrodefinition>
-			</app>
-			<app id="application" value="pso_cell" name="(Cellular) PubSub/MQTT with Over-the-air (OTA) update sample project" description="This demonstration illustrates PubSub and OTA update functionality (simultaneously) using AWS services with Cellular(RYZ014A) connection. Note: This project requires bootloader project.">
-				<toolchain>RXC</toolchain>
-				<board>CK-RX65N(DUAL)</board>
-				<board>CK-RX65N</board>
-				<!-- impdir section -->
-				<impdir>
-					<folder>configuration/samples/pso/ck-rx65n/cellular/src/frtos_config</folder>
-					<path>src/frtos_config</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_ryz014a_ck_rx65n/e2studio_ccrx/src/application_code/main.c</file>
-					<file>Projects/aws_ryz014a_ck_rx65n/e2studio_ccrx/src/application_code/user_init.c</file>
-					<path>src/application_code</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_ryz014a_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.h</file>
-					<file>Projects/aws_ryz014a_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.c</file>
-					<path>src/frtos_startup</path>
-				</impdir>
-				<impdir>
-					<folder>Projects/aws_ryz014a_ck_rx65n/e2studio_ccrx/src/smc_gen/r_fwup</folder>
-					<path>src/smc_gen/r_fwup</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/pso/ck-rx65n/cellular/linker_section_sample.esi</file>
-					<path>src</path>
-				</impdir>
-				<impdir>
-					<folder>configuration/samples/common/ck-rx65n/cellular/src/smc_gen</folder>
-					<path>src/smc_gen</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/common/ck-rx65n_ota/cellular/src/smc_gen/r_config/r_fwup_config.h</file>
-					<path>src/smc_gen/r_config</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/common/ck-rx65n/cellular/README.md</file>
-					<path>.</path>
-				</impdir>
-				<!-- linkdir section -->
-				<linkdir>
-					<folder linkedfolder="true">Common</folder>
-					<path>Common</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Common/ports</folder>
-					<path>src/application_code/ports</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos</folder>
-					<path>Demos</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Middleware</folder>
-					<path>Middleware</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos/include</folder>
-					<path>src/application_code/include</path>
-				</linkdir>
-				<!-- incdir section -->
-				<incdir>
-					<path>src/smc_gen/r_bsp</path>
-					<path>src/smc_gen/general</path>
-					<path>src/smc_gen/r_config</path>
-					<path>src/smc_gen/r_pincfg</path>
-					<path>src/smc_gen/r_ether_rx</path>
-					<path>src/smc_gen/r_s12ad_rx</path>
-					<path>src/smc_gen/r_s12ad_rx/src</path>
-					<path>src/smc_gen/r_sci_rx</path>
-					<path>src/smc_gen/r_sci_rx/src</path>
-					<path>src/smc_gen/r_byteq</path>
-					<path>src/smc_gen/r_byteq/src</path>
-					<path>src/smc_gen/r_fwup</path>
-					<path>src/smc_gen/r_fwup/src</path>
-					<path>src/smc_gen/r_flash_rx</path>
-					<path>src/smc_gen/r_flash_rx/src</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_1</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_3</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_4</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_5</path>
-					<path>src/smc_gen/r_flash_rx/src/targets</path>
-					<path>Common/FreeRTOS_common</path>
-					<path>Common/littlefs_common</path>
-					<path>Common/littlefs_common/rm_littlefs_df/targets/rx65n</path>
-					<path>Common/common_api</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx/implicitlyinclude.h</path>
-					<path>Demos/cli</path>
-					<path>Demos/mqtt_agent</path>
-					<path>Demos/OtaOverMqtt</path>
-					<path>Demos/common/pkcs11_helpers</path>
-					<path>Demos/dev_mode_key_provisioning/include</path>
-					<path>Demos/common/mqtt-agent-interface/include</path>
-					<path>Demos/common/mqtt-agent-interface</path>
-					<path>Demos/common/Mqtt_Demo_Helpers</path>
-					<path>Demos/Fleet_Provisioning_With_CSR_Demo</path>
-					<path>Middleware/freertos_plus/standard/crypto/include</path>
-					<path>Middleware/logging/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/include</path>
-					<path>Middleware/FreeRTOS-Plus-CLI</path>
-					<path>Middleware/FreeRTOS/coreMQTT/source/include</path>
-					<path>Middleware/FreeRTOS/coreMQTT/source/interface</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/include</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/portable</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/portable/os</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source</path>
-					<path>Middleware/3rdparty/tinycbor/src</path>
-					<path>Middleware/3rdparty/tinycrypt/lib/include</path>
-					<path>Middleware/FreeRTOS/coreJSON/source/include</path>
-					<path>Middleware/FreeRTOS/coreMQTT-Agent/source/include</path>
-					<path>Middleware/FreeRTOS/backoffAlgorithm/source/include</path>
-					<path>Middleware/network_transport/using_mbedtls_pkcs11</path>
-					<path>Middleware/pkcs11/published/2-40-errata-1</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/include</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/dependency/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/littlefs</path>
-					<path>Middleware/3rdparty/base64_decode</path>
-					<path>Middleware/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/mbedtls/include/mbedtls</path>
-					<path>Middleware/3rdparty/mbedtls/include</path>
-					<path>Middleware/3rdparty/mbedtls/library</path>
-					<path>Middleware/3rdparty/mbedtls_config</path>
-					<path>Middleware/network_transport/sockets_wrapper/include</path>
-					<path>src/application_code</path>
-					<path>src/application_code/include</path>
-					<path>src/application_code/ports/ota_pal</path>
-					<path>src/frtos_config</path>
-					<path>src/frtos_startup</path>
-				</incdir>
-				<incdir>
-					<series>RX600</series>
-					<group>RX65N</group>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas/RX600v2</path>
-				</incdir>
-				<incdir>
-					<toolchain>RXC</toolchain>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler/Renesas</path>
-				</incdir>
-				<!-- resource filter for linked files/folders -->
-				<resourcefilter>
-					<name>Common</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ports</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Common/FreeRTOS_common</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>network_support</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Demos</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Demos/Fleet_Provisioning_With_CSR_Demo</name>
-					<type>6</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>tinycbor_serializer.c|FleetProvisioningDemoExample.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/littlefs</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>*</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include|library</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls_utils</name>
-					<type>6</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>mbedtls_bio_tcp_sockets_wrapper.c|mbedtls_bio_freertos_plus_wifi_da16600.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/tinycrypt/lib/source</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>ecc_dsa.c|ecc.c|sha256.c|utils.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/network_transport/sockets_wrapper/ports</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>cellular_ryz014a</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ota-for-aws-iot-embedded-sdk</folder>
-						<!-- <folder>ota-for-aws-iot-embedded-sdk</folder> -->
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/ota-for-aws-iot-embedded-sdk</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>dependency</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/portable/os</name>
-					<type>6</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>ota_os_posix.c|ota_os_posix.h</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/pkcs11</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>published</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>backoffAlgorithm|coreJSON|coreMQTT|coreMQTT-Agent|corePKCS11|FreeRTOS-Kernel|FreeRTOS-Plus-CLI</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/backoffAlgorithm</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<casesensitive>false</casesensitive>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreJSON</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent/source</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>dependency</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11/source/portable</name>
-					<type>13</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>mbedtls</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas|MemMang</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/MemMang</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>heap_4.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<series>RX600</series>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX600v2</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/BufferManagement</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>BufferAllocation_2.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<toolchain>RXC</toolchain>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/NetworkInterface</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>wifi</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>src/application_code/ports</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>pkcs11</folder>
-					</arguments>
-				</resourcefilter>
-				<!-- template section -->
-				<scfgtemplate>
-					<path>configuration/samples/common/ck-rx65n_ota/cellular/CK-RX65N_cellular_scfg.ftl</path>
-				</scfgtemplate>
-				<!-- linker section -->
-				<sections>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<section>
-						<name>SU</name>
-						<name>SI</name>
-						<name>R_1</name>
-						<name>B_2</name>
-						<name>R</name>
-						<name>RPFRAM2</name>
-						<address>0x00000004</address>
-					</section>
-					<section>
-						<name>C_LITTLEFS_MANAGEMENT_AREA</name>
-						<address>0x00100000</address>
-					</section>
-					<section>
-						<name>C_USER_APPLICATION_AREA</name>
-						<address>0x00102300</address>
-					</section>
-					<section>
-						<name>B</name>
-						<name>B_1</name>
-						<name>R_2</name>
-						<address>0x00800000</address>
-					</section>
-					<section>
-						<name>PResetPRG</name>
-						<name>C_1</name>
-						<name>C_2</name>
-						<name>C</name>
-						<name>C$*</name>
-						<name>D*</name>
-						<name>W*</name>
-						<name>L</name>
-						<name>P</name>
-						<name>PFRAM2</name>
-						<address>0xFFF00300</address>
-					</section>
-					<section>
-						<name>EXCEPTVECT</name>
-						<address>0xFFFEFF80</address>
-					</section>
-					<section>
-						<name>RESETVECT</name>
-						<address>0xFFFEFFFC</address>
-					</section>
-				</sections>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.gOptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.assembler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.assembler.option.goptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize.all</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.converter</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.separated.form.motorolaFile</optionid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.outputHexFile</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.common</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch.none</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.nomessage</optionid>
-					<value>11174,21644,20010,23034,23035,20177,23033</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.useCustomLinkageOrder</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWchar</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWcType</optionid>
-					<value>true</value>
-				</option>
-				<!-- RXC standard library -->
-				<standardlibrary>
-					<toolchain>RXC</toolchain>
-					<libname>ctype.h</libname>
-					<libname>math.h</libname>
-					<libname>mathf.h</libname>
-					<libname>stdarg.h</libname>
-					<libname>stdio.h</libname>
-					<libname>stdlib.h</libname>
-					<libname>string.h</libname>
-					<libname>new.h</libname>
-					<libname>fenv.h</libname>
-					<libname>inttypes.h</libname>
-					<libname>ctype.h</libname>
-				</standardlibrary>
-				<!-- Macro definition -->
-				<macrodefinition>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<compiler>MBEDTLS_CONFIG_FILE=&lt;&quot;aws_mbedtls_config.h&quot;&gt;</compiler>
-					<compiler>CONFIG_MEDTLS_USE_AFR_MEMORY</compiler>
-					<compiler>MBEDTLS_CMAC_C</compiler>
-					<compiler>MBEDTLS_ERROR_C</compiler>
-					<compiler>MBEDTLS_THREADING_C</compiler>
-					<compiler>MBEDTLS_ALLOW_PRIVATE_ACCESS</compiler>
-					<compiler>__LITTLE_ENDIAN__</compiler>
-				</macrodefinition>
-			</app>
-			<app id="application" value="pso_wifi" name="(Wi-Fi) PubSub/MQTT with Over-the-air (OTA) update sample project" description="This demonstration illustrates PubSub and OTA update functionality (simultaneously) using AWS services with Wi-Fi(DA16600) connection. Note: This project requires bootloader project.">
-				<toolchain>RXC</toolchain>
-				<board>CK-RX65N-V2(DUAL)</board>
-				<board>CK-RX65N-V2</board>
-				<!-- impdir section -->
-				<impdir>
-					<folder>configuration/samples/pso/ck-rx65n/wifi/src/frtos_config</folder>
-					<path>src/frtos_config</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/application_code/main.c</file>
-					<file>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/application_code/user_init.c</file>
-					<path>src/application_code</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.h</file>
-					<file>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.c</file>
-					<path>src/frtos_startup</path>
-				</impdir>
-				<impdir>
-					<folder>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/smc_gen/r_wifi_da16xxx</folder>
-					<path>src/smc_gen/r_wifi_da16xxx</path>
-				</impdir>
-				<impdir>
-					<folder>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/smc_gen/r_fwup</folder>
-					<path>src/smc_gen/r_fwup</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/pso/ck-rx65n/wifi/linker_section_sample.esi</file>
-					<path>src</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/common/ck-rx65n/wifi/README.md</file>
-					<path>.</path>
-				</impdir>
-				<!-- linkdir section -->
-				<linkdir>
-					<folder linkedfolder="true">Common</folder>
-					<path>Common</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Common/ports</folder>
-					<path>src/application_code/ports</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos</folder>
-					<path>Demos</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Middleware</folder>
-					<path>Middleware</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos/include</folder>
-					<path>src/application_code/include</path>
-				</linkdir>
-				<!-- incdir section -->
-				<incdir>
-					<path>src/smc_gen/r_bsp</path>
-					<path>src/smc_gen/general</path>
-					<path>src/smc_gen/r_config</path>
-					<path>src/smc_gen/r_pincfg</path>
-					<path>src/smc_gen/r_ether_rx</path>
-					<path>src/smc_gen/r_s12ad_rx</path>
-					<path>src/smc_gen/r_s12ad_rx/src</path>
-					<path>src/smc_gen/r_sci_rx</path>
-					<path>src/smc_gen/r_sci_rx/src</path>
-					<path>src/smc_gen/r_byteq</path>
-					<path>src/smc_gen/r_byteq/src</path>
-					<path>src/smc_gen/r_fwup</path>
-					<path>src/smc_gen/r_fwup/src</path>
-					<path>src/smc_gen/r_flash_rx</path>
-					<path>src/smc_gen/r_flash_rx/src</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_1</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_3</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_4</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_5</path>
-					<path>src/smc_gen/r_flash_rx/src/targets</path>
-					<path>src/smc_gen/r_wifi_da16xxx/src</path>
-					<path>src/smc_gen/r_wifi_da16xxx</path>
-					<path>Common/FreeRTOS_common</path>
-					<path>Common/littlefs_common</path>
-					<path>Common/littlefs_common/rm_littlefs_df/targets/rx65n</path>
-					<path>Common/common_api</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx/implicitlyinclude.h</path>
-					<path>Demos/cli</path>
-					<path>Demos/mqtt_agent</path>
-					<path>Demos/OtaOverMqtt</path>
-					<path>Demos/common/pkcs11_helpers</path>
-					<path>Demos/dev_mode_key_provisioning/include</path>
-					<path>Demos/common/mqtt-agent-interface/include</path>
-					<path>Demos/common/mqtt-agent-interface</path>
-					<path>Demos/common/Mqtt_Demo_Helpers</path>
-					<path>Demos/Fleet_Provisioning_With_CSR_Demo</path>
-					<path>Middleware/freertos_plus/standard/crypto/include</path>
-					<path>Middleware/logging/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/include</path>
-					<path>Middleware/FreeRTOS-Plus-CLI</path>
-					<path>Middleware/FreeRTOS/coreMQTT/source/include</path>
-					<path>Middleware/FreeRTOS/coreMQTT/source/interface</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/include</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/portable</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/portable/os</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source</path>
-					<path>Middleware/3rdparty/tinycbor/src</path>
-					<path>Middleware/3rdparty/tinycrypt/lib/include</path>
-					<path>Middleware/FreeRTOS/coreJSON/source/include</path>
-					<path>Middleware/FreeRTOS/coreMQTT-Agent/source/include</path>
-					<path>Middleware/FreeRTOS/backoffAlgorithm/source/include</path>
-					<path>Middleware/network_transport/using_mbedtls_pkcs11</path>
-					<path>Middleware/pkcs11/published/2-40-errata-1</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/include</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/dependency/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/littlefs</path>
-					<path>Middleware/3rdparty/base64_decode</path>
-					<path>Middleware/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/mbedtls/include/mbedtls</path>
-					<path>Middleware/3rdparty/mbedtls/include</path>
-					<path>Middleware/3rdparty/mbedtls/library</path>
-					<path>Middleware/3rdparty/mbedtls_config</path>
-					<path>Middleware/network_transport/sockets_wrapper/include</path>
-					<path>Middleware/wifi/include</path>
-					<path>src/application_code</path>
-					<path>src/application_code/include</path>
-					<path>src/application_code/ports/ota_pal</path>
-					<path>src/frtos_config</path>
-					<path>src/frtos_startup</path>
-				</incdir>
-				<incdir>
-					<series>RX600</series>
-					<group>RX65N</group>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas/RX600v2</path>
-				</incdir>
-				<incdir>
-					<toolchain>RXC</toolchain>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler/Renesas</path>
-				</incdir>
-				<!-- resource filter for linked files/folders -->
-				<resourcefilter>
-					<name>Common</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ports</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Common/FreeRTOS_common</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>network_support</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Demos</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Demos/Fleet_Provisioning_With_CSR_Demo</name>
-					<type>6</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>tinycbor_serializer.c|FleetProvisioningDemoExample.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/littlefs</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>*</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include|library</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls_utils</name>
-					<type>6</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>mbedtls_bio_freertos_plus_cellular.c|mbedtls_bio_tcp_sockets_wrapper.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/tinycrypt/lib/source</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>ecc_dsa.c|ecc.c|sha256.c|utils.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/network_transport/sockets_wrapper/ports</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>wifi_da16600</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ota-for-aws-iot-embedded-sdk</folder>
-						<!-- <folder>ota-for-aws-iot-embedded-sdk</folder> -->
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/ota-for-aws-iot-embedded-sdk</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>dependency</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/portable/os</name>
-					<type>6</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>ota_os_posix.c|ota_os_posix.h</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/pkcs11</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>published</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>backoffAlgorithm|coreJSON|coreMQTT|coreMQTT-Agent|corePKCS11|FreeRTOS-Kernel|FreeRTOS-Plus-CLI</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/backoffAlgorithm</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<casesensitive>false</casesensitive>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreJSON</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent/source</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>dependency</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11/source/portable</name>
-					<type>13</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>mbedtls</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas|MemMang</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/MemMang</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>heap_4.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<series>RX600</series>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX600v2</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/BufferManagement</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>BufferAllocation_2.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<toolchain>RXC</toolchain>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/NetworkInterface</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/wifi</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include|ports</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>src/application_code/ports</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>pkcs11</folder>
-					</arguments>
-				</resourcefilter>
-				<!-- template section -->
-				<scfgtemplate>
-					<path>configuration/samples/common/ck-rx65n_ota/wifi/CK-RX65N_wifi_scfg.ftl</path>
-				</scfgtemplate>
-				<!-- linker section -->
-				<sections>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N-V2(DUAL)</board>
-					<board>CK-RX65N-V2</board>
-					<section>
-						<name>SU</name>
-						<name>SI</name>
-						<name>R_1</name>
-						<name>B_2</name>
-						<name>R</name>
-						<name>RPFRAM2</name>
-						<address>0x00000004</address>
-					</section>
-					<section>
-						<name>C_LITTLEFS_MANAGEMENT_AREA</name>
-						<address>0x00100000</address>
-					</section>
-					<section>
-						<name>C_USER_APPLICATION_AREA</name>
-						<address>0x00102300</address>
-					</section>
-					<section>
-						<name>B</name>
-						<name>B_1</name>
-						<name>R_2</name>
-						<address>0x00800000</address>
-					</section>
-					<section>
-						<name>PResetPRG</name>
-						<name>C_1</name>
-						<name>C_2</name>
-						<name>C</name>
-						<name>C$*</name>
-						<name>D*</name>
-						<name>W*</name>
-						<name>L</name>
-						<name>P</name>
-						<name>PFRAM2</name>
-						<address>0xFFF00300</address>
-					</section>
-					<section>
-						<name>EXCEPTVECT</name>
-						<address>0xFFFEFF80</address>
-					</section>
-					<section>
-						<name>RESETVECT</name>
-						<address>0xFFFEFFFC</address>
-					</section>
-				</sections>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.gOptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.assembler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.assembler.option.goptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize.all</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.converter</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.separated.form.motorolaFile</optionid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.outputHexFile</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.common</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch.none</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.nomessage</optionid>
-					<value>11174,21644,20010,23034,23035,20177,23033</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.useCustomLinkageOrder</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWchar</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWcType</optionid>
-					<value>true</value>
-				</option>
-				<!-- RXC standard library -->
-				<standardlibrary>
-					<toolchain>RXC</toolchain>
-					<libname>ctype.h</libname>
-					<libname>math.h</libname>
-					<libname>mathf.h</libname>
-					<libname>stdarg.h</libname>
-					<libname>stdio.h</libname>
-					<libname>stdlib.h</libname>
-					<libname>string.h</libname>
-					<libname>new.h</libname>
-					<libname>fenv.h</libname>
-					<libname>inttypes.h</libname>
-					<libname>ctype.h</libname>
-				</standardlibrary>
-				<!-- Macro definition -->
-				<macrodefinition>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N-V2(DUAL)</board>
-					<board>CK-RX65N-V2</board>
-					<compiler>MBEDTLS_CONFIG_FILE=&lt;&quot;aws_mbedtls_config.h&quot;&gt;</compiler>
-					<compiler>CONFIG_MEDTLS_USE_AFR_MEMORY</compiler>
-					<compiler>MBEDTLS_CMAC_C</compiler>
-					<compiler>MBEDTLS_ERROR_C</compiler>
-					<compiler>MBEDTLS_THREADING_C</compiler>
-					<compiler>MBEDTLS_ALLOW_PRIVATE_ACCESS</compiler>
-					<compiler>__LITTLE_ENDIAN__</compiler>
-				</macrodefinition>
-			</app>
-			<app id="application" value="fleet_pso_ether" name="(Ethernet) PubSub/MQTT with Fleet Provisioning and Over-the-air (OTA) update sample project" description="This demonstration illustrates Fleet provisioning functionality followed by PubSub and OTA update (simultaneously) using AWS services with Ethernet connection. Note: This project requires bootloader project.">
-				<toolchain>RXC</toolchain>
-				<board>CK-RX65N(DUAL)</board>
-				<board>CK-RX65N</board>
-				<!-- impdir section -->
-				<impdir>
-					<folder>configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config</folder>
-					<path>src/frtos_config</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_ether_ck_rx65n/e2studio_ccrx/src/application_code/main.c</file>
-					<file>Projects/aws_ether_ck_rx65n/e2studio_ccrx/src/application_code/user_init.c</file>
-					<path>src/application_code</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_ether_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.h</file>
-					<file>Projects/aws_ether_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.c</file>
-					<path>src/frtos_startup</path>
-				</impdir>
-				<impdir>
-					<folder>Projects/aws_ether_ck_rx65n/e2studio_ccrx/src/smc_gen/r_fwup</folder>
-					<path>src/smc_gen/r_fwup</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/fleet_pso/ck-rx65n/ether/linker_section_sample.esi</file>
-					<path>src</path>
-				</impdir>
-				<impdir>
-					<folder>configuration/samples/common/ck-rx65n/ether/src/smc_gen</folder>
-					<path>src/smc_gen</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/common/ck-rx65n_ota/ether/src/smc_gen/r_config/r_fwup_config.h</file>
-					<path>src/smc_gen/r_config</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/common/ck-rx65n/ether/README.md</file>
-					<path>.</path>
-				</impdir>
-				<!-- linkdir section -->
-				<linkdir>
-					<folder linkedfolder="true">Common</folder>
-					<path>Common</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Common/ports</folder>
-					<path>src/application_code/ports</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos</folder>
-					<path>Demos</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Middleware</folder>
-					<path>Middleware</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos/include</folder>
-					<path>src/application_code/include</path>
-				</linkdir>
-				<!-- incdir section -->
-				<incdir>
-					<path>src/smc_gen/r_bsp</path>
-					<path>src/smc_gen/general</path>
-					<path>src/smc_gen/r_config</path>
-					<path>src/smc_gen/r_pincfg</path>
-					<path>src/smc_gen/r_ether_rx</path>
-					<path>src/smc_gen/r_s12ad_rx</path>
-					<path>src/smc_gen/r_s12ad_rx/src</path>
-					<path>src/smc_gen/r_sci_rx</path>
-					<path>src/smc_gen/r_sci_rx/src</path>
-					<path>src/smc_gen/r_byteq</path>
-					<path>src/smc_gen/r_byteq/src</path>
-					<path>src/smc_gen/r_fwup</path>
-					<path>src/smc_gen/r_fwup/src</path>
-					<path>src/smc_gen/r_flash_rx</path>
-					<path>src/smc_gen/r_flash_rx/src</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_1</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_3</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_4</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_5</path>
-					<path>src/smc_gen/r_flash_rx/src/targets</path>
-					<path>Common/FreeRTOS_common</path>
-					<path>Common/littlefs_common</path>
-					<path>Common/littlefs_common/rm_littlefs_df/targets/rx65n</path>
-					<path>Common/common_api</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx/implicitlyinclude.h</path>
-					<path>Demos/cli</path>
-					<path>Demos/mqtt_agent</path>
-					<path>Demos/OtaOverMqtt</path>
-					<path>Demos/common/pkcs11_helpers</path>
-					<path>Demos/dev_mode_key_provisioning/include</path>
-					<path>Demos/common/mqtt-agent-interface/include</path>
-					<path>Demos/common/mqtt-agent-interface</path>
-					<path>Demos/common/Mqtt_Demo_Helpers</path>
-					<path>Demos/Fleet_Provisioning_With_CSR_Demo</path>
-					<path>Middleware/freertos_plus/standard/crypto/include</path>
-					<path>Middleware/logging/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/include</path>
-					<path>Middleware/FreeRTOS-Plus-CLI</path>
-					<path>Middleware/FreeRTOS/coreMQTT/source/include</path>
-					<path>Middleware/FreeRTOS/coreMQTT/source/interface</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/include</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/portable</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/portable/os</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source</path>
-					<path>Middleware/3rdparty/tinycbor/src</path>
-					<path>Middleware/3rdparty/tinycrypt/lib/include</path>
-					<path>Middleware/FreeRTOS/coreJSON/source/include</path>
-					<path>Middleware/FreeRTOS/coreMQTT-Agent/source/include</path>
-					<path>Middleware/FreeRTOS/backoffAlgorithm/source/include</path>
-					<path>Middleware/network_transport/using_mbedtls_pkcs11</path>
-					<path>Middleware/pkcs11/published/2-40-errata-1</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/include</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/dependency/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/littlefs</path>
-					<path>Middleware/3rdparty/base64_decode</path>
-					<path>Middleware/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/mbedtls/include/mbedtls</path>
-					<path>Middleware/3rdparty/mbedtls/include</path>
-					<path>Middleware/3rdparty/mbedtls/library</path>
-					<path>Middleware/3rdparty/mbedtls_config</path>
-					<path>Middleware/network_transport/sockets_wrapper/include</path>
-					<path>Middleware/AWS/Fleet-Provisioning-for-AWS-IoT-embedded-sdk/source/include</path>
-					<path>src/application_code</path>
-					<path>src/application_code/include</path>
-					<path>src/application_code/ports/ota_pal</path>
-					<path>src/frtos_config</path>
-					<path>src/frtos_startup</path>
-				</incdir>
-				<incdir>
-					<series>RX600</series>
-					<group>RX65N</group>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas/RX600v2</path>
-				</incdir>
-				<incdir>
-					<toolchain>RXC</toolchain>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler/Renesas</path>
-				</incdir>
-				<!-- resource filter for linked files/folders -->
-				<resourcefilter>
-					<name>Common</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ports</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Demos</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/littlefs</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>*</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include|library</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls_utils</name>
-					<type>6</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>mbedtls_bio_freertos_plus_cellular.c|mbedtls_bio_freertos_plus_wifi_da16600.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/tinycrypt/lib/source</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>ecc_dsa.c|ecc.c|sha256.c|utils.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/network_transport/sockets_wrapper/ports</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>freertos_plus_tcp</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ota-for-aws-iot-embedded-sdk|Fleet-Provisioning-for-AWS-IoT-embedded-sdk</folder>
-						<!-- <folder>ota-for-aws-iot-embedded-sdk</folder> -->
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/Fleet-Provisioning-for-AWS-IoT-embedded-sdk</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/ota-for-aws-iot-embedded-sdk</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>dependency</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/portable/os</name>
-					<type>6</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>ota_os_posix.c|ota_os_posix.h</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>backoffAlgorithm|coreJSON|coreMQTT|coreMQTT-Agent|corePKCS11|FreeRTOS-Kernel|FreeRTOS-Plus-TCP|FreeRTOS-Plus-CLI</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/backoffAlgorithm</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<casesensitive>false</casesensitive>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreJSON</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent/source</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>dependency</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11/source/portable</name>
-					<type>13</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>mbedtls</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas|MemMang</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/MemMang</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>heap_4.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<series>RX600</series>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX600v2</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/BufferManagement</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>BufferAllocation_2.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<toolchain>RXC</toolchain>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/NetworkInterface</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>wifi</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>src/application_code/ports</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>pkcs11</folder>
-					</arguments>
-				</resourcefilter>
-				<!-- template section -->
-				<scfgtemplate>
-					<path>configuration/samples/common/ck-rx65n_ota/ether/CK-RX65N_ether_scfg.ftl</path>
-				</scfgtemplate>
-				<!-- linker section -->
-				<sections>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<section>
-						<name>SU</name>
-						<name>SI</name>
-						<name>R_1</name>
-						<name>B_2</name>
-						<name>R</name>
-						<name>RPFRAM2</name>
-						<address>0x00000004</address>
-					</section>
-					<section>
-						<name>C_LITTLEFS_MANAGEMENT_AREA</name>
-						<address>0x00100000</address>
-					</section>
-					<section>
-						<name>C_USER_APPLICATION_AREA</name>
-						<address>0x00102300</address>
-					</section>
-					<section>
-						<name>B_ETHERNET_BUFFERS*</name>
-						<name>B_RX_DESC*</name>
-						<name>B_TX_DESC*</name>
-						<name>B</name>
-						<name>B_1</name>
-						<name>R_2</name>
-						<address>0x00800000</address>
-					</section>
-					<section>
-						<name>PResetPRG</name>
-						<name>C_1</name>
-						<name>C_2</name>
-						<name>C</name>
-						<name>C$*</name>
-						<name>D*</name>
-						<name>W*</name>
-						<name>L</name>
-						<name>P</name>
-						<name>PFRAM2</name>
-						<address>0xFFF00300</address>
-					</section>
-					<section>
-						<name>EXCEPTVECT</name>
-						<address>0xFFFEFF80</address>
-					</section>
-					<section>
-						<name>RESETVECT</name>
-						<address>0xFFFEFFFC</address>
-					</section>
-				</sections>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.gOptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.assembler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.assembler.option.goptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize.all</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.converter</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.separated.form.motorolaFile</optionid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.outputHexFile</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.common</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch.none</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.nomessage</optionid>
-					<value>11174,21644,20010,23034,23035,20177,23033</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.useCustomLinkageOrder</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWchar</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWcType</optionid>
-					<value>true</value>
-				</option>
-				<!-- RXC standard library -->
-				<standardlibrary>
-					<toolchain>RXC</toolchain>
-					<libname>ctype.h</libname>
-					<libname>math.h</libname>
-					<libname>mathf.h</libname>
-					<libname>stdarg.h</libname>
-					<libname>stdio.h</libname>
-					<libname>stdlib.h</libname>
-					<libname>string.h</libname>
-					<libname>new.h</libname>
-					<libname>fenv.h</libname>
-					<libname>inttypes.h</libname>
-					<libname>ctype.h</libname>
-				</standardlibrary>
-				<!-- Macro definition -->
-				<macrodefinition>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<compiler>MBEDTLS_CONFIG_FILE=&lt;&quot;aws_mbedtls_config.h&quot;&gt;</compiler>
-					<compiler>CONFIG_MEDTLS_USE_AFR_MEMORY</compiler>
-					<compiler>MBEDTLS_CMAC_C</compiler>
-					<compiler>MBEDTLS_ERROR_C</compiler>
-					<compiler>MBEDTLS_THREADING_C</compiler>
-					<compiler>MBEDTLS_ALLOW_PRIVATE_ACCESS</compiler>
-					<compiler>__LITTLE_ENDIAN__</compiler>
-				</macrodefinition>
-			</app>
-			<app id="application" value="fleet_pso_cell" name="(Cellular) PubSub/MQTT with Fleet Provisioning and Over-the-air (OTA) update sample project" description="This demonstration illustrates Fleet provisioning functionality followed by PubSub and OTA update (simultaneously) using AWS services with Cellular(RYZ014A) connection. Note: This project requires bootloader project.">
-				<toolchain>RXC</toolchain>
-				<board>CK-RX65N(DUAL)</board>
-				<board>CK-RX65N</board>
-				<!-- impdir section -->
-				<impdir>
-					<folder>configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config</folder>
-					<path>src/frtos_config</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_ryz014a_ck_rx65n/e2studio_ccrx/src/application_code/main.c</file>
-					<file>Projects/aws_ryz014a_ck_rx65n/e2studio_ccrx/src/application_code/user_init.c</file>
-					<path>src/application_code</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_ryz014a_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.h</file>
-					<file>Projects/aws_ryz014a_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.c</file>
-					<path>src/frtos_startup</path>
-				</impdir>
-				<impdir>
-					<folder>Projects/aws_ryz014a_ck_rx65n/e2studio_ccrx/src/smc_gen/r_fwup</folder>
-					<path>src/smc_gen/r_fwup</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/fleet_pso/ck-rx65n/cellular/linker_section_sample.esi</file>
-					<path>src</path>
-				</impdir>
-				<impdir>
-					<folder>configuration/samples/common/ck-rx65n/cellular/src/smc_gen</folder>
-					<path>src/smc_gen</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/common/ck-rx65n_ota/cellular/src/smc_gen/r_config/r_fwup_config.h</file>
-					<path>src/smc_gen/r_config</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/common/ck-rx65n/cellular/README.md</file>
-					<path>.</path>
-				</impdir>
-				<!-- linkdir section -->
-				<linkdir>
-					<folder linkedfolder="true">Common</folder>
-					<path>Common</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Common/ports</folder>
-					<path>src/application_code/ports</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos</folder>
-					<path>Demos</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Middleware</folder>
-					<path>Middleware</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos/include</folder>
-					<path>src/application_code/include</path>
-				</linkdir>
-				<!-- incdir section -->
-				<incdir>
-					<path>src/smc_gen/r_bsp</path>
-					<path>src/smc_gen/general</path>
-					<path>src/smc_gen/r_config</path>
-					<path>src/smc_gen/r_pincfg</path>
-					<path>src/smc_gen/r_ether_rx</path>
-					<path>src/smc_gen/r_s12ad_rx</path>
-					<path>src/smc_gen/r_s12ad_rx/src</path>
-					<path>src/smc_gen/r_sci_rx</path>
-					<path>src/smc_gen/r_sci_rx/src</path>
-					<path>src/smc_gen/r_byteq</path>
-					<path>src/smc_gen/r_byteq/src</path>
-					<path>src/smc_gen/r_fwup</path>
-					<path>src/smc_gen/r_fwup/src</path>
-					<path>src/smc_gen/r_irq_rx</path>
-					<path>src/smc_gen/r_irq_rx/src</path>
-					<path>src/smc_gen/r_flash_rx</path>
-					<path>src/smc_gen/r_flash_rx/src</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_1</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_3</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_4</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_5</path>
-					<path>src/smc_gen/r_flash_rx/src/targets</path>
-					<path>src/smc_gen/r_cellular/src/RTOS/include</path>
-					<path>src/smc_gen/r_cellular/src/private/include</path>
-					<path>src/smc_gen/r_cellular/src/private/private_api/include</path>
-					<path>src/smc_gen/r_cellular/src/include</path>
-					<path>src/smc_gen/r_cellular/src/include/ryz014</path>
-					<path>src/smc_gen/r_cellular/src/include/ryz014/include</path>
-					<path>src/smc_gen/r_tsip_rx</path>
-					<path>Common/FreeRTOS_common</path>
-					<path>Common/littlefs_common</path>
-					<path>Common/littlefs_common/rm_littlefs_df/targets/rx65n</path>
-					<path>Common/common_api</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx/implicitlyinclude.h</path>
-					<path>Demos/cli</path>
-					<path>Demos/mqtt_agent</path>
-					<path>Demos/OtaOverMqtt</path>
-					<path>Demos/common/pkcs11_helpers</path>
-					<path>Demos/dev_mode_key_provisioning/include</path>
-					<path>Demos/common/mqtt-agent-interface/include</path>
-					<path>Demos/common/mqtt-agent-interface</path>
-					<path>Demos/common/Mqtt_Demo_Helpers</path>
-					<path>Demos/Fleet_Provisioning_With_CSR_Demo</path>
-					<path>Middleware/freertos_plus/standard/crypto/include</path>
-					<path>Middleware/logging/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/include</path>
-					<path>Middleware/FreeRTOS-Plus-CLI</path>
-					<path>Middleware/FreeRTOS/coreMQTT/source/include</path>
-					<path>Middleware/FreeRTOS/coreMQTT/source/interface</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/include</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/portable</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/portable/os</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source</path>
-					<path>Middleware/3rdparty/tinycbor/src</path>
-					<path>Middleware/3rdparty/tinycrypt/lib/include</path>
-					<path>Middleware/FreeRTOS/coreJSON/source/include</path>
-					<path>Middleware/FreeRTOS/coreMQTT-Agent/source/include</path>
-					<path>Middleware/FreeRTOS/backoffAlgorithm/source/include</path>
-					<path>Middleware/network_transport/using_mbedtls_pkcs11</path>
-					<path>Middleware/pkcs11/published/2-40-errata-1</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/include</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/dependency/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/littlefs</path>
-					<path>Middleware/3rdparty/base64_decode</path>
-					<path>Middleware/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/mbedtls/include/mbedtls</path>
-					<path>Middleware/3rdparty/mbedtls/include</path>
-					<path>Middleware/3rdparty/mbedtls/library</path>
-					<path>Middleware/3rdparty/mbedtls_config</path>
-					<path>Middleware/network_transport/sockets_wrapper/include</path>
-					<path>Middleware/AWS/Fleet-Provisioning-for-AWS-IoT-embedded-sdk/source/include</path>
-					<path>src/application_code</path>
-					<path>src/application_code/include</path>
-					<path>src/application_code/ports/ota_pal</path>
-					<path>src/frtos_config</path>
-					<path>src/frtos_startup</path>
-				</incdir>
-				<incdir>
-					<series>RX600</series>
-					<group>RX65N</group>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas/RX600v2</path>
-				</incdir>
-				<incdir>
-					<toolchain>RXC</toolchain>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler/Renesas</path>
-				</incdir>
-				<!-- resource filter for linked files/folders -->
-				<resourcefilter>
-					<name>Common</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ports</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Common/FreeRTOS_common</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>network_support</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Demos</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/littlefs</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>*</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include|library</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls_utils</name>
-					<type>6</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>mbedtls_bio_tcp_sockets_wrapper.c|mbedtls_bio_freertos_plus_wifi_da16600.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/tinycrypt/lib/source</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>ecc_dsa.c|ecc.c|sha256.c|utils.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/network_transport/sockets_wrapper/ports</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>cellular_ryz014a</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ota-for-aws-iot-embedded-sdk|Fleet-Provisioning-for-AWS-IoT-embedded-sdk</folder>
-						<!-- <folder>ota-for-aws-iot-embedded-sdk</folder> -->
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/Fleet-Provisioning-for-AWS-IoT-embedded-sdk</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/ota-for-aws-iot-embedded-sdk</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>dependency</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/portable/os</name>
-					<type>6</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>ota_os_posix.c|ota_os_posix.h</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/pkcs11</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>published</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>backoffAlgorithm|coreJSON|coreMQTT|coreMQTT-Agent|corePKCS11|FreeRTOS-Kernel|FreeRTOS-Plus-CLI</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/backoffAlgorithm</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<casesensitive>false</casesensitive>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreJSON</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent/source</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>dependency</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11/source/portable</name>
-					<type>13</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>mbedtls</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas|MemMang</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/MemMang</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>heap_4.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<series>RX600</series>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX600v2</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/BufferManagement</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>BufferAllocation_2.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<toolchain>RXC</toolchain>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/NetworkInterface</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>wifi</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>src/application_code/ports</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>pkcs11</folder>
-					</arguments>
-				</resourcefilter>
-				<!-- template section -->
-				<scfgtemplate>
-					<path>configuration/samples/common/ck-rx65n_ota/cellular/CK-RX65N_cellular_scfg.ftl</path>
-				</scfgtemplate>
-				<!-- linker section -->
-				<sections>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<section>
-						<name>SU</name>
-						<name>SI</name>
-						<name>R_1</name>
-						<name>B_2</name>
-						<name>R</name>
-						<name>RPFRAM2</name>
-						<address>0x00000004</address>
-					</section>
-					<section>
-						<name>C_LITTLEFS_MANAGEMENT_AREA</name>
-						<address>0x00100000</address>
-					</section>
-					<section>
-						<name>C_USER_APPLICATION_AREA</name>
-						<address>0x00102300</address>
-					</section>
-					<section>
-						<name>B</name>
-						<name>B_1</name>
-						<name>R_2</name>
-						<address>0x00800000</address>
-					</section>
-					<section>
-						<name>PResetPRG</name>
-						<name>C_1</name>
-						<name>C_2</name>
-						<name>C</name>
-						<name>C$*</name>
-						<name>D*</name>
-						<name>W*</name>
-						<name>L</name>
-						<name>P</name>
-						<name>PFRAM2</name>
-						<address>0xFFF00300</address>
-					</section>
-					<section>
-						<name>EXCEPTVECT</name>
-						<address>0xFFFEFF80</address>
-					</section>
-					<section>
-						<name>RESETVECT</name>
-						<address>0xFFFEFFFC</address>
-					</section>
-				</sections>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.gOptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.assembler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.assembler.option.goptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize.all</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.converter</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.separated.form.motorolaFile</optionid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.outputHexFile</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.common</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch.none</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.nomessage</optionid>
-					<value>11174,21644,20010,23034,23035,20177,23033</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.useCustomLinkageOrder</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWchar</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWcType</optionid>
-					<value>true</value>
-				</option>
-				<!-- RXC standard library -->
-				<standardlibrary>
-					<toolchain>RXC</toolchain>
-					<libname>ctype.h</libname>
-					<libname>math.h</libname>
-					<libname>mathf.h</libname>
-					<libname>stdarg.h</libname>
-					<libname>stdio.h</libname>
-					<libname>stdlib.h</libname>
-					<libname>string.h</libname>
-					<libname>new.h</libname>
-					<libname>fenv.h</libname>
-					<libname>inttypes.h</libname>
-					<libname>ctype.h</libname>
-				</standardlibrary>
-				<!-- Macro definition -->
-				<macrodefinition>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N(DUAL)</board>
-					<board>CK-RX65N</board>
-					<compiler>MBEDTLS_CONFIG_FILE=&lt;&quot;aws_mbedtls_config.h&quot;&gt;</compiler>
-					<compiler>CONFIG_MEDTLS_USE_AFR_MEMORY</compiler>
-					<compiler>MBEDTLS_CMAC_C</compiler>
-					<compiler>MBEDTLS_ERROR_C</compiler>
-					<compiler>MBEDTLS_THREADING_C</compiler>
-					<compiler>MBEDTLS_ALLOW_PRIVATE_ACCESS</compiler>
-					<compiler>__LITTLE_ENDIAN__</compiler>
-				</macrodefinition>
-			</app>
-			<app id="application" value="fleet_pso_wifi" name="(Wi-Fi) PubSub/MQTT with Fleet Provisioning and Over-the-air (OTA) update sample project" description="This demonstration illustrates Fleet provisioning functionality followed by PubSub and OTA update (simultaneously) using AWS services with Wi-Fi(DA16600) connection. Note: This project requires bootloader project.">
-				<toolchain>RXC</toolchain>
-				<board>CK-RX65N-V2(DUAL)</board>
-				<board>CK-RX65N-V2</board>
-				<!-- impdir section -->
-				<impdir>
-					<folder>configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config</folder>
-					<path>src/frtos_config</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/application_code/main.c</file>
-					<file>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/application_code/user_init.c</file>
-					<path>src/application_code</path>
-				</impdir>
-				<impdir>
-					<file>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.h</file>
-					<file>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/frtos_startup/freertos_start.c</file>
-					<path>src/frtos_startup</path>
-				</impdir>
-				<impdir>
-					<folder>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/smc_gen/r_wifi_da16xxx</folder>
-					<path>src/smc_gen/r_wifi_da16xxx</path>
-				</impdir>
-				<impdir>
-					<folder>Projects/aws_da16600_ck_rx65n/e2studio_ccrx/src/smc_gen/r_fwup</folder>
-					<path>src/smc_gen/r_fwup</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/fleet_pso/ck-rx65n/wifi/linker_section_sample.esi</file>
-					<path>src</path>
-				</impdir>
-				<impdir>
-					<file>configuration/samples/common/ck-rx65n/wifi/README.md</file>
-					<path>.</path>
-				</impdir>
-				<!-- linkdir section -->
-				<linkdir>
-					<folder linkedfolder="true">Common</folder>
-					<path>Common</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Common/ports</folder>
-					<path>src/application_code/ports</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos</folder>
-					<path>Demos</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Middleware</folder>
-					<path>Middleware</path>
-				</linkdir>
-				<linkdir>
-					<folder linkedfolder="true">Demos/include</folder>
-					<path>src/application_code/include</path>
-				</linkdir>
-				<!-- incdir section -->
-				<incdir>
-					<path>src/smc_gen/r_bsp</path>
-					<path>src/smc_gen/general</path>
-					<path>src/smc_gen/r_config</path>
-					<path>src/smc_gen/r_pincfg</path>
-					<path>src/smc_gen/r_ether_rx</path>
-					<path>src/smc_gen/r_s12ad_rx</path>
-					<path>src/smc_gen/r_s12ad_rx/src</path>
-					<path>src/smc_gen/r_sci_rx</path>
-					<path>src/smc_gen/r_sci_rx/src</path>
-					<path>src/smc_gen/r_byteq</path>
-					<path>src/smc_gen/r_byteq/src</path>
-					<path>src/smc_gen/r_fwup</path>
-					<path>src/smc_gen/r_fwup/src</path>
-					<path>src/smc_gen/r_irq_rx</path>
-					<path>src/smc_gen/r_irq_rx/src</path>
-					<path>src/smc_gen/r_flash_rx</path>
-					<path>src/smc_gen/r_flash_rx/src</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_1</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_3</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_4</path>
-					<path>src/smc_gen/r_flash_rx/src/flash_type_5</path>
-					<path>src/smc_gen/r_flash_rx/src/targets</path>
-					<path>src/smc_gen/r_wifi_da16xxx/src</path>
-					<path>src/smc_gen/r_wifi_da16xxx</path>
-					<path>src/smc_gen/r_tsip_rx</path>
-					<path>Common/FreeRTOS_common</path>
-					<path>Common/littlefs_common</path>
-					<path>Common/littlefs_common/rm_littlefs_df/targets/rx65n</path>
-					<path>Common/common_api</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx</path>
-					<path>Common/FreeRTOS_common/compiler_support/ccrx/implicitlyinclude.h</path>
-					<path>Demos/cli</path>
-					<path>Demos/mqtt_agent</path>
-					<path>Demos/OtaOverMqtt</path>
-					<path>Demos/common/pkcs11_helpers</path>
-					<path>Demos/dev_mode_key_provisioning/include</path>
-					<path>Demos/common/mqtt-agent-interface/include</path>
-					<path>Demos/common/mqtt-agent-interface</path>
-					<path>Demos/common/Mqtt_Demo_Helpers</path>
-					<path>Demos/Fleet_Provisioning_With_CSR_Demo</path>
-					<path>Middleware/freertos_plus/standard/crypto/include</path>
-					<path>Middleware/logging/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/include</path>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/include</path>
-					<path>Middleware/FreeRTOS-Plus-CLI</path>
-					<path>Middleware/FreeRTOS/coreMQTT/source/include</path>
-					<path>Middleware/FreeRTOS/coreMQTT/source/interface</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/include</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/portable</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/portable/os</path>
-					<path>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source</path>
-					<path>Middleware/3rdparty/tinycbor/src</path>
-					<path>Middleware/3rdparty/tinycrypt/lib/include</path>
-					<path>Middleware/FreeRTOS/coreJSON/source/include</path>
-					<path>Middleware/FreeRTOS/coreMQTT-Agent/source/include</path>
-					<path>Middleware/FreeRTOS/backoffAlgorithm/source/include</path>
-					<path>Middleware/network_transport/using_mbedtls_pkcs11</path>
-					<path>Middleware/pkcs11/published/2-40-errata-1</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/include</path>
-					<path>Middleware/FreeRTOS/corePKCS11/source/dependency/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/littlefs</path>
-					<path>Middleware/3rdparty/base64_decode</path>
-					<path>Middleware/3rdparty/mbedtls_utils</path>
-					<path>Middleware/3rdparty/mbedtls/include/mbedtls</path>
-					<path>Middleware/3rdparty/mbedtls/include</path>
-					<path>Middleware/3rdparty/mbedtls/library</path>
-					<path>Middleware/3rdparty/mbedtls_config</path>
-					<path>Middleware/network_transport/sockets_wrapper/include</path>
-					<path>Middleware/AWS/Fleet-Provisioning-for-AWS-IoT-embedded-sdk/source/include</path>
-					<path>Middleware/wifi/include</path>
-					<path>src/application_code</path>
-					<path>src/application_code/include</path>
-					<path>src/application_code/ports/ota_pal</path>
-					<path>src/frtos_config</path>
-					<path>src/frtos_startup</path>
-				</incdir>
-				<incdir>
-					<series>RX600</series>
-					<group>RX65N</group>
-					<path>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas/RX600v2</path>
-				</incdir>
-				<incdir>
-					<toolchain>RXC</toolchain>
-					<path>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler/Renesas</path>
-				</incdir>
-				<!-- resource filter for linked files/folders -->
-				<resourcefilter>
-					<name>Common</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ports</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Common/FreeRTOS_common</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>network_support</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Demos</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/littlefs</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>*</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include|library</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/mbedtls_utils</name>
-					<type>6</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>mbedtls_bio_freertos_plus_cellular.c|mbedtls_bio_tcp_sockets_wrapper.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/3rdparty/tinycrypt/lib/source</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>ecc_dsa.c|ecc.c|sha256.c|utils.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/network_transport/sockets_wrapper/ports</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>wifi_da16600</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>ota-for-aws-iot-embedded-sdk|Fleet-Provisioning-for-AWS-IoT-embedded-sdk</folder>
-						<!-- <folder>ota-for-aws-iot-embedded-sdk</folder> -->
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/Fleet-Provisioning-for-AWS-IoT-embedded-sdk</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/ota-for-aws-iot-embedded-sdk</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>dependency</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/AWS/ota-for-aws-iot-embedded-sdk/source/portable/os</name>
-					<type>6</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>ota_os_posix.c|ota_os_posix.h</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/pkcs11</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>published</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>backoffAlgorithm|coreJSON|coreMQTT|coreMQTT-Agent|corePKCS11|FreeRTOS-Kernel|FreeRTOS-Plus-CLI</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/backoffAlgorithm</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<casesensitive>false</casesensitive>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreJSON</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>source</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/coreMQTT-Agent/source</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>dependency</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/corePKCS11/source/portable</name>
-					<type>13</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>mbedtls</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas|MemMang</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/MemMang</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>heap_4.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<series>RX600</series>
-					<name>Middleware/FreeRTOS/FreeRTOS-Kernel/portable/Renesas</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX600v2</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/BufferManagement</name>
-					<type>5</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<file>BufferAllocation_2.c</file>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<toolchain>RXC</toolchain>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/Compiler</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>Renesas</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/FreeRTOS/FreeRTOS-Plus-TCP/source/portable/NetworkInterface</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>RX</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>Middleware/wifi</name>
-					<type>9</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>true</regularexpression>
-						<folder>include|ports</folder>
-					</arguments>
-				</resourcefilter>
-				<resourcefilter>
-					<name>src/application_code/ports</name>
-					<type>10</type>
-					<arguments>
-						<key>name</key>
-						<regularexpression>false</regularexpression>
-						<folder>pkcs11</folder>
-					</arguments>
-				</resourcefilter>
-				<!-- template section -->
-				<scfgtemplate>
-					<path>configuration/samples/common/ck-rx65n_ota/wifi/CK-RX65N_wifi_scfg.ftl</path>
-				</scfgtemplate>
-				<!-- linker section -->
-				<sections>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N-V2(DUAL)</board>
-					<board>CK-RX65N-V2</board>
-					<section>
-						<name>SU</name>
-						<name>SI</name>
-						<name>R_1</name>
-						<name>B_2</name>
-						<name>R</name>
-						<name>RPFRAM2</name>
-						<address>0x00000004</address>
-					</section>
-					<section>
-						<name>C_LITTLEFS_MANAGEMENT_AREA</name>
-						<address>0x00100000</address>
-					</section>
-					<section>
-						<name>C_USER_APPLICATION_AREA</name>
-						<address>0x00102300</address>
-					</section>
-					<section>
-						<name>B</name>
-						<name>B_1</name>
-						<name>R_2</name>
-						<address>0x00800000</address>
-					</section>
-					<section>
-						<name>PResetPRG</name>
-						<name>C_1</name>
-						<name>C_2</name>
-						<name>C</name>
-						<name>C$*</name>
-						<name>D*</name>
-						<name>W*</name>
-						<name>L</name>
-						<name>P</name>
-						<name>PFRAM2</name>
-						<address>0xFFF00300</address>
-					</section>
-					<section>
-						<name>EXCEPTVECT</name>
-						<address>0xFFFEFF80</address>
-					</section>
-					<section>
-						<name>RESETVECT</name>
-						<address>0xFFFEFFFC</address>
-					</section>
-				</sections>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.gOptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.assembler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.assembler.option.goptimize</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.optimize.all</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.converter</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.separated.form.motorolaFile</optionid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.converter.option.outputHexFile</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.common</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch</optionid>
-					<value>com.renesas.cdt.managedbuild.renesas.ccrx.common.option.branch.none</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.compiler</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.nomessage</optionid>
-					<value>11174,21644,20010,23034,23035,20177,23033</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.linker</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.linker.option.useCustomLinkageOrder</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWchar</optionid>
-					<value>true</value>
-				</option>
-				<option>
-					<toolid>com.renesas.cdt.managedbuild.renesas.ccrx.base.librarian</toolid>
-					<optionid>com.renesas.cdt.managedbuild.renesas.ccrx.librarian.option.headWcType</optionid>
-					<value>true</value>
-				</option>
-				<!-- RXC standard library -->
-				<standardlibrary>
-					<toolchain>RXC</toolchain>
-					<libname>ctype.h</libname>
-					<libname>math.h</libname>
-					<libname>mathf.h</libname>
-					<libname>stdarg.h</libname>
-					<libname>stdio.h</libname>
-					<libname>stdlib.h</libname>
-					<libname>string.h</libname>
-					<libname>new.h</libname>
-					<libname>fenv.h</libname>
-					<libname>inttypes.h</libname>
-					<libname>ctype.h</libname>
-				</standardlibrary>
-				<!-- Macro definition -->
-				<macrodefinition>
-					<toolchain>RXC</toolchain>
-					<board>CK-RX65N-V2(DUAL)</board>
-					<board>CK-RX65N-V2</board>
-					<compiler>MBEDTLS_CONFIG_FILE=&lt;&quot;aws_mbedtls_config.h&quot;&gt;</compiler>
-					<compiler>CONFIG_MEDTLS_USE_AFR_MEMORY</compiler>
-					<compiler>MBEDTLS_CMAC_C</compiler>
-					<compiler>MBEDTLS_ERROR_C</compiler>
-					<compiler>MBEDTLS_THREADING_C</compiler>
-					<compiler>MBEDTLS_ALLOW_PRIVATE_ACCESS</compiler>
-					<compiler>__LITTLE_ENDIAN__</compiler>
-				</macrodefinition>
-			</app>
-		</apps>
-		<!-- Open readme file -->
-		<openfile>
-			<path>README.md</path>
-		</openfile>
-	</package>
-</refinfo>
diff --git a/Configuration/samples/bootloader/ck-rx65n-v2/CK-RX65N_boot_loader_scfg.ftl b/Configuration/samples/bootloader/ck-rx65n-v2/CK-RX65N_boot_loader_scfg.ftl
deleted file mode 100644
index d0210d22..00000000
--- a/Configuration/samples/bootloader/ck-rx65n-v2/CK-RX65N_boot_loader_scfg.ftl
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<smc>
-    <general version="2.0.0.0">
-        <configuration active="true" id="${configurationTypeReleaseID}">
-            <property id="com.renesas.smc.service.project.buildArtefactType" values="com.renesas.smc.service.project.buildArtefactType.exe"/>
-            <toolchain id="${toolChainID}">
-                <option id="com.renesas.smc.toolchain.option.buildArtefactType" key="com.renesas.smc.toolchain.option.buildArtefactType.exe"/>
-                <option id="com.renesas.smc.toolchain.option.rtos" key="com.renesas.smc.toolchain.option.rtos.none">
-                </option>
-            </toolchain>
-        </configuration>
-        <platform id="${targetDevice}"/>
-    </general>
-    <tool id="SWComponent" version="1.0.0.0">
-        <configuration inuse="true" name="r_byteq">
-            <component description="Dependency : r_bsp version(s) 6.20&#10;This module allocates a queue control block in an Open() call to handle indexing for buffers provided by the user application. Additional functions are provided to put and get data from the buffer queue, inspect the number of bytes available or in use, and to flush the queue. There is no limit to the number of queues supported, and queue control blocks can be allocated statically at build time or dynamically at run time." detailDescription="Byte-based circular buffer library." display="r_byteq" id="r_byteq2.00" version="2.00">
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_bsp">
-            <component display="r_bsp" id="r_bsp7.20" version="7.20">
-                <gridItem id="BSP_CFG_USER_CHARPUT_ENABLED" selectedIndex="1"/>
-                <gridItem id="BSP_CFG_PARAM_CHECKING_ENABLE" selectedIndex="0"/>
-                <gridItem id="BSP_CFG_SCI_UART_TERMINAL_ENABLE" selectedIndex="1"/>
-                <gridItem id="BSP_CFG_SCI_UART_TERMINAL_CHANNEL" selectedIndex="5"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_sci_rx">
-            <component detailDescription="Multi-Channel Multi-Mode SCI Driver." display="r_sci_rx" id="r_sci_rx4.40" version="4.40">
-                <gridItem id="RXD5/SMISO5/SSCL5" selectedIndex="1"/>
-                <gridItem id="TXD5/SMOSI5/SSDA5" selectedIndex="1"/>
-                <gridItem id="SCI5" selectedIndex="1"/>
-                <gridItem id="SCI_CFG_CH1_INCLUDED" selectedIndex="0"/>
-                <gridItem id="SCI_CFG_CH5_INCLUDED" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_fwup">
-            <component description="Dependency : r_flash_rx version(s) 4.80, 4.91&#10;This module is a software library for implementing the firmware update function in user applications." detailDescription="FWUP Library" display="r_fwup" id="r_fwup2.01" version="2.01">
-                <gridItem id="FWUP_CFG_UPDATE_MODE" selectedIndex="0"/>
-                <gridItem id="FWUP_CFG_MAIN_AREA_ADDR_L" selectedIndex="0xFFF00000U"/>
-                <gridItem id="FWUP_CFG_BUF_AREA_ADDR_L" selectedIndex="0xFFE00000U"/>
-                <gridItem id="FWUP_CFG_AREA_SIZE" selectedIndex="0xF0000U"/>
-                <gridItem id="FWUP_CFG_CF_BLK_SIZE" selectedIndex="0x8000U"/>
-                <gridItem id="FWUP_CFG_CF_W_UNIT_SIZE" selectedIndex="128U"/>
-                <gridItem id="FWUP_CFG_EXT_BUF_AREA_ADDR_L" selectedIndex="0x00000U"/>
-                <gridItem id="FWUP_CFG_EXT_BUF_AREA_BLK_SIZE" selectedIndex="4096U"/>
-                <gridItem id="FWUP_CFG_DF_BLK_SIZE" selectedIndex="64U"/>
-                <gridItem id="FWUP_CFG_DF_NUM_BLKS" selectedIndex="512U"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_flash_rx">
-            <component description="Dependency : r_bsp version(s) 5.20, 5.30, 5.40, 5.50, 5.52, 6.10, 6.20, 6.21, 7.00, 7.10, 7.20, 7.30&#10;This module allows the user to program, erase, write and blankcheck the Code and/or Data flash." detailDescription="Flash API for RX100, RX200, RX600. and RX700." display="r_flash_rx" id="r_flash_rx5.00" version="5.00">
-                <gridItem id="FLASH_CFG_CODE_FLASH_ENABLE" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_CODE_FLASH_RUN_FROM_ROM" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-    </tool>
-</smc>
diff --git a/Configuration/samples/bootloader/ck-rx65n-v2/linker_section_sample.esi b/Configuration/samples/bootloader/ck-rx65n-v2/linker_section_sample.esi
deleted file mode 100644
index e4e72257..00000000
--- a/Configuration/samples/bootloader/ck-rx65n-v2/linker_section_sample.esi
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<com.renesas.linkersection.model:SectionContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:com.renesas.linkersection.model="http:///LinkerSection.ecore">
-  <sections name="SU">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4"/>
-  </sections>
-  <sections name="SI"/>
-  <sections name="B_1"/>
-  <sections name="R_1"/>
-  <sections name="B_2"/>
-  <sections name="R_2"/>
-  <sections name="B"/>
-  <sections name="R"/>
-  <sections name="RPFRAM2"/>
-  <sections name="C_1">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294901760"/>
-  </sections>
-  <sections name="C_2"/>
-  <sections name="C"/>
-  <sections name="C$*"/>
-  <sections name="D*"/>
-  <sections name="W*"/>
-  <sections name="L"/>
-  <sections name="P*"/>
-  <sections name="PFRAM2"/>
-  <sections name="EXCEPTVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294967168"/>
-  </sections>
-  <sections name="RESETVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294967292"/>
-  </sections>
-</com.renesas.linkersection.model:SectionContainer>
diff --git a/Configuration/samples/bootloader/ck-rx65n-v2/src/smc_gen/r_config/r_bsp_config.h b/Configuration/samples/bootloader/ck-rx65n-v2/src/smc_gen/r_config/r_bsp_config.h
deleted file mode 100644
index 06f948bc..00000000
--- a/Configuration/samples/bootloader/ck-rx65n-v2/src/smc_gen/r_config/r_bsp_config.h
+++ /dev/null
@@ -1,743 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer
-*
-* Copyright (C) 2017 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name    : r_bsp_config_reference.h
-* Device(s)    : RX65N
-* Description  : The file r_bsp_config.h is used to configure your BSP. r_bsp_config.h should be included
-*                somewhere in your package so that the r_bsp code has access to it. This file (r_bsp_config_reference.h)
-*                is just a reference file that the user can use to make their own r_bsp_config.h file.
-************************************************************************************************************************
-* History : DD.MM.YYYY Version   Description
-*         : 15.05.2017 1.00      First Release
-*         : 01.12.2017 1.01      Added the following macro definition.
-*                                - BSP_CFG_EBMAPCR_1ST_PRIORITY
-*                                - BSP_CFG_EBMAPCR_2ND_PRIORITY
-*                                - BSP_CFG_EBMAPCR_3RD_PRIORITY
-*                                - BSP_CFG_EBMAPCR_4TH_PRIORITY
-*                                - BSP_CFG_EBMAPCR_5TH_PRIORITY
-*         : 01.07.2018 1.02      Added the following macro definition.
-*                                - BSP_CFG_CONFIGURATOR_SELECT
-*                                Add RTOS support. FreeRTOS. Define a timer for RTOS.
-*         : 27.07.2018 1.03      Modified the comment of PLL clock source.
-*                                Added the following macro definition for ID code protection.
-*                                 - BSP_CFG_ID_CODE_LONG_1
-*                                 - BSP_CFG_ID_CODE_LONG_2
-*                                 - BSP_CFG_ID_CODE_LONG_3
-*                                 - BSP_CFG_ID_CODE_LONG_4
-*                                Added the following macro definition.
-*                                 - BSP_CFG_FIT_IPL_MAX
-*         : 31.10.2018 1.04      Added support for RX651 with 64 pin package.
-*         : 28.02.2019 2.00      Added support for GNUC and ICCRX.
-*                                Fixed coding style.
-*         : 26.07.2019 2.01      Modified comment.
-*         : 08.10.2019 2.02      Added the following macro definition.
-*                                - BSP_CFG_SWINT_UNIT1_ENABLE
-*                                - BSP_CFG_SWINT_UNIT2_ENABLE
-*                                - BSP_CFG_SWINT_TASK_BUFFER_NUMBER
-*                                - BSP_CFG_SWINT_IPR_INITIAL_VALUE
-*                                Modified comment for added support of Renesas RTOS (RI600V4 or RI600PX).
-*                                Added the following macro definition.
-*                                - BSP_CFG_RENESAS_RTOS_USED
-*         : 31.07.2020 2.03      Modified comment.
-*         : 29.01.2021 2.04      Added the following macro definition.
-*                                - BSP_CFG_SCI_UART_TERMINAL_ENABLE
-*                                - BSP_CFG_SCI_UART_TERMINAL_CHANNEL
-*                                - BSP_CFG_SCI_UART_TERMINAL_BITRATE
-*                                - BSP_CFG_SCI_UART_TERMINAL_INTERRUPT_PRIORITY
-*         : 26.02.2021 2.05      Added a comment for Azure RTOS to BSP_CFG_RTOS_USED.
-*         : 30.11.2021 3.00      Added the following macro definitions.
-*                                - BSP_CFG_MAIN_CLOCK_OSCILLATE_ENABLE
-*                                - BSP_CFG_SUB_CLOCK_OSCILLATE_ENABLE
-*                                - BSP_CFG_HOCO_OSCILLATE_ENABLE
-*                                - BSP_CFG_LOCO_OSCILLATE_ENABLE
-*                                - BSP_CFG_IWDT_CLOCK_OSCILLATE_ENABLE
-*                                - BSP_CFG_CONFIGURATOR_VERSION
-*                                - BSP_CFG_CPLUSPLUS
-*                                - BSP_CFG_SERIAL_PROGRAMMER_CONECT_ENABLE
-*                                Changed initial value of the following macro definitions.
-*                                - BSP_CFG_MCU_PART_GROUP
-*                                - BSP_CFG_MCU_PART_SERIES
-*         : 11.02.2022 3.01      Changed initial value of the following macro definitions.
-*                                - BSP_CFG_SWINT_UNIT1_ENABLE
-*                                - BSP_CFG_SWINT_UNIT2_ENABLE
-***********************************************************************************************************************/
-#ifndef R_BSP_CONFIG_REF_HEADER_FILE
-#define R_BSP_CONFIG_REF_HEADER_FILE
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-
-/* NOTE:
-   The default settings are the same as when using RSKRX65N-2MB.
-   Change to the settings for the user board.
-*/
-
-/* Start up select
-   0 = Enable BSP startup program.
-   1 = Disable BSP startup program. (e.g. Using user startup program.)
-   NOTE: This setting is available only when using CCRX. */
-#define BSP_CFG_STARTUP_DISABLE (0)
-
-/* Enter the product part number for your MCU. This information will be used to obtain information about your MCU such 
-   as package and memory size.
-   To help parse this information, the part number will be defined using multiple macros.
-   R 5 F 56 5N E D D FP
-   | | | |  |  | | | |  Macro Name                             Description
-   | | | |  |  | | | |__BSP_CFG_MCU_PART_PACKAGE             = Package type, number of pins, and pin pitch
-   | | | |  |  | | |____not used                             = Products with wide temperature range
-   | | | |  |  | |______BSP_CFG_MCU_PART_ENCRYPTION_INCLUDED = Encryption module included/not included
-   | | | |  |  |________BSP_CFG_MCU_PART_MEMORY_SIZE         = ROM, RAM, and Data Flash Capacity
-   | | | |  |___________BSP_CFG_MCU_PART_GROUP               = Group name
-   | | | |______________BSP_CFG_MCU_PART_SERIES              = Series name
-   | | |________________BSP_CFG_MCU_PART_MEMORY_TYPE         = Type of memory (Flash, ROMless)
-   | |__________________not used                             = Renesas MCU
-   |____________________not used                             = Renesas semiconductor product.
-*/
-
-/* Package type. Set the macro definition based on values below:
-   Character(s) = Value for macro = Package Type/Number of Pins/Pin Pitch
-   FC           = 0x0             = LFQFP/176/0.50
-   BG           = 0x1             = LFBGA/176/0.80
-   LC           = 0x2             = TFLGA/177/0.50
-   FB           = 0x3             = LFQFP/144/0.50
-   LK           = 0x4             = TFLGA/145/0.50
-   FP           = 0x5             = LFQFP/100/0.50
-   FM           = 0x8             = LFQFP/64/0.50
-   LJ           = 0xA             = TFLGA/100/0.65
-   BP           = 0xC             = TFBGA/64/0.50
-*/
-#define BSP_CFG_MCU_PART_PACKAGE        (0x3) /* Generated value. Do not edit this manually */
-
-/* Whether Encryption and SDHI/SDSI are included or not.
-   Character(s) = Value for macro = Description
-   A            = false           = Encryption module not included, SDHI/SDSI module not included
-   B            = false           = Encryption module not included, SDHI/SDSI module included
-   D            = false           = Encryption module not included, SDHI/SDSI module included, dual-bank structure
-   E            = true            = Encryption module included, SDHI/SDSI module not included
-   F            = true            = Encryption module included, SDHI/SDSI module included
-   H            = true            = Encryption module included, SDHI/SDSI module included, dual-bank structure
-*/
-#define BSP_CFG_MCU_PART_ENCRYPTION_INCLUDED   (true) /* Generated value. Do not edit this manually */
-
-/* ROM, RAM, and Data Flash Capacity.
-   Character(s) = Value for macro = ROM Size/Ram Size/Data Flash Size
-   4            = 0x4             = 512KB/256KB/Not equipped
-   7            = 0x7             = 768KB/256KB/Not equipped
-   9            = 0x9             = 1MB/256KB/Not equipped
-   C            = 0xC             = 1.5MB/640KB/32KB
-   E            = 0xE             = 2MB/640KB/32KB
-   NOTE: When the RAM capacity is 640KB, the RAM areas are not contiguous.
-*/
-#define BSP_CFG_MCU_PART_MEMORY_SIZE    (0xE) /* Generated value. Do not edit this manually */
-
-/* Group name.
-   Character(s) = Description
-   5N/51        = RX65N Group/RX651 Group
-*/
-#define BSP_CFG_MCU_PART_GROUP          "RX65N" /* Generated value. Do not edit this manually */
-
-/* Series name.
-   Character(s) = Description
-   56           = RX600 Series
-*/
-#define BSP_CFG_MCU_PART_SERIES         "RX600" /* Generated value. Do not edit this manually */
-
-/* Memory type.
-   Character(s) = Value for macro = Description
-   F            = 0x0             = Flash memory version
-*/
-#define BSP_CFG_MCU_PART_MEMORY_TYPE    (0x0) /* Generated value. Do not edit this manually */
-
-/* Whether to use 1 stack or 2. RX MCUs have the ability to use 2 stacks: an interrupt stack and a user stack.
- * When using 2 stacks the user stack will be used during normal user code. When an interrupt occurs the CPU
- * will automatically shift to using the interrupt stack. Having 2 stacks can make it easier to figure out how
- * much stack space to allocate since the user does not have to worry about always having enough room on the
- * user stack for if-and-when an interrupt occurs. Some users will not want 2 stacks though because it is not
- * needed in all applications and can lead to wasted RAM (i.e. space in between stacks that is not used).
- * If only 1 stack is used then the interrupt stack is the one that will be used. If 1 stack is chosen then
- * the user may want to remove the 'SU' section from the linker sections to remove any linker warnings.
- *
- * 0 = Use 1 stack. Disable user stack. User stack size set below will be ignored.
- * 1 = Use 2 stacks. User stack and interrupt stack will both be used.
- * NOTE: This setting is available only when using CCRX and GNUC.
- *       This is invalid when using Renesas RTOS with CCRX.
- */
-#define BSP_CFG_USER_STACK_ENABLE       (1)
-
-/* If only 1 stack is chosen using BSP_CFG_USER_STACK_ENABLE then no RAM will be allocated for the user stack. */
-#if BSP_CFG_USER_STACK_ENABLE == 1
-/* User Stack size in bytes.
- * NOTE: This setting is available only when using CCRX and GNUC.
- *       This is invalid when using Renesas RTOS with CCRX. */
-#define BSP_CFG_USTACK_BYTES            (0x1000)
-#endif
-
-/* Interrupt Stack size in bytes.
-   NOTE: This setting is available only when using CCRX and GNUC. */
-#define BSP_CFG_ISTACK_BYTES            (0x400)
-
-/* Heap size in bytes.
-   To disable the heap you must follow these steps:
-   1) Set this macro (BSP_CFG_HEAP_BYTES) to 0.
-   2) Set the macro BSP_CFG_IO_LIB_ENABLE to 0.
-   3) Disable stdio from being built into the project library. This is done by going into the Renesas RX Toolchain 
-      settings and choosing the Standard Library section. After that choose 'Contents' in e2 studio.
-      This will present a list of modules that can be included. Uncheck the box for stdio.h.
-   NOTE: This setting is available only when using CCRX and GNUC. */
-#define BSP_CFG_HEAP_BYTES              (0x400)
-
-/* Initializes C input & output library functions.
-   0 = Disable I/O library initialization in resetprg.c. If you are not using stdio then use this value.
-   1 = Enable I/O library initialization in resetprg.c. This is default and needed if you are using stdio.
-   NOTE: This setting is available only when using CCRX. */
-#define BSP_CFG_IO_LIB_ENABLE           (1)
-
-/* If desired the user may redirect the stdio charget() and/or charput() functions to their own respective functions
-   by enabling below and providing and replacing the my_sw_... function names with the names of their own functions. */
-#define BSP_CFG_USER_CHARGET_ENABLED    (0)
-#define BSP_CFG_USER_CHARGET_FUNCTION     my_sw_charget_function
-
-#define BSP_CFG_USER_CHARPUT_ENABLED    (1)
-#define BSP_CFG_USER_CHARPUT_FUNCTION     my_sw_charput_function
-
-/* After reset MCU will operate in Supervisor mode. To switch to User mode, set this macro to '1'. For more information
-   on the differences between these 2 modes see the CPU >> Processor Mode section of your MCU's hardware manual.
-   0 = Stay in Supervisor mode.
-   1 = Switch to User mode.
-   NOTE: This is invalid when using Renesas RTOS with CCRX.
-*/
-#define BSP_CFG_RUN_IN_USER_MODE        (0)
-
-/* Set your desired ID code. NOTE, leave at the default (all 0xFF's) if you do not wish to use an ID code. If you set 
-   this value and program it into the MCU then you will need to remember the ID code because the debugger will ask for 
-   it when trying to connect. Note that the E1/E20 will ignore the ID code when programming the MCU during debugging.
-   If you set this value and then forget it then you can clear the ID code by connecting up in serial boot mode using 
-   FDT. The ID Code is 16 bytes long. The macro below define the ID Code in 4-byte sections. */
-/* Lowest 4-byte section, address 0xFE7F5D50. From MSB to LSB: ID code 4, ID code 3, ID code 2, ID code 1/Control Code.
- */
-#define BSP_CFG_ID_CODE_LONG_1          (0xFFFFFFFF)
-/* 2nd ID Code section, address 0xFE7F5D54. From MSB to LSB: ID code 8, ID code 7, ID code 6, ID code 5. */
-#define BSP_CFG_ID_CODE_LONG_2          (0xFFFFFFFF)
-/* 3rd ID Code section, address 0xFE7F5D58. From MSB to LSB: ID code 12, ID code 11, ID code 10, ID code 9. */
-#define BSP_CFG_ID_CODE_LONG_3          (0xFFFFFFFF)
-/* 4th ID Code section, address 0xFE7F5D5C. From MSB to LSB: ID code 16, ID code 15, ID code 14, ID code 13. */
-#define BSP_CFG_ID_CODE_LONG_4          (0xFFFFFFFF)
-
-/* Select whether to enables or disables the connection of serial programmer.
-   0 = Connection of a serial programmer is prohibited after a reset.
-   1 = Connection of a serial programmer is permitted after a reset. (default)
-*/
-#define BSP_CFG_SERIAL_PROGRAMMER_CONECT_ENABLE   (1)
-
-/* Select whether to oscillate the Main Clock Oscillator.
-   0 = Stop Oscillating the Main Clock.
-   1 = Enable oscillating the Main Clock. (default)
-*/
-#define BSP_CFG_MAIN_CLOCK_OSCILLATE_ENABLE    (1) /* Generated value. Do not edit this manually */
-
-/* Select whether to oscillate the Sub Clock Oscillator.
-   0 = Stop Oscillating the Sub Clock. (default)
-   1 = Enable Oscillating the Sub Clock.
-*/
-#define BSP_CFG_SUB_CLOCK_OSCILLATE_ENABLE     (1) /* Generated value. Do not edit this manually */
-
-/* Select whether to oscillate the High Speed On-Chip Oscillator (HOCO).
-   0 = Stop Oscillating the HOCO. (default)
-   1 = Enable Oscillating the HOCO.
-*/
-#define BSP_CFG_HOCO_OSCILLATE_ENABLE          (0) /* Generated value. Do not edit this manually */
-
-/* Select whether to oscillate the Low Speed On-Chip Oscillator (LOCO).
-   0 = Stop Oscillating the LOCO. (default)
-   1 = Enable Oscillating the LOCO.
-*/
-#define BSP_CFG_LOCO_OSCILLATE_ENABLE          (0) /* Generated value. Do not edit this manually */
-
-/* Select whether to oscillate the IWDT-Dedicated On-Chip Oscillator (IWDT).
-   0 = Stop Oscillating the IWDT Clock. (default)
-   1 = Enable Oscillating the IWDT Clock.
-*/
-#define BSP_CFG_IWDT_CLOCK_OSCILLATE_ENABLE    (0) /* Generated value. Do not edit this manually */
-
-/* Clock source select (CKSEL).
-   0 = Low Speed On-Chip Oscillator  (LOCO)
-   1 = High Speed On-Chip Oscillator (HOCO)
-   2 = Main Clock Oscillator
-   3 = Sub-Clock Oscillator
-   4 = PLL Circuit
-*/
-#define BSP_CFG_CLOCK_SOURCE            (4) /* Generated value. Do not edit this manually */
-
-/* Main clock Oscillator Switching (MOSEL).
-   0 = Resonator
-   1 = External clock input
-*/
-#define BSP_CFG_MAIN_CLOCK_SOURCE       (0) /* Generated value. Do not edit this manually */
-
-/* The sub-clock oscillation control for using the RTC.
-   When '1' is selected, the registers related to RTC are initialized and the sub-clock oscillator is operated.
-   0 = The RTC is not to be used.
-   1 = The RTC is to be used.
-*/
-#define BSP_CFG_RTC_ENABLE              (0) /* Generated value. Do not edit this manually */
-
-/* Sub-Clock Oscillator Drive Capacity Control (RTCDV).
-   0 = Drive capacity for standard CL. (default)
-   1 = Drive capacity for low CL.
-*/
-#define BSP_CFG_SOSC_DRV_CAP            (0) /* Generated value. Do not edit this manually */
-
-/* Clock configuration options.
-   The input clock frequency is specified and then the system clocks are set by specifying the multipliers used. The
-   multiplier settings are used to set the clock registers in resetprg.c. If a 24MHz clock is used and the
-   ICLK is 120MHz, PCLKA is 120MHz, PCLKB is 60MHz, PCLKC is 60MHz, PCLKD is 60MHz, FCLK is 60MHz, USB Clock is 48MHz,
-   and BCLK is 120MHz then the settings would be:
-
-   BSP_CFG_XTAL_HZ  = 24000000
-   BSP_CFG_PLL_DIV  = 1        (no division)
-   BSP_CFG_PLL_MUL  = 10.0     (24MHz x 10.0 = 240MHz)
-   BSP_CFG_ICK_DIV  = 2      : System Clock (ICLK)        = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_ICK_DIV)  = 120MHz
-   BSP_CFG_PCKA_DIV = 2      : Peripheral Clock A (PCLKA) = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_PCKA_DIV) = 120MHz
-   BSP_CFG_PCKB_DIV = 4      : Peripheral Clock B (PCLKB) = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_PCKB_DIV) = 60MHz
-   BSP_CFG_PCKC_DIV = 4      : Peripheral Clock C (PCLKC) = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_PCKC_DIV) = 60MHz
-   BSP_CFG_PCKD_DIV = 4      : Peripheral Clock D (PCLKD) = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_PCKD_DIV) = 60MHz
-   BSP_CFG_FCK_DIV  = 4      : Flash IF Clock (FCLK)      = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_FCK_DIV)  = 60MHz
-   BSP_CFG_BCK_DIV  = 2      : External Bus Clock (BCK)   = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_BCK_DIV)  = 120MHz
-   BSP_CFG_UCK_DIV  = 5      : USB Clock (UCLK)           = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_UCK_DIV)  = 48MHz
-*/
-
-/* Input clock frequency in Hz (XTAL or EXTAL). */
-#define BSP_CFG_XTAL_HZ                 (24000000) /* Generated value. Do not edit this manually */
-
-/* The HOCO can operate at several different frequencies. Choose which one using the macro below.
-   Available frequency settings:
-   0 = 16MHz (default)
-   1 = 18MHz
-   2 = 20MHz
-*/
-#define BSP_CFG_HOCO_FREQUENCY          (0) /* Generated value. Do not edit this manually */
-
-/* PLL clock source (PLLSRCSEL). Choose which clock source to input to the PLL circuit.
-   Available clock sources:
-   0 = Main clock (default)
-   1 = HOCO
-*/
-#define BSP_CFG_PLL_SRC                 (0) /* Generated value. Do not edit this manually */
-
-/* PLL Input Frequency Division Ratio Select (PLIDIV).
-   Available divisors = /1 (no division), /2, /3
-*/
-#define BSP_CFG_PLL_DIV                 (1) /* Generated value. Do not edit this manually */
-
-/* PLL Frequency Multiplication Factor Select (STC).
-   Available multipliers = x10.0 to x30.0 in 0.5 increments (e.g. 10.0, 10.5, 11.0, 11.5, ..., 29.0, 29.5, 30.0)
-*/
-#define BSP_CFG_PLL_MUL                 (10.0) /* Generated value. Do not edit this manually */
-
-/* System Clock Divider (ICK).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_ICK_DIV                 (2) /* Generated value. Do not edit this manually */
-
-/* Peripheral Module Clock A Divider (PCKA).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_PCKA_DIV                (2) /* Generated value. Do not edit this manually */
-
-/* Peripheral Module Clock B Divider (PCKB).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_PCKB_DIV                (4) /* Generated value. Do not edit this manually */
-
-/* Peripheral Module Clock C Divider (PCKC).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_PCKC_DIV                (4) /* Generated value. Do not edit this manually */
-
-/* Peripheral Module Clock D Divider (PCKD).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_PCKD_DIV                (4) /* Generated value. Do not edit this manually */
-
-/* External Bus Clock Divider (BCLK).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_BCK_DIV                 (2) /* Generated value. Do not edit this manually */
-
-/* Flash IF Clock Divider (FCK).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_FCK_DIV                 (4) /* Generated value. Do not edit this manually */
-
-/* USB Clock Divider Select.
-   Available divisors = /2, /3, /4, /5
-*/
-#define BSP_CFG_UCK_DIV                 (5) /* Generated value. Do not edit this manually */
-
-/* Configure BCLK output pin (only effective when external bus enabled)
-   Values 0=no output, 1 = BCK frequency, 2= BCK/2 frequency
-*/
-#define BSP_CFG_BCLK_OUTPUT             (0) /* Generated value. Do not edit this manually */
-
-/* Configure SDCLK output pin (only effective when external bus enabled)
-   Values 0=no output, 1 = BCK frequency
-*/
-#define BSP_CFG_SDCLK_OUTPUT            (0) /* Generated value. Do not edit this manually */
-
-/* Main Clock Oscillator Wait Time (MOSCWTCR).
-   The value of MOSCWTCR register required for correspondence with the waiting time required to secure stable 
-   oscillation by the main clock oscillator is obtained by using the maximum frequency for fLOCO in the formula below.
-
-   BSP_CFG_MOSC_WAIT_TIME > (tMAINOSC * (fLOCO_max) + 16)/32
-   (tMAINOSC: main clock oscillation stabilization time; fLOCO_max: maximum frequency for fLOCO)
-
-   If tMAINOSC is 9.98 ms and fLOCO_max is 264 kHz (the period is 1/3.78 us), the formula gives 
-   BSP_CFG_MOSC_WAIT_TIME > (9.98 ms * (264 kHZ) + 16)/32 = 82.83, so set the BSP_CFG_MOSC_WAIT_TIME to 83(53h).
-
-   NOTE: The waiting time is not required when an external clock signal is input for the main clock oscillator.
-         Set the BSP_CFG_MOSC_WAIT_TIME to 00h.
-*/
-#define BSP_CFG_MOSC_WAIT_TIME          (0x53) /* Generated value. Do not edit this manually */
-
-/* Sub-Clock Oscillator Wait Time (SOSCWTCR).
-   The value of SOSCWTCR register required for correspondence with the expected time to secure settling of oscillation
-   by the sub-clock oscillator is obtained by using the maximum frequency for fLOCO in the formula below.
-
-   BSP_CFG_SOSC_WAIT_TIME > (tSUBOSC * (fLOCO_max) + 16)/16384
-   (tSUBOSC: sub-clock oscillation stabilization time; fLOCO_max: maximum frequency for fLOCO)
-
-   If tSUBOSC is 2 s and fLOCO is 264 kHz (the period is 1/3.78 us), the formula gives
-    BSP_CFG_SOSC_WAIT_TIME > (2 s * (264 kHz) +16)/16384 = 32.22, so set the  BSP_CFG_SOSC_WAIT_TIME bits to 33(21h).
-*/
-#define BSP_CFG_SOSC_WAIT_TIME          (0x21) /* Generated value. Do not edit this manually */
-
-/* ROM Cache Enable Register (ROMCE).
-   0 = ROM cache operation disabled.
-   1 = ROM cache operation enabled.
-*/
-#define BSP_CFG_ROM_CACHE_ENABLE        (0)
-
-/* Configure WDT and IWDT settings.
-   OFS0 - Option Function Select Register 0
-       b31:b29 Reserved When reading, these bits return the value written by the user. The write value should be 1.
-       b28     WDTRSTIRQS - WDT Reset Interrupt Request - What to do on underflow (0=take interrupt, 1=reset MCU)
-       b27:b26 WDTRPSS   - WDT Window Start Position Select - (0=25%, 1=50%, 2=75%, 3=100%,don't use)
-       b25:b24 WDTRPES   - WDT Window End Position Select - (0=75%, 1=50%, 2=25%, 3=0%,don't use)
-       b23:b20 WDTCKS    - WDT Clock Frequency Division Ratio - (1=PCLKB/4, 4=PCLKB/64, 0xF=PCLKB/128, 6=PCLKB/256,
-                                                                 7=PCLKB/2048, 8=PCLKB/8192)
-       b19:b18 WDTTOPS   - WDT Timeout Period Select (0=1024 cycles, 1=4096, 2=8192, 3=16384)
-       b17     WDTSTRT   - WDT Start Mode Select - (0=auto-start after reset, 1=halt after reset)
-       b16:b15 Reserved (set to 1)
-       b14     IWDTSLCSTP - IWDT Sleep Mode Count Stop Control - (0=can't stop count, 1=stop w/some low power modes)
-       b13     Reserved (set to 1)
-       b12     IWDTRSTIRQS - IWDT Reset Interrupt Request - What to do on underflow (0=take interrupt, 1=reset MCU)
-       b11:b10 IWDTRPSS - IWDT Window Start Position Select - (0=25%, 1=50%, 2=75%, 3=100%,don't use)
-       b9:b8   IWDTRPES - IWDT Window End Position Select - (0=75%, 1=50%, 2=25%, 3=0%,don't use)
-       b7:b4   IWDTCKS - IWDT Clock Frequency Division Ratio - (0=none, 2=/16, 3 = /32, 4=/64, 0xF=/128, 5=/256)
-       b3:b2   IWDTTOPS - IWDT Timeout Period Select - (0=1024 cycles, 1=4096, 2=8192, 3=16384)
-       b1      IWDTSTRT - IWDT Start Mode Select - (0=auto-start after reset, 1=halt after reset)
-       b0      Reserved (set to 1)
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_OFS0_REG_VALUE  (0xFFFFFFFF) /* Generated value. Do not edit this manually */
-
-/* Configure whether voltage detection 0 circuit and HOCO are enabled after reset.
-   OFS1 - Option Function Select Register 1
-       b31:b9 Reserved (set to 1)
-       b8     HOCOEN - Enable/disable HOCO oscillation after a reset (0=enable, 1=disable)
-       b7:b3  Reserved When reading, these bits return the value written by the user. The write value should be 1.
-       b2     LVDAS - Voltage Detection 0 circuit start (1=monitoring disabled)
-       b1:b0  VDSEL - Voltage Detection 0 level select (1=2.94v, 2=2.87v, 3=2.80v)
-       NOTE: If HOCO oscillation is enabled by OFS1.HOCOEN, HOCO frequency is 16MHz.
-             BSP_CFG_HOCO_FREQUENCY should be default value.
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_OFS1_REG_VALUE  (0xFFFFFFFF) /* Generated value. Do not edit this manually */
-
-/* Trusted memory is facility to prevent the reading of blocks 8 and 9 and blocks 46 and 47 (in dual mode) in 
-   the code flash memory by third party software. This feature is disabled by default.
-   TMEF - TM Enable Flag Register
-       b31     Reserved (set to 1)
-       b30:b28 TMEFDB - Dual-Bank TM Enable - 000: The TM function in the address range from FFEE 0000h to 
-                                                   FFEE FFFFh is enabled in dual mode.
-                                            - 111: The TM function in the address range from FFEE 0000h to 
-                                                   FFEE FFFFh is disabled in dual mode.
-       b27     Reserved (set to 1)
-       b26:b24 TMEF   - TM Enable - 000: TM function is enabled.
-                                  - 111: TM function is disabled.
-       b23:b0  Reserved (set to 1)
-       NOTE: If the dual bank function has not been incorporated in a device,
-             TMEFDB bits [b30:b26] are reserved area.
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_TRUSTED_MODE_FUNCTION  (0xFFFFFFFF)
-
-/* Configure FAW register is used to set the write protection flag and boot area select flag 
-   for setting the flash access window startaddress and flash access window end address.
-   FAW - Flash Access Window Setting Register
-       b31      BTFLG - Boot Area Select Flag - 0: FFFF C000h to FFFF DFFFh are used as the boot area
-                                              - 1: FFFF E000h to FFFF FFFFh are used as the boot area
-       b30:b28  Reserved - When reading, these bits return the value written by the user.The write value should be 1.
-       b27:b16  FAWE - Flash Access Window End Address - Flash access window end address
-       b15      FSPR - Access Window Protection Flag - 0: With protection (P/E disabled)
-                                                     - 1: Without protection (P/E enabled)
-       b14:b12  Reserved - When reading, these bits return the value written by the user.The write value should be 1.
-       b11:b0   FAWS - Flash Access Window Start Address - Flash access window start address 
-       NOTE: Once 0 is written to this bit, the bit can never be restored to 1.
-             Therefore, the access window and the BTFLG bit never be set again or the TM function 
-             never be disabled once it has been enabled.
-             Exercise extra caution when handling the FSPR bit.
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_FAW_REG_VALUE  (0xFFFFFFFF)
-
-/* The ROM code protection register is a function to prohibit reading from or programming to the flash memory
-   when the flash programmer is used during off-board programming.
-   ROMCODE - ROM Code Protection Register
-       b31:b0  ROM Code - 0000 0000h: ROM code protection enabled (ROM code protection 1).
-                          0000 0001h: ROM code protection enabled (ROM code protection 2).
-                          Other than above: ROM code protection disabled.
-       Note: The ROMCODE register should be set in 32-bit units.
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_ROMCODE_REG_VALUE  (0xFFFFFFFF)
-
-/* Select the bank mode of dual-bank function of the code flash memory.
-   0 = Dual mode.
-   1 = Linear mode. (default)
-   NOTE: If the dual bank function has been incorporated in a device, select the bank mode in this macro.
-         Default setting of the bank mode is linear mode.
-         If the dual bank function has not been incorporated in a device, this macro should be 1.
-*/
-#define BSP_CFG_CODE_FLASH_BANK_MODE    (0)
-
-/* Select the startup bank of the program when dual bank function is in dual mode.
-   0 = The address range of bank 1 from FFE00000h to FFEFFFFFh and bank 0 from FFF00000h to FFFFFFFFh. (default)
-   1 = The address range of bank 1 from FFF00000h to FFFFFFFFh and bank 0 from FFE00000h to FFEFFFFFh.
-   NOTE: If the dual bank function has been incorporated in a device, select the start bank in this macro.
-         Default setting of the start bank is bank0.
-         If the dual bank function has not been incorporated in a device, this macro should be 0.
-*/
-#define BSP_CFG_CODE_FLASH_START_BANK   (0)
-
-/* This macro lets other modules no if a RTOS is being used.
-   0 = RTOS is not used.
-   1 = FreeRTOS is used.
-   2 = embOS is used.(This is not available.)
-   3 = MicroC_OS is used.(This is not available.)
-   4 = Renesas ITRON OS (RI600V4 or RI600PX) is used.
-   5 = Azure RTOS is used.(This is not available.)
-*/
-#define BSP_CFG_RTOS_USED               (0)
-
-/* This macro is used to select which Renesas ITRON OS.
-   0 = RI600V4 is used.
-   1 = RI600PX is used.
-*/
-#define BSP_CFG_RENESAS_RTOS_USED       (0)
-
-/* This macro is used to select which CMT channel used for system timer of RTOS.
- * The setting of this macro is only valid if the macro BSP_CFG_RTOS_USED is set to a value other than 0. */
-#if BSP_CFG_RTOS_USED != 0
-/* Setting value.
- * 0      = CMT channel 0 used for system timer of RTOS (recommended to be used for RTOS).
- * 1      = CMT channel 1 used for system timer of RTOS.
- * 2      = CMT channel 2 used for system timer of RTOS.
- * 3      = CMT channel 3 used for system timer of RTOS.
- * Others = Invalid.
- * NOTE: This is invalid when using Renesas RTOS with CCRX.
- */
-#define BSP_CFG_RTOS_SYSTEM_TIMER       (0)
-#endif
-
-/* By default modules will use global locks found in mcu_locks.c. If the user is using a RTOS and would rather use its
-   locking mechanisms then they can change this macro.
-   NOTE: If '1' is chosen for this macro then the user must also change the next macro 'BSP_CFG_USER_LOCKING_TYPE'.
-   0 = Use default locking (non-RTOS)
-   1 = Use user defined locking mechanism.
-*/
-#define BSP_CFG_USER_LOCKING_ENABLED    (0)
-
-/* If the user decides to use their own locking mechanism with FIT modules then they will need to redefine the typedef
-   that is used for the locks. If the user is using a RTOS then they would likely redefine the typedef to be 
-   a semaphore/mutex type of their RTOS. Use the macro below to set the type that will be used for the locks.
-   NOTE: If BSP_CFG_USER_LOCKING_ENABLED == 0 then this typedef is ignored.
-   NOTE: Do not surround the type with parentheses '(' ')'.
-*/
-#define BSP_CFG_USER_LOCKING_TYPE       bsp_lock_t
-
-/* If the user decides to use their own locking mechanism with FIT modules then they will need to define the functions
-   that will handle the locking and unlocking. These functions should be defined below.
-   If BSP_CFG_USER_LOCKING_ENABLED is != 0:
-   R_BSP_HardwareLock(mcu_lock_t hw_index) will call BSP_CFG_USER_LOCKING_HW_LOCK_FUNCTION(mcu_lock_t hw_index)
-   R_BSP_HardwareUnlock(mcu_lock_t hw_index) will call BSP_CFG_USER_LOCKING_HW_UNLOCK_FUNCTION(mcu_lock_t hw_index)
-       NOTE:With these functions the index into the array holding the global hardware locks is passed as the parameter.
-   R_BSP_SoftwareLock(BSP_CFG_USER_LOCKING_TYPE * plock) will call 
-   BSP_CFG_USER_LOCKING_SW_LOCK_FUNCTION(BSP_CFG_USER_LOCKING_TYPE * plock)
-   R_BSP_SoftwareUnlock(BSP_CFG_USER_LOCKING_TYPE * plock) will call 
-   BSP_CFG_USER_LOCKING_SW_UNLOCK_FUNCTION(BSP_CFG_USER_LOCKING_TYPE * plock)
-       NOTE:With these functions the actual address of the lock to use is passed as the parameter.
-   NOTE: These functions must return a boolean. If lock was obtained or released successfully then return true. Else, 
-         return false.
-   NOTE: If BSP_CFG_USER_LOCKING_ENABLED == 0 then this typedef is ignored.
-   NOTE: Do not surround the type with parentheses '(' ')'.
-*/
-#define BSP_CFG_USER_LOCKING_HW_LOCK_FUNCTION      my_hw_locking_function
-#define BSP_CFG_USER_LOCKING_HW_UNLOCK_FUNCTION    my_hw_unlocking_function
-#define BSP_CFG_USER_LOCKING_SW_LOCK_FUNCTION      my_sw_locking_function
-#define BSP_CFG_USER_LOCKING_SW_UNLOCK_FUNCTION    my_sw_unlocking_function
-
-/* If the user would like to determine if a warm start reset has occurred, then they may enable one or more of the
-   following callback definitions AND provide a call back function name for the respective callback
-   function (to be defined by the user). Setting BSP_CFG_USER_WARM_START_CALLBACK_PRE_INITC_ENABLED = 1 will result
-   in a callback to the user defined my_sw_warmstart_prec_function just prior to the initialization of the C
-   runtime environment by resetprg.
-   Setting BSP_CFG_USER_WARM_START_CALLBACK_POST_INITC_ENABLED = 1 will result in a callback to the user defined
-   my_sw_warmstart_postc_function just after the initialization of the C runtime environment by resetprg.
-*/
-#define BSP_CFG_USER_WARM_START_CALLBACK_PRE_INITC_ENABLED    (0)
-#define BSP_CFG_USER_WARM_START_PRE_C_FUNCTION     my_sw_warmstart_prec_function
-
-#define BSP_CFG_USER_WARM_START_CALLBACK_POST_INITC_ENABLED    (0)
-#define BSP_CFG_USER_WARM_START_POST_C_FUNCTION    my_sw_warmstart_postc_function
-
-/* By default FIT modules will check input parameters to be valid. This is helpful during development but some users
-   will want to disable this for production code. The reason for this would be to save execution time and code space.
-   This macro is a global setting for enabling or disabling parameter checking. Each FIT module will also have its
-   own local macro for this same purpose. By default the local macros will take the global value from here though
-   they can be overridden. Therefore, the local setting has priority over this global setting. Disabling parameter
-   checking should only used when inputs are known to be good and the increase in speed or decrease in code space is 
-   needed.
-   0 = Global setting for parameter checking is disabled.
-   1 = Global setting for parameter checking is enabled (Default).
-*/
-#define BSP_CFG_PARAM_CHECKING_ENABLE               (0)
-
-/* The extended bus master has five transfer sources: EDMAC, GLCDC-GRA1 (GLCDC graphics 1 data read), GLCDCGRA2 (GLCDC
-   graphics 2 data read), DRW2D-TX (DRW2D texture data read), and DRW2D-FB (DRW2D frame buffer data read write and
-   display list data read).
-   The default priority order in bsp is below
-   GLCDC-GRA1 > GLCDC-GRA2 > DRW2D-TX > DRW2D-FB > EDMAC.
-   Priority can be changed with this macro.
-
-   Extended Bus Master Priority setting
-   0 = GLCDC graphics 1 data read
-   1 = DRW2D texture data read
-   2 = DRW2D frame buffer data read write and display list data read
-   3 = GLCDC graphics 2 data read
-   4 = EDMAC
-
-   Note : This macro is only available for products with at least 1.5 Mbytes of code flash memory.
-          Settings other than above are prohibited.
-          Duplicate priority settings can not be made.
-*/
-#define BSP_CFG_EBMAPCR_1ST_PRIORITY                (0) /* Extended Bus Master 1st Priority Selection */
-#define BSP_CFG_EBMAPCR_2ND_PRIORITY                (3) /* Extended Bus Master 2nd Priority Selection */
-#define BSP_CFG_EBMAPCR_3RD_PRIORITY                (1) /* Extended Bus Master 3rd Priority Selection */
-#define BSP_CFG_EBMAPCR_4TH_PRIORITY                (2) /* Extended Bus Master 4th Priority Selection */
-#define BSP_CFG_EBMAPCR_5TH_PRIORITY                (4) /* Extended Bus Master 5th Priority Selection */
-
-/* This macro is used to define the voltage that is supplied to the MCU (Vcc). This macro is defined in millivolts. This
-   macro does not actually change anything on the MCU. Some FIT modules need this information so it is defined here. */
-#define BSP_CFG_MCU_VCC_MV                          (3300) /* Generated value. Do not edit this manually */
-
-/* Allow initialization of auto-generated peripheral initialization code by Smart Configurator tool.
-   When not using the Smart Configurator, set the value of BSP_CFG_CONFIGURATOR_SELECT to 0.
-   0 = Disabled (default)
-   1 = Smart Configurator initialization code used
-*/
-#define BSP_CFG_CONFIGURATOR_SELECT                 (1) /* Generated value. Do not edit this manually */
-
-/* Version number of Smart Configurator.
-   This macro definition is updated by Smart Configurator.
-*/
-#define BSP_CFG_CONFIGURATOR_VERSION                (2160) /* Generated value. Do not edit this manually */
-
-/* For some BSP functions, it is necessary to ensure that, while these functions are executing, interrupts from other 
-   FIT modules do not occur. By controlling the IPL, these functions disable interrupts that are at or below the 
-   specified interrupt priority level.
-   This macro sets the IPL. Range is 0x0 - 0xF.
-   Please set this macro more than IPR for other FIT module interrupts.
-   The default value is 0xF (maximum value).
-   Don't change if there is no special processing with higher priority than all fit modules.
-*/
-#define BSP_CFG_FIT_IPL_MAX                         (0xF)
-
-/* Software Interrupt (SWINT).
-   0 = Software interrupt is not used.
-   1 = Software interrupt is used.
-   NOTE: When this macro is set to 1, the software interrupt is initialized in bsp startup routine. 
-*/
-#define BSP_CFG_SWINT_UNIT1_ENABLE    (0)
-#define BSP_CFG_SWINT_UNIT2_ENABLE    (0)
-
-/* Software Interrupt Task Buffer Number.
-   For software interrupt, this value is number of buffering user tasks.
-   So user can increase this value if user system would have many software interrupt tasks
-   and user system has enough buffer. This value requires 9 byte per task.
-   NOTE: This setting is common to all units. It can not be set individually. 
-         The maximum value is 254.
-*/
-#define BSP_CFG_SWINT_TASK_BUFFER_NUMBER     (8)
-
-/* Initial value of the software interrupt priority.
-   For software interrupt, this value is interrupt priority. Range is 0x0 - 0xF.
-   NOTE: This setting is common to all units. It can not be set individually. 
-         Please be careful that this setting is the initial value of the interrupt priority register(IPR).
-         It is possible to dynamically change the IPR.
-*/
-#define BSP_CFG_SWINT_IPR_INITIAL_VALUE     (0x1)
-
-/* This macro is used for serial terminal on the board selected by smart configurator.
-   0 = SCI UART Terminal is disabled.
-   1 = SCI UART Terminal is enabled.
-*/
-#define BSP_CFG_SCI_UART_TERMINAL_ENABLE         (1)
-
-/* This macro is channel number for serial terminal.
-*/
-#define BSP_CFG_SCI_UART_TERMINAL_CHANNEL        (5)
-
-/* This macro is bit-rate for serial terminal.
-*/
-#define BSP_CFG_SCI_UART_TERMINAL_BITRATE        (115200)
-
-/* This macro is interrupt priority for serial terminal.
-   0(low) - 15(high)
-*/
-#define BSP_CFG_SCI_UART_TERMINAL_INTERRUPT_PRIORITY   (15)
-
-/* This macro is used for C++ project and updated by Smart Configurator.
-   0 = This project is a C project.(Not a C++ project).
-   1 = This project is a C++ project.
-*/
-#define BSP_CFG_CPLUSPLUS             (0) /* Generated value. Do not edit this manually */
-
-#endif /* R_BSP_CONFIG_REF_HEADER_FILE */
-
diff --git a/Configuration/samples/bootloader/ck-rx65n-v2/src/smc_gen/r_config/r_bsp_interrupt_config.h b/Configuration/samples/bootloader/ck-rx65n-v2/src/smc_gen/r_config/r_bsp_interrupt_config.h
deleted file mode 100644
index 39237823..00000000
--- a/Configuration/samples/bootloader/ck-rx65n-v2/src/smc_gen/r_config/r_bsp_interrupt_config.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer 
-*
-* Copyright (C) 2016 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name    : r_bsp_interrupt_config.h
-* Description  : This module maps Interrupt A & B interrupts. More information on how this is done is given below.
-***********************************************************************************************************************/
-/**********************************************************************************************************************
-* History : DD.MM.YYYY Version   Description
-*         : 01.10.2016 1.00      First Release
-*         : 15.05.2017 2.00      Changed the name of the following macro definition, because there was a mistake
-*                                in the name of macro definition.
-*                                - From XXX_TPU0_TGI0V to XXX_TPU0_TCI0V.
-*                                - From XXX_TPU1_TGI1V to XXX_TPU1_TCI1V.
-*                                - From XXX_TPU1_TGI1U to XXX_TPU1_TCI1U.
-*                                - From XXX_TPU2_TGI2V to XXX_TPU2_TCI2V.
-*                                - From XXX_TPU2_TGI2U to XXX_TPU2_TCI2U.
-*                                - From XXX_TPU3_TGI3V to XXX_TPU3_TCI3V.
-*                                - From XXX_TPU4_TGI4V to XXX_TPU4_TCI4V.
-*                                - From XXX_TPU4_TGI4U to XXX_TPU4_TCI4U.
-*                                - From XXX_TPU5_TGI5V to XXX_TPU5_TCI5V.
-*                                - From XXX_TPU5_TGI5U to XXX_TPU5_TCI5U.
-*                                - From XXX_MTU0_TGIV0 to XXX_MTU0_TCIV0.
-*                                - From XXX_MTU1_TGIV1 to XXX_MTU1_TCIV1.
-*                                - From XXX_MTU1_TGIU1 to XXX_MTU1_TCIU1.
-*                                - From XXX_MTU2_TGIV2 to XXX_MTU2_TCIV2.
-*                                - From XXX_MTU2_TGIU2 to XXX_MTU2_TCIU2.
-*                                - From XXX_MTU3_TGIV3 to XXX_MTU3_TCIV3.
-*                                - From XXX_MTU4_TGIV4 to XXX_MTU4_TCIV4.
-*                                - From XXX_MTU6_TGIV6 to XXX_MTU6_TCIV6.
-*                                - From XXX_MTU7_TGIV7 to XXX_MTU7_TCIV7.
-*                                - From XXX_MTU8_TGIV8 to XXX_MTU8_TCIV8.
-*                                Added select processing of the following software configurable interrupt source.
-*                                - TSIP_PROC_BUSY
-*                                - TSIP_ROMOK
-*                                - TSIP_LONG_PLG
-*                                - TSIP_TEST_BUSY
-*                                - TSIP_WRRDY0
-*                                - TSIP_WRRDY1
-*                                - TSIP_WRRDY4
-*                                - TSIP_RDRDY0
-*                                - TSIP_RDRDY1
-*                                - TSIP_INTEGRATE_WRRDY
-*                                - TSIP_INTEGRATE_RDRDY
-***********************************************************************************************************************/
-#ifndef R_BSP_INTERRUPT_CONFIG_REF_HEADER_FILE
-#define R_BSP_INTERRUPT_CONFIG_REF_HEADER_FILE
-
-/***********************************************************************************************************************
-Macro definitions
-***********************************************************************************************************************/
-
-/* If you wish to use one of the interrupt below then set the appropriate configuration macro to the vector number you
- * wish to use for that interrupt. For example, if you want to use the RTC carry interrupt (CUP) at vector 176 then you
- * would do the following:
- *
- * #define BSP_MAPPED_INT_CFG_B_VECT_RTC_CUP                                 176
- */
-
-/* Interrupt B Sources.
- * -Valid vector numbers are 128-207.
- * -There are more vector slots for B sources than actual B sources. By default all B sources are mapped.
- * -If using the 'TPU1, TGI1A' interrupt it must be vector 144 or 145. It is set to 144 by default.
- * -If a peripheral interrupt is going to be used to wake up the MCU from All-Module Clock Stop Mode then it must be
- *  in a vector between 146 to 157. Peripheral interrupts that can do this are TMR interrupts and the 'USB0, USBI0'
- *  interrupt. By default the TMR interrupts are chosen since there are 12 of them and there are 12 slots.
- */
-#define BSP_MAPPED_INT_CFG_B_VECT_CMT2_CMI2                               128
-#define BSP_MAPPED_INT_CFG_B_VECT_CMT3_CMI3                               129
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR0_CMIA0                              146
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR0_CMIB0                              147
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR0_OVI0                               148
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR1_CMIA1                              149
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR1_CMIB1                              150
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR1_OVI1                               151
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR2_CMIA2                              152
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR2_CMIB2                              153
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR2_OVI2                               154
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR3_CMIA3                              155
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR3_CMIB3                              156
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR3_OVI3                               157
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TGI0A                              130
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TGI0B                              131
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TGI0C                              132
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TGI0D                              133
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TCI0V                              134
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU1_TGI1A                              144
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU1_TGI1B                              135
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU1_TCI1V                              136
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU1_TCI1U                              137
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU2_TGI2A                              138
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU2_TGI2B                              139
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU2_TCI2V                              140
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU2_TCI2U                              141
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TGI3A                              142
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TGI3B                              143
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TGI3C                              145
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TGI3D                              158
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TCI3V                              159
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU4_TGI4A                              160
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU4_TGI4B                              161
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU4_TCI4V                              162
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU4_TCI4U                              163
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU5_TGI5A                              164
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU5_TGI5B                              165
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU5_TCI5V                              166
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU5_TCI5U                              167
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW0_IC0I0                             168
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW0_IC1I0                             169
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW0_OC0I0                             170
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW0_OC1I0                             171
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW1_IC0I1                             172
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW1_IC1I1                             173
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW1_OC0I1                             174
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW1_OC1I1                             175
-#define BSP_MAPPED_INT_CFG_B_VECT_RTC_CUP                                 176
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN0_RXF0                               177
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN0_TXF0                               178
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN0_RXM0                               179
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN0_TXM0                               180
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN1_RXF1                               181
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN1_TXF1                               182
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN1_RXM1                               183
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN1_TXM1                               184
-#define BSP_MAPPED_INT_CFG_B_VECT_USB0_USBI0                              185
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC0_S12ADI0                         186
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC0_S12GBADI0                       187
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC0_S12GCADI0                       188
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC1_S12ADI1                         189
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC1_S12GBADI1                       190
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC1_S12GCADI1                       191
-#define BSP_MAPPED_INT_CFG_B_VECT_RNG_RNGEND                              192
-#define BSP_MAPPED_INT_CFG_B_VECT_ELC_ELSR18I                             193
-#define BSP_MAPPED_INT_CFG_B_VECT_ELC_ELSR19I                             194
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_PROC_BUSY                          195
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_ROMOK                              196
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_LONG_PLG                           197
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_TEST_BUSY                          198
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_WRRDY0                             199
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_WRRDY1                             200
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_WRRDY4                             201
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_RDRDY0                             202
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_RDRDY1                             203
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_INTEGRATE_WRRDY                    204
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_INTEGRATE_RDRDY                    205
-
-/* Interrupt A Sources.
- * -Valid vector numbers are 208-255.
- * -There are more A sources than A vector slots. By default none of the GPT interrupts are mapped.
- * -If using the 'MTU1, TGI1A' interrupt it must be vector 208 or 209. It is set to 208 by default.
- */
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIA0                              209
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIB0                              210
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIC0                              211
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGID0                              212
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TCIV0                              213
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIE0                              214
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIF0                              215
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU1_TGIA1                              208
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU1_TGIB1                              216
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU1_TCIV1                              217
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU1_TCIU1                              218
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU2_TGIA2                              219
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU2_TGIB2                              220
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU2_TCIV2                              221
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU2_TCIU2                              222
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TGIA3                              223
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TGIB3                              224
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TGIC3                              225
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TGID3                              226
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TCIV3                              227
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TGIA4                              228
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TGIB4                              229
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TGIC4                              230
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TGID4                              231
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TCIV4                              232
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU5_TGIU5                              233
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU5_TGIV5                              234
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU5_TGIW5                              235
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TGIA6                              236
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TGIB6                              237
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TGIC6                              238
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TGID6                              239
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TCIV6                              240
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TGIA7                              241
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TGIB7                              242
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TGIC7                              243
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TGID7                              244
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TCIV7                              245
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TGIA8                              246
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TGIB8                              247
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TGIC8                              248
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TGID8                              249
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TCIV8                              250
-#define BSP_MAPPED_INT_CFG_A_VECT_AES_AESRDY                              251
-#define BSP_MAPPED_INT_CFG_A_VECT_AES_AESEND                              252
-
-#endif /* R_BSP_INTERRUPT_CONFIG_REF_HEADER_FILE */
-
diff --git a/Configuration/samples/bootloader/ck-rx65n-v2/src/smc_gen/r_config/r_byteq_config.h b/Configuration/samples/bootloader/ck-rx65n-v2/src/smc_gen/r_config/r_byteq_config.h
deleted file mode 100644
index 7c0e15a9..00000000
--- a/Configuration/samples/bootloader/ck-rx65n-v2/src/smc_gen/r_config/r_byteq_config.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer 
-*
-* Copyright (C) 2013 Renesas Electronics Corporation. All rights reserved.    
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name     : r_byteq_config.h
-* Description   : Configures the byte queue memory allocation
-************************************************************************************************************************
-* History : DD.MM.YYYY Version Description  
-*         : 24.07.2013 1.00     Initial Release
-*         : 11.21.2014 1.20     Removed dependency to BSP
-*         : 30.09.2015 1.50     Added dependency to BSP
-*         : 01.06.2018 1.70     Changed the default value of the following macro definition.
-*                                - BYTEQ_CFG_MAX_CTRL_BLKS - Changed the default value from 4 to 32.
-*         : 31.03.2021 1.90     Updated for queue protection.
-*         : 29.10.2021 2.00     Updated for critical section protection.
-***********************************************************************************************************************/
-#ifndef BYTEQ_CONFIG_H
-#define BYTEQ_CONFIG_H
-
-/***********************************************************************************************************************
-Includes   <System Includes> , "Project Includes"
-***********************************************************************************************************************/
-#include "platform.h"
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-
-/* SPECIFY WHETHER TO INCLUDE CODE FOR API PARAMETER CHECKING
-   Available settings:
-   BSP_CFG_PARAM_CHECKING_ENABLE:
-       Utilizes the system default setting
-   1:
-       Includes parameter checking
-   0:
-       Compiles out parameter checking
-*/
-#define BYTEQ_CFG_PARAM_CHECKING_ENABLE     (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-/* SPECIFY IF SHOULD USE MALLOC() TO ALLOCATE MEMORY FOR QUEUE CONTROL BLOCKS */
-#define BYTEQ_CFG_USE_HEAP_FOR_CTRL_BLKS    (0)
-
-/* SPECIFY NUMBER OF STATIC QUEUE CONTROL BLOCKS TO SUPPORT */
-/* valid only when BYTEQ_USE_HEAP_FOR_CTRL_BLKS is set to 0 */
-#define BYTEQ_CFG_MAX_CTRL_BLKS             (32)
-
-/* Selects to use disable interrupt to protect queue. */
-#define BYTEQ_CFG_PROTECT_QUEUE             (0)
-
-/* Selects to use disable interrupt to protect critical section. */
-#define BYTEQ_CFG_CRITICAL_SECTION          (0)
-
-#endif /* BYTEQ_CONFIG_H */
diff --git a/Configuration/samples/bootloader/ck-rx65n-v2/src/smc_gen/r_config/r_flash_rx_config.h b/Configuration/samples/bootloader/ck-rx65n-v2/src/smc_gen/r_config/r_flash_rx_config.h
deleted file mode 100644
index 994a5da2..00000000
--- a/Configuration/samples/bootloader/ck-rx65n-v2/src/smc_gen/r_config/r_flash_rx_config.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
- * DISCLAIMER
- * This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
- * other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
- * applicable laws, including copyright laws.
- * THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
- * THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
- * EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
- * SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS
- * SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
- * this software. By using this software, you agree to the additional terms and conditions found by accessing the
- * following link:
- * http://www.renesas.com/disclaimer
- *
- * Copyright (C) 2014-2019 Renesas Electronics Corporation. All rights reserved.
- ***********************************************************************************************************************/
-/***********************************************************************************************************************
- * File Name    : r_flash_rx_config_reference.h
- * Description  : Configures the FLASH API module for RX200 and RX600 Series MCU's.
- ***********************************************************************************************************************/
-/***********************************************************************************************************************
-* History : DD.MM.YYYY Version Description
-*           12.04.2014 1.00    First Release
-*           22.12.2014 1.10    Added flash type usage comments.
-*           25.06.2015 1.20    Added FLASH_CFG_CODE_FLASH_RUN_FROM_ROM.
-*         : 12.10.2016 2.00    Modified for BSPless operation (added FLASH_CFG_USE_FIT_BSP).
-*         : 19.04.2019 4.00    Removed BSPless operation (FLASH_CFG_USE_FIT_BSP).
-*                              Removed flash type 2 only operation (FLASH_CFG_FLASH_READY_IPL).
-*                              Removed flash type 2 only operation (FLASH_CFG_IGNORE_LOCK_BITS).
-*         : 19.07.2019 4.20    Modified comments (FLASH_CFG_CODE_FLASH_ENABLE, FLASH_CFG_CODE_FLASH_RUN_FROM_ROM).
-*         : 09.09.2019 4.30    Modified comments (FLASH_CFG_CODE_FLASH_ENABLE, FLASH_CFG_CODE_FLASH_RUN_FROM_ROM).
-***********************************************************************************************************************/
-#ifndef FLASH_CONFIG_HEADER_FILE
-#define FLASH_CONFIG_HEADER_FILE
-
-/***********************************************************************************************************************
- Configuration Options
- ***********************************************************************************************************************/
-/* SPECIFY WHETHER TO INCLUDE CODE FOR API PARAMETER CHECKING
- * Setting to BSP_CFG_PARAM_CHECKING_ENABLE utilizes the system default setting
- * Setting to 1 includes parameter checking; 0 compiles out parameter checking
- */
-#define FLASH_CFG_PARAM_CHECKING_ENABLE     (1)
-
-
-/******************************************************************************
- ENABLE CODE FLASH PROGRAMMING
-******************************************************************************/
-/* If you are only using data flash, set this to 0.
- * Setting to 1 includes code to program the ROM area. When programming ROM,
- * code must be executed from RAM, except under certain restrictions for flash
- * type 3 (see section 2.16 in App Note). See section 2.15 in the App Note for
- * details on how to set up code and the linker to execute code from RAM.
- */
-#define FLASH_CFG_CODE_FLASH_ENABLE (1)
-
-
-/******************************************************************************
- ENABLE BGO/NON-BLOCKING DATA FLASH OPERATIONS
-******************************************************************************/
-/* Setting this to 0 forces data flash API function to block until completed.
- * Setting to 1 places the module in BGO (background operations) mode. In BGO 
- * mode, data flash operations return immediately after the operation has been 
- * started. Notification of the operation completion is done via the callback 
- * function. 
- */
-#define FLASH_CFG_DATA_FLASH_BGO   (0)
-
-
-/******************************************************************************
- ENABLE BGO/NON-BLOCKING CODE FLASH (ROM) OPERATIONS
-******************************************************************************/
-/* Setting this to 0 forces ROM API function to block until completed.
- * Setting to 1 places the module in BGO (background operations) mode. In BGO 
- * mode, ROM operations return immediately after the operation has been started.
- * Notification of the operation completion is done via the callback function. 
- * When reprogramming ROM, THE RELOCATABLE VECTOR TABLE AND CORRESPONDING
- * INTERRUPT ROUTINES MUST BE IN RAM.  
- * See sections 2.17 Usage Notes in the App Note.
- */
-#define FLASH_CFG_CODE_FLASH_BGO   (0)
-
-
-/******************************************************************************
- ENABLE CODE FLASH SELF-PROGRAMMING
-******************************************************************************/
-/* Set this to 0 when programming code flash while executing in RAM.
- * Set this to 1 when programming code flash while executing from another
- * segment in ROM (possible only with RX64M, RX71M, RX65N-2, RX72M groups).
- * See section 2.16 in the App Note.
- */
-#define FLASH_CFG_CODE_FLASH_RUN_FROM_ROM   (1)
-
-
-#endif /* FLASH_CONFIG_HEADER_FILE */
diff --git a/Configuration/samples/bootloader/ck-rx65n-v2/src/smc_gen/r_config/r_fwup_config.h b/Configuration/samples/bootloader/ck-rx65n-v2/src/smc_gen/r_config/r_fwup_config.h
deleted file mode 100644
index 2c32adde..00000000
--- a/Configuration/samples/bootloader/ck-rx65n-v2/src/smc_gen/r_config/r_fwup_config.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
-* applicable laws, including copyright laws.
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the
-* following link:
-* http://www.renesas.com/disclaimer
-*
-* Copyright (C) 2023 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name     : r_fwup_config.h
-* Description   : Configures the Firmware update module.
-************************************************************************************************************************
-* History : DD.MM.YYYY Version Description
-*         : 20.07.2023 2.00    First Release
-*         : 29.09.2023 2.01    Fixed log messages.
-*                              Add parameter checking.
-*                              Added arguments to R_FWUP_WriteImageProgram API.
-***********************************************************************************************************************/
-#include "platform.h"
-
-#ifndef R_FWUP_CONFIG_H
-#define R_FWUP_CONFIG_H
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-/* Select the update mode.
-    0 = Dual bank
-    1 = Single bank with buffer. (default)
-    2 = Single bank without buffer.
-    3 = Single bank with ext-buffer.
-*/
-#define FWUP_CFG_UPDATE_MODE                        (0)
-
-/* Select the function mode.
-    0 = use for Boot loader
-    1 = use for User program
-*/
-#define FWUP_CFG_FUNCTION_MODE                      (0)
-
-/* Area configuration */
-#define FWUP_CFG_MAIN_AREA_ADDR_L                   (0xFFF00000U)      /* Main area start address     */
-#define FWUP_CFG_BUF_AREA_ADDR_L                    (0xFFE00000U)      /* Buffer area start address   */
-#define FWUP_CFG_AREA_SIZE                          (0xF0000U)         /* Install area size           */
-
-/* Internal flash */
-#define FWUP_CFG_CF_BLK_SIZE                        (0x8000U)          /* Code flash block size       */
-#define FWUP_CFG_CF_W_UNIT_SIZE                     (128U)             /* Code flash write unit size  */
-
-/* External flash */
-#define FWUP_CFG_EXT_BUF_AREA_ADDR_L                (0x00000U)         /* External Buffer area Start address */
-#define FWUP_CFG_EXT_BUF_AREA_BLK_SIZE              (4096U)            /* Block(Sector) size  */
-
-/* Data flash */
-#define FWUP_CFG_DF_ADDR_L                          (0x00100000)       /* DF Start address    */
-#define FWUP_CFG_DF_BLK_SIZE                        (64U)              /* DF Block size       */
-#define FWUP_CFG_DF_NUM_BLKS                        (512U)             /* DF number of blocks */
-
-/* FWUP v1 compatible */
-#define FWUP_CFG_FWUPV1_COMPATIBLE                  (0)                /* 0:Disable, 1:Enable */
-
-/* Select the algorithm of signature verification.
-    0 = ECDSA. (default)
-    1 = SHA256
-*/
-#define FWUP_CFG_SIGNATURE_VERIFICATION             (0)
-
-/* Disable Printf Output Setting.
-    Disables the character output by printf to the terminal software.
-    0 = Enable (default)
-    1 = Disable.
- */
-#define FWUP_CFG_PRINTF_DISABLE                     (0)
-
-#endif /* R_FWUP_CONFIG_H */
diff --git a/Configuration/samples/bootloader/ck-rx65n-v2/src/smc_gen/r_config/r_sci_rx_config.h b/Configuration/samples/bootloader/ck-rx65n-v2/src/smc_gen/r_config/r_sci_rx_config.h
deleted file mode 100644
index 4038efc3..00000000
--- a/Configuration/samples/bootloader/ck-rx65n-v2/src/smc_gen/r_config/r_sci_rx_config.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer 
-*
-* Copyright (C) 2013-2022 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name     : r_sci_rx_config.h
-* Description   : Configures the SCI driver
-************************************************************************************************************************
-* History : DD.MM.YYYY Version Description
-*           25.09.2013 1.00    Initial Release
-*           17.04.2014 1.20    Added comments for new RX110 support.
-*           02.07.2014 1.30    Fixed bug that caused Group12 rx errors to only be enabled for channel 2.
-*           25.11.2014 1.40    Added comments for RX113 support
-*           30.09.2015 1.70    Added comments for RX23T support
-*           01.10.2016 1.80    Added support for RX65N (comments and TX/RX FIFO THRESHOLD options)
-*           19.12.2016 1.90    Added comments for RX24U support
-*           07.03.2017 2.00    Added comments for RX130-512KB support
-*           28.09.2018 2.10    Added comments for RX66T support
-*           01.02.2019 2.20    Added comments for RX72T, RX65N-64pin support
-*                              Added support received data match function for RX65N
-*           28.06.2019 3.10    Added comments for RX23W support
-*           15.08.2019 3.20    Added support received data match function for RX72M (SCI0- SCI11)
-*                              Added support FIFO mode for RX72M (SCI7 - SCI11)
-*           25.11.2019 3.30    Added support RX13T.
-*                              Removed support for Generation 1 devices.
-*           30.12.2019 3.40    Added support RX66N, RX72N.
-*           31.03.2020 3.50    Added support RX23E-A.
-*           25.08.2020 3.60    Added feature using DTC/DMAC in SCI transfer.
-*                              Merged IrDA functionality to SCI FIT.
-*           31.03.2021 3.80    Added support for RX671.
-*                              Added support circular buffer in mode asynchronous.
-*           15.04.2021 3.90    Added support for RX140.
-*           31.03.2022 4.40    Added support for RX660.
-***********************************************************************************************************************/
-#ifndef SCI_CONFIG_H
-#define SCI_CONFIG_H
-
-#include "platform.h"
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-
-/* SPECIFY WHETHER TO INCLUDE CODE FOR API PARAMETER CHECKING */
-/* Setting to BSP_CFG_PARAM_CHECKING_ENABLE utilizes the system default setting */
-/* Setting to 1 includes parameter checking; 0 compiles out parameter checking */
-#define SCI_CFG_PARAM_CHECKING_ENABLE   (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-/* SPECIFY WHETHER TO INCLUDE CODE FOR DIFFERENT SCI MODES */
-/* Setting an equate to 1 includes code specific to that mode. */
-#define SCI_CFG_ASYNC_INCLUDED  (1)
-#define SCI_CFG_SYNC_INCLUDED   (0)
-#define SCI_CFG_SSPI_INCLUDED   (0)
-#define SCI_CFG_IRDA_INCLUDED   (0)
-
-/* Use circular buffer in mode asynchronous */
-/* 1=Use , 0=Unused */
-/* When SCI_CFG_USE_CIRCULAR is 1, please set BSP_CFG_RUN_IN_USER_MODE = 0  and BYTEQ_CFG_PROTECT_QUEUE = 1*/
-#define SCI_CFG_USE_CIRCULAR_BUFFER (0)
-
-/* SPECIFY BYTE VALUE TO TRANSMIT WHILE CLOCKING IN DATA IN SSPI MODES */
-#define SCI_CFG_DUMMY_TX_BYTE   (0xFF)
-
-/* SPECIFY CHANNELS TO INCLUDE SOFTWARE SUPPORT FOR 1=included, 0=not */
-/*
- * NOTE: If using ASYNC mode, adjust BYTEQ_CFG_MAX_CTRL_BLKS in r_byteq_config.h
- * to provide 2 queues per channel (static mode only).
- * * = port connector RSKRX11x
- * u = channel used by the USB-UART port (G1CUSB0)
- * a = this channel is used only for RX130-512KB
- * n = this channel is not available for RX65N-64pin.
- * s = this channel is not available in simple SPI mode.
- * i = this channel is available in IrDA interface.
- * RX MCU supported channels
- *
- * CH#  110 111 113 130 140 230  231  23T 24T 24U 64M 71M 65N 66T 72T 23W 72M 13T 72N 66N 23E-A 671 660
- * ---  --- --- --- --- --- --- ----- --- --- --- --- --- --- --- --- --- --- --- --- --- ----- --- ---
- * CH0           X   Xa      X    X                X   X   Xn              X       X   X          X   X
- * CH1   X   X*  X*  Xu   X  X    X    Xu  Xu  Xu  X   X   Xs  X   X   X   X   X   X   X    Xu    X   X
- * CH2           X                                 X   X   Xu              X       X   X          X   X
- * CH3                                             X   X   Xs              X       X   X          X   X
- * CH4                                             X   X   Xn              X       X   X          X   X
- * CH5   X   X   Xi  X    X  Xi   Xu,i X   X   X   X   X   X   X   X   Xi  X   X   X   X    X     X   X
- * CH6           X   X    X  X    X        X   X   X   X   Xn  X   X       Xu      X   X    X     X   X
- * CH7                                             Xu  Xu  Xn              X       X   X          X   X
- * CH8           X   Xa   X  X    X            X           X   X   X   Xu  X       X   X          X   X
- * CH9           X   Xa   X  X    X            X           Xs  X   X       X       X   X          X   X
- * CH10                                                    X               X       X   X          X   X
- * CH11                                        X           Xs  X   X       X       X   X          X   X
- * CH12  X   X   X   X    X  X    X                X   X   Xs  X   X   X   X   X   X   X    X     X   X
-*/
-                                   
-#define SCI_CFG_CH0_INCLUDED    (0)
-#define SCI_CFG_CH1_INCLUDED    (0)
-#define SCI_CFG_CH2_INCLUDED    (0)
-#define SCI_CFG_CH3_INCLUDED    (0)
-#define SCI_CFG_CH4_INCLUDED    (0)
-#define SCI_CFG_CH5_INCLUDED    (1)
-#define SCI_CFG_CH6_INCLUDED    (0)
-#define SCI_CFG_CH7_INCLUDED    (0)
-#define SCI_CFG_CH8_INCLUDED    (0)
-#define SCI_CFG_CH9_INCLUDED    (0)
-#define SCI_CFG_CH10_INCLUDED   (0)
-#define SCI_CFG_CH11_INCLUDED   (0)
-#define SCI_CFG_CH12_INCLUDED   (0)
-
-/* SPECIFY ASYNC MODE TX QUEUE BUFFER SIZES (will not allocate if chan not enabled */
-#define SCI_CFG_CH0_TX_BUFSIZ   (80)
-#define SCI_CFG_CH1_TX_BUFSIZ   (80)
-#define SCI_CFG_CH2_TX_BUFSIZ   (80)
-#define SCI_CFG_CH3_TX_BUFSIZ   (80)
-#define SCI_CFG_CH4_TX_BUFSIZ   (80)
-#define SCI_CFG_CH5_TX_BUFSIZ   (80)
-#define SCI_CFG_CH6_TX_BUFSIZ   (80)
-#define SCI_CFG_CH7_TX_BUFSIZ   (80)
-#define SCI_CFG_CH8_TX_BUFSIZ   (80)
-#define SCI_CFG_CH9_TX_BUFSIZ   (80)
-#define SCI_CFG_CH10_TX_BUFSIZ  (80)
-#define SCI_CFG_CH11_TX_BUFSIZ  (80)
-#define SCI_CFG_CH12_TX_BUFSIZ  (80)
-
-/* SPECIFY ASYNC MODE RX QUEUE BUFFER SIZES (will not allocate if chan not enabled */
-#define SCI_CFG_CH0_RX_BUFSIZ   (80)
-#define SCI_CFG_CH1_RX_BUFSIZ   (80)
-#define SCI_CFG_CH2_RX_BUFSIZ   (80)
-#define SCI_CFG_CH3_RX_BUFSIZ   (80)
-#define SCI_CFG_CH4_RX_BUFSIZ   (80)
-#define SCI_CFG_CH5_RX_BUFSIZ   (80)
-#define SCI_CFG_CH6_RX_BUFSIZ   (80)
-#define SCI_CFG_CH7_RX_BUFSIZ   (80)
-#define SCI_CFG_CH8_RX_BUFSIZ   (80)
-#define SCI_CFG_CH9_RX_BUFSIZ   (80)
-#define SCI_CFG_CH10_RX_BUFSIZ  (80)
-#define SCI_CFG_CH11_RX_BUFSIZ  (80)
-#define SCI_CFG_CH12_RX_BUFSIZ  (80)
-
-/* 
-* ENABLE TRANSMIT END INTERRUPT (ASYNCHRONOUS)
-* This interrupt only occurs when the last bit of the last byte of data 
-* has been sent and the transmitter has become idle. The interrupt calls
-* the user's callback function specified in R_SCI_Open() and passes it an
-* SCI_EVT_TEI event. A typical use of this feature is to disable an external
-* transceiver to save power. It would then be up to the user's code to 
-* re-enable the transceiver before sending again. Not including this feature
-* reduces code space used by the interrupt. Note that this equate is only
-* for including the TEI code. The interrupt itself must be enabled using an
-* R_SCI_Control(hdl, SCI_CMD_EN_TEI, NULL) call.
-*/
-#define SCI_CFG_TEI_INCLUDED    (0)      /* 1=included, 0=not */
-
-/* 
-* SET GROUPBL0 (ERI, TEI) INTERRUPT PRIORITY; RX64M/RX71M/RX65N/RX72M/RX72N/RX66N/RX671/RX660 ONLY
-* SET GROUPBL1; RX65N ONLY
-* SET GROUPAL0 (ERI,TEI) INTERRUPT PRIORITY; RX65N, RX72M, RX72N, RX66N ONLY
-* This sets the priority level for receiver overrun, framing, and parity errors
-* as well as TEI interrupts for all SCI channels.
-*/
-#define SCI_CFG_ERI_TEI_PRIORITY (3)     /* (RX64M/RX71M/RX65N/RX72M/RX72N/RX66N/RX671/RX660 ONLY) 1 lowest, 15 highest */
-
-/* ENABLE TX/RX FIFO; (SCIi supported MCU ONLY) 1=included, 0=not */
-#define SCI_CFG_CH7_FIFO_INCLUDED   (0)
-#define SCI_CFG_CH8_FIFO_INCLUDED   (0)
-#define SCI_CFG_CH9_FIFO_INCLUDED   (0)
-#define SCI_CFG_CH10_FIFO_INCLUDED  (0)
-#define SCI_CFG_CH11_FIFO_INCLUDED  (0)
-
-/* SET TX FIFO THRESHOLD; (SCIi supported MCU ONLY) 0 lowest, 15 highest */
-/* TX FIFO THRESHOLD is invalid in Clock Synchronous Mode and Simple SPI Mode. */
-/* Set the same value for TX FIFO THRESHOLD and RX FIFO THRESHOLD in Clock Synchronous Mode and Simple SPI Mode. */
-#define SCI_CFG_CH7_TX_FIFO_THRESH (8)
-#define SCI_CFG_CH8_TX_FIFO_THRESH (8)
-#define SCI_CFG_CH9_TX_FIFO_THRESH (8)
-#define SCI_CFG_CH10_TX_FIFO_THRESH (8)
-#define SCI_CFG_CH11_TX_FIFO_THRESH (8)
-
-/* SET RX FIFO THRESHOLD; (SCIi supported MCU ONLY) 1 lowest, 15 highest */
-#define SCI_CFG_CH7_RX_FIFO_THRESH (8)
-#define SCI_CFG_CH8_RX_FIFO_THRESH (8)
-#define SCI_CFG_CH9_RX_FIFO_THRESH (8)
-#define SCI_CFG_CH10_RX_FIFO_THRESH (8)
-#define SCI_CFG_CH11_RX_FIFO_THRESH (8)
-
-/* ENABLE Received Data match function (SCIj and SCIi supported MCU RX65N/RX66T/RX72T/RX72M/RX72N/RX66N ONLY) 1=included, 0=not */
-/*((SCIk and SCIm supported MCU RX671/RX660 ONLY) 1=included, 0=not */
-#define SCI_CFG_CH0_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH1_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH2_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH3_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH4_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH5_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH6_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH7_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH8_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH9_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH10_DATA_MATCH_INCLUDED (0)
-#define SCI_CFG_CH11_DATA_MATCH_INCLUDED (0)
-
-/* 0=Disable, 1=DTC, 2=DMAC */
-#define SCI_CFG_CH0_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH1_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH2_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH3_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH4_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH5_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH6_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH7_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH8_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH9_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH10_TX_DTC_DMACA_ENABLE (0)
-#define SCI_CFG_CH11_TX_DTC_DMACA_ENABLE (0)
-#define SCI_CFG_CH12_TX_DTC_DMACA_ENABLE (0)
-
-#define SCI_CFG_CH0_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH1_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH2_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH3_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH4_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH5_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH6_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH7_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH8_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH9_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH10_RX_DTC_DMACA_ENABLE (0)
-#define SCI_CFG_CH11_RX_DTC_DMACA_ENABLE (0)
-#define SCI_CFG_CH12_RX_DTC_DMACA_ENABLE (0)
-
-/* 0~7 8 channels dmac, but maximum of SCI channel is 13 channel => cost 13*2 = 26 dmac channels in case all of sci channels run simultaneously */
-#define SCI_CFG_CH0_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH1_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH2_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH3_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH4_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH5_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH6_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH7_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH8_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH9_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH10_TX_DMACA_CH_NUM     (0)
-#define SCI_CFG_CH11_TX_DMACA_CH_NUM     (0)
-#define SCI_CFG_CH12_TX_DMACA_CH_NUM     (0)
-
-#define SCI_CFG_CH0_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH1_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH2_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH3_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH4_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH5_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH6_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH7_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH8_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH9_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH10_RX_DMACA_CH_NUM     (1)
-#define SCI_CFG_CH11_RX_DMACA_CH_NUM     (1)
-#define SCI_CFG_CH12_RX_DMACA_CH_NUM     (1)
-
-/* Set enable/ disable transmit signal transition timing adjust feature for each channel*/
-#define SCI_CFG_CH0_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH1_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH2_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH3_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH4_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH5_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH6_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH7_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH8_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH9_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH10_TX_SIGNAL_TRANSITION_TIMING_INCLUDED   (0)
-#define SCI_CFG_CH11_TX_SIGNAL_TRANSITION_TIMING_INCLUDED   (0)
-
-/* Set enable/ disable receive data sampling timing adjust feature for each channel*/
-#define SCI_CFG_CH0_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH1_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH2_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH3_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH4_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH5_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH6_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH7_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH8_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH9_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH10_RX_DATA_SAMPLING_TIMING_INCLUDED   (0)
-#define SCI_CFG_CH11_RX_DATA_SAMPLING_TIMING_INCLUDED   (0)
-
-/* SPECIFY IRDA CHANNELS TO INCLUDE SOFTWARE (SUPPORTED MCU RX113/RX23W/RX231/RX230 ONLY) 1=included, 0=not */
-#define SCI_CFG_CH5_IRDA_INCLUDED    (0)
-
-/* Set the non-active level of the TXD pin */
-/* 1=High , 0=Low */
-#define SCI_CFG_CH5_IRDA_IRTXD_INACTIVE_LEVEL (1)
-
-/* Set the non-active level of the RXD pin */
-/* 1=High , 0=Low */
-#define SCI_CFG_CH5_IRDA_IRRXD_INACTIVE_LEVEL (1)
-
-#endif /* SCI_CONFIG_H */
diff --git a/Configuration/samples/bootloader/ck-rx65n/CK-RX65N_boot_loader_scfg.ftl b/Configuration/samples/bootloader/ck-rx65n/CK-RX65N_boot_loader_scfg.ftl
deleted file mode 100644
index d0210d22..00000000
--- a/Configuration/samples/bootloader/ck-rx65n/CK-RX65N_boot_loader_scfg.ftl
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<smc>
-    <general version="2.0.0.0">
-        <configuration active="true" id="${configurationTypeReleaseID}">
-            <property id="com.renesas.smc.service.project.buildArtefactType" values="com.renesas.smc.service.project.buildArtefactType.exe"/>
-            <toolchain id="${toolChainID}">
-                <option id="com.renesas.smc.toolchain.option.buildArtefactType" key="com.renesas.smc.toolchain.option.buildArtefactType.exe"/>
-                <option id="com.renesas.smc.toolchain.option.rtos" key="com.renesas.smc.toolchain.option.rtos.none">
-                </option>
-            </toolchain>
-        </configuration>
-        <platform id="${targetDevice}"/>
-    </general>
-    <tool id="SWComponent" version="1.0.0.0">
-        <configuration inuse="true" name="r_byteq">
-            <component description="Dependency : r_bsp version(s) 6.20&#10;This module allocates a queue control block in an Open() call to handle indexing for buffers provided by the user application. Additional functions are provided to put and get data from the buffer queue, inspect the number of bytes available or in use, and to flush the queue. There is no limit to the number of queues supported, and queue control blocks can be allocated statically at build time or dynamically at run time." detailDescription="Byte-based circular buffer library." display="r_byteq" id="r_byteq2.00" version="2.00">
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_bsp">
-            <component display="r_bsp" id="r_bsp7.20" version="7.20">
-                <gridItem id="BSP_CFG_USER_CHARPUT_ENABLED" selectedIndex="1"/>
-                <gridItem id="BSP_CFG_PARAM_CHECKING_ENABLE" selectedIndex="0"/>
-                <gridItem id="BSP_CFG_SCI_UART_TERMINAL_ENABLE" selectedIndex="1"/>
-                <gridItem id="BSP_CFG_SCI_UART_TERMINAL_CHANNEL" selectedIndex="5"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_sci_rx">
-            <component detailDescription="Multi-Channel Multi-Mode SCI Driver." display="r_sci_rx" id="r_sci_rx4.40" version="4.40">
-                <gridItem id="RXD5/SMISO5/SSCL5" selectedIndex="1"/>
-                <gridItem id="TXD5/SMOSI5/SSDA5" selectedIndex="1"/>
-                <gridItem id="SCI5" selectedIndex="1"/>
-                <gridItem id="SCI_CFG_CH1_INCLUDED" selectedIndex="0"/>
-                <gridItem id="SCI_CFG_CH5_INCLUDED" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_fwup">
-            <component description="Dependency : r_flash_rx version(s) 4.80, 4.91&#10;This module is a software library for implementing the firmware update function in user applications." detailDescription="FWUP Library" display="r_fwup" id="r_fwup2.01" version="2.01">
-                <gridItem id="FWUP_CFG_UPDATE_MODE" selectedIndex="0"/>
-                <gridItem id="FWUP_CFG_MAIN_AREA_ADDR_L" selectedIndex="0xFFF00000U"/>
-                <gridItem id="FWUP_CFG_BUF_AREA_ADDR_L" selectedIndex="0xFFE00000U"/>
-                <gridItem id="FWUP_CFG_AREA_SIZE" selectedIndex="0xF0000U"/>
-                <gridItem id="FWUP_CFG_CF_BLK_SIZE" selectedIndex="0x8000U"/>
-                <gridItem id="FWUP_CFG_CF_W_UNIT_SIZE" selectedIndex="128U"/>
-                <gridItem id="FWUP_CFG_EXT_BUF_AREA_ADDR_L" selectedIndex="0x00000U"/>
-                <gridItem id="FWUP_CFG_EXT_BUF_AREA_BLK_SIZE" selectedIndex="4096U"/>
-                <gridItem id="FWUP_CFG_DF_BLK_SIZE" selectedIndex="64U"/>
-                <gridItem id="FWUP_CFG_DF_NUM_BLKS" selectedIndex="512U"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_flash_rx">
-            <component description="Dependency : r_bsp version(s) 5.20, 5.30, 5.40, 5.50, 5.52, 6.10, 6.20, 6.21, 7.00, 7.10, 7.20, 7.30&#10;This module allows the user to program, erase, write and blankcheck the Code and/or Data flash." detailDescription="Flash API for RX100, RX200, RX600. and RX700." display="r_flash_rx" id="r_flash_rx5.00" version="5.00">
-                <gridItem id="FLASH_CFG_CODE_FLASH_ENABLE" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_CODE_FLASH_RUN_FROM_ROM" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-    </tool>
-</smc>
diff --git a/Configuration/samples/bootloader/ck-rx65n/README.md b/Configuration/samples/bootloader/ck-rx65n/README.md
deleted file mode 100644
index 2c259813..00000000
--- a/Configuration/samples/bootloader/ck-rx65n/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
----------------
-1. Usage Notes
----------------
-  
-1.1. Please take note that the sample project is verified with C project.  
-If you create new project with C++ option, please confirm its behaviour by yourself.  
-For example, if you create project with C++ option and CC-RX compiler, you will need to add abort() function manually.  
-  
-1.2. This sample project requires a "DUAL" device setting.  
-If using e2studio_2024-01 and earlier, and "non-DUAL" target board (e.g: CK-RX65N) is selected in the PG wizard, please change to "DUAL" device following the steps below:  
-###
-        1. In the Smart Configurator window, select the Board tab to open the Device selection window.
-        2. Click the ... button next to Board: to open the Change Device window.
-        3. In the Change Device window, change the value of the Target Device: item to R5F565NEHxFB_DUAL.
-           (You can click the ... button to the right of the text entry field to choose from a list of candidates.
-            Leave the Target Board: setting of Custom unchanged.)
-        4. After changing the device, click the Next > button.
-           On the information window that appears, click the Next > button again without making changes.
-        5. Finally, a window appears asking you to confirm the change. Click the Finish button.
-           (If a window asking you to confirm a change of target board appears, click the Yes button.)
-    
-1.3 If using e2studio_2024-04 and later, and Bank Mode is configured as "Single Bank" in the PG wizard, please change to "Dual Bank" following the steps below:
-###
-        1. In the Smart Configurator window, select the Board tab to open the Device configuration window.
-        2. Change the value of the Bank Mode: item to "Dual Bank".
-        3. Click "Generate Code" to apply the changes.
-  
-1.4. After device/bank mode is changed, compiler setting is reset, please update the linker settings following the steps below:
-###
-      - Under [Project] > [C/C++ Project Settings]:
-      - For CC-RX,
-        1. Go to Linker > Section, click Import...
-        2. Select "linker_section_sample.esi" under src folder of current project.
-  
-1.5. Please make sure to configure Smart Configurator 'Code generation behavior' to 'Update configuration files'.  
-You can do so in e2studio Windows > Preferences > Renesas > Smart Configurator > Component.  
-This is necessary because the FWUP module uses custom wrapper code for this application, this Smart Configurator setting ensures that wrapper code is not overwritten
\ No newline at end of file
diff --git a/Configuration/samples/bootloader/ck-rx65n/linker_section_sample.esi b/Configuration/samples/bootloader/ck-rx65n/linker_section_sample.esi
deleted file mode 100644
index e4e72257..00000000
--- a/Configuration/samples/bootloader/ck-rx65n/linker_section_sample.esi
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<com.renesas.linkersection.model:SectionContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:com.renesas.linkersection.model="http:///LinkerSection.ecore">
-  <sections name="SU">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4"/>
-  </sections>
-  <sections name="SI"/>
-  <sections name="B_1"/>
-  <sections name="R_1"/>
-  <sections name="B_2"/>
-  <sections name="R_2"/>
-  <sections name="B"/>
-  <sections name="R"/>
-  <sections name="RPFRAM2"/>
-  <sections name="C_1">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294901760"/>
-  </sections>
-  <sections name="C_2"/>
-  <sections name="C"/>
-  <sections name="C$*"/>
-  <sections name="D*"/>
-  <sections name="W*"/>
-  <sections name="L"/>
-  <sections name="P*"/>
-  <sections name="PFRAM2"/>
-  <sections name="EXCEPTVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294967168"/>
-  </sections>
-  <sections name="RESETVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294967292"/>
-  </sections>
-</com.renesas.linkersection.model:SectionContainer>
diff --git a/Configuration/samples/bootloader/ck-rx65n/src/smc_gen/r_config/r_bsp_config.h b/Configuration/samples/bootloader/ck-rx65n/src/smc_gen/r_config/r_bsp_config.h
deleted file mode 100644
index 06f948bc..00000000
--- a/Configuration/samples/bootloader/ck-rx65n/src/smc_gen/r_config/r_bsp_config.h
+++ /dev/null
@@ -1,743 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer
-*
-* Copyright (C) 2017 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name    : r_bsp_config_reference.h
-* Device(s)    : RX65N
-* Description  : The file r_bsp_config.h is used to configure your BSP. r_bsp_config.h should be included
-*                somewhere in your package so that the r_bsp code has access to it. This file (r_bsp_config_reference.h)
-*                is just a reference file that the user can use to make their own r_bsp_config.h file.
-************************************************************************************************************************
-* History : DD.MM.YYYY Version   Description
-*         : 15.05.2017 1.00      First Release
-*         : 01.12.2017 1.01      Added the following macro definition.
-*                                - BSP_CFG_EBMAPCR_1ST_PRIORITY
-*                                - BSP_CFG_EBMAPCR_2ND_PRIORITY
-*                                - BSP_CFG_EBMAPCR_3RD_PRIORITY
-*                                - BSP_CFG_EBMAPCR_4TH_PRIORITY
-*                                - BSP_CFG_EBMAPCR_5TH_PRIORITY
-*         : 01.07.2018 1.02      Added the following macro definition.
-*                                - BSP_CFG_CONFIGURATOR_SELECT
-*                                Add RTOS support. FreeRTOS. Define a timer for RTOS.
-*         : 27.07.2018 1.03      Modified the comment of PLL clock source.
-*                                Added the following macro definition for ID code protection.
-*                                 - BSP_CFG_ID_CODE_LONG_1
-*                                 - BSP_CFG_ID_CODE_LONG_2
-*                                 - BSP_CFG_ID_CODE_LONG_3
-*                                 - BSP_CFG_ID_CODE_LONG_4
-*                                Added the following macro definition.
-*                                 - BSP_CFG_FIT_IPL_MAX
-*         : 31.10.2018 1.04      Added support for RX651 with 64 pin package.
-*         : 28.02.2019 2.00      Added support for GNUC and ICCRX.
-*                                Fixed coding style.
-*         : 26.07.2019 2.01      Modified comment.
-*         : 08.10.2019 2.02      Added the following macro definition.
-*                                - BSP_CFG_SWINT_UNIT1_ENABLE
-*                                - BSP_CFG_SWINT_UNIT2_ENABLE
-*                                - BSP_CFG_SWINT_TASK_BUFFER_NUMBER
-*                                - BSP_CFG_SWINT_IPR_INITIAL_VALUE
-*                                Modified comment for added support of Renesas RTOS (RI600V4 or RI600PX).
-*                                Added the following macro definition.
-*                                - BSP_CFG_RENESAS_RTOS_USED
-*         : 31.07.2020 2.03      Modified comment.
-*         : 29.01.2021 2.04      Added the following macro definition.
-*                                - BSP_CFG_SCI_UART_TERMINAL_ENABLE
-*                                - BSP_CFG_SCI_UART_TERMINAL_CHANNEL
-*                                - BSP_CFG_SCI_UART_TERMINAL_BITRATE
-*                                - BSP_CFG_SCI_UART_TERMINAL_INTERRUPT_PRIORITY
-*         : 26.02.2021 2.05      Added a comment for Azure RTOS to BSP_CFG_RTOS_USED.
-*         : 30.11.2021 3.00      Added the following macro definitions.
-*                                - BSP_CFG_MAIN_CLOCK_OSCILLATE_ENABLE
-*                                - BSP_CFG_SUB_CLOCK_OSCILLATE_ENABLE
-*                                - BSP_CFG_HOCO_OSCILLATE_ENABLE
-*                                - BSP_CFG_LOCO_OSCILLATE_ENABLE
-*                                - BSP_CFG_IWDT_CLOCK_OSCILLATE_ENABLE
-*                                - BSP_CFG_CONFIGURATOR_VERSION
-*                                - BSP_CFG_CPLUSPLUS
-*                                - BSP_CFG_SERIAL_PROGRAMMER_CONECT_ENABLE
-*                                Changed initial value of the following macro definitions.
-*                                - BSP_CFG_MCU_PART_GROUP
-*                                - BSP_CFG_MCU_PART_SERIES
-*         : 11.02.2022 3.01      Changed initial value of the following macro definitions.
-*                                - BSP_CFG_SWINT_UNIT1_ENABLE
-*                                - BSP_CFG_SWINT_UNIT2_ENABLE
-***********************************************************************************************************************/
-#ifndef R_BSP_CONFIG_REF_HEADER_FILE
-#define R_BSP_CONFIG_REF_HEADER_FILE
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-
-/* NOTE:
-   The default settings are the same as when using RSKRX65N-2MB.
-   Change to the settings for the user board.
-*/
-
-/* Start up select
-   0 = Enable BSP startup program.
-   1 = Disable BSP startup program. (e.g. Using user startup program.)
-   NOTE: This setting is available only when using CCRX. */
-#define BSP_CFG_STARTUP_DISABLE (0)
-
-/* Enter the product part number for your MCU. This information will be used to obtain information about your MCU such 
-   as package and memory size.
-   To help parse this information, the part number will be defined using multiple macros.
-   R 5 F 56 5N E D D FP
-   | | | |  |  | | | |  Macro Name                             Description
-   | | | |  |  | | | |__BSP_CFG_MCU_PART_PACKAGE             = Package type, number of pins, and pin pitch
-   | | | |  |  | | |____not used                             = Products with wide temperature range
-   | | | |  |  | |______BSP_CFG_MCU_PART_ENCRYPTION_INCLUDED = Encryption module included/not included
-   | | | |  |  |________BSP_CFG_MCU_PART_MEMORY_SIZE         = ROM, RAM, and Data Flash Capacity
-   | | | |  |___________BSP_CFG_MCU_PART_GROUP               = Group name
-   | | | |______________BSP_CFG_MCU_PART_SERIES              = Series name
-   | | |________________BSP_CFG_MCU_PART_MEMORY_TYPE         = Type of memory (Flash, ROMless)
-   | |__________________not used                             = Renesas MCU
-   |____________________not used                             = Renesas semiconductor product.
-*/
-
-/* Package type. Set the macro definition based on values below:
-   Character(s) = Value for macro = Package Type/Number of Pins/Pin Pitch
-   FC           = 0x0             = LFQFP/176/0.50
-   BG           = 0x1             = LFBGA/176/0.80
-   LC           = 0x2             = TFLGA/177/0.50
-   FB           = 0x3             = LFQFP/144/0.50
-   LK           = 0x4             = TFLGA/145/0.50
-   FP           = 0x5             = LFQFP/100/0.50
-   FM           = 0x8             = LFQFP/64/0.50
-   LJ           = 0xA             = TFLGA/100/0.65
-   BP           = 0xC             = TFBGA/64/0.50
-*/
-#define BSP_CFG_MCU_PART_PACKAGE        (0x3) /* Generated value. Do not edit this manually */
-
-/* Whether Encryption and SDHI/SDSI are included or not.
-   Character(s) = Value for macro = Description
-   A            = false           = Encryption module not included, SDHI/SDSI module not included
-   B            = false           = Encryption module not included, SDHI/SDSI module included
-   D            = false           = Encryption module not included, SDHI/SDSI module included, dual-bank structure
-   E            = true            = Encryption module included, SDHI/SDSI module not included
-   F            = true            = Encryption module included, SDHI/SDSI module included
-   H            = true            = Encryption module included, SDHI/SDSI module included, dual-bank structure
-*/
-#define BSP_CFG_MCU_PART_ENCRYPTION_INCLUDED   (true) /* Generated value. Do not edit this manually */
-
-/* ROM, RAM, and Data Flash Capacity.
-   Character(s) = Value for macro = ROM Size/Ram Size/Data Flash Size
-   4            = 0x4             = 512KB/256KB/Not equipped
-   7            = 0x7             = 768KB/256KB/Not equipped
-   9            = 0x9             = 1MB/256KB/Not equipped
-   C            = 0xC             = 1.5MB/640KB/32KB
-   E            = 0xE             = 2MB/640KB/32KB
-   NOTE: When the RAM capacity is 640KB, the RAM areas are not contiguous.
-*/
-#define BSP_CFG_MCU_PART_MEMORY_SIZE    (0xE) /* Generated value. Do not edit this manually */
-
-/* Group name.
-   Character(s) = Description
-   5N/51        = RX65N Group/RX651 Group
-*/
-#define BSP_CFG_MCU_PART_GROUP          "RX65N" /* Generated value. Do not edit this manually */
-
-/* Series name.
-   Character(s) = Description
-   56           = RX600 Series
-*/
-#define BSP_CFG_MCU_PART_SERIES         "RX600" /* Generated value. Do not edit this manually */
-
-/* Memory type.
-   Character(s) = Value for macro = Description
-   F            = 0x0             = Flash memory version
-*/
-#define BSP_CFG_MCU_PART_MEMORY_TYPE    (0x0) /* Generated value. Do not edit this manually */
-
-/* Whether to use 1 stack or 2. RX MCUs have the ability to use 2 stacks: an interrupt stack and a user stack.
- * When using 2 stacks the user stack will be used during normal user code. When an interrupt occurs the CPU
- * will automatically shift to using the interrupt stack. Having 2 stacks can make it easier to figure out how
- * much stack space to allocate since the user does not have to worry about always having enough room on the
- * user stack for if-and-when an interrupt occurs. Some users will not want 2 stacks though because it is not
- * needed in all applications and can lead to wasted RAM (i.e. space in between stacks that is not used).
- * If only 1 stack is used then the interrupt stack is the one that will be used. If 1 stack is chosen then
- * the user may want to remove the 'SU' section from the linker sections to remove any linker warnings.
- *
- * 0 = Use 1 stack. Disable user stack. User stack size set below will be ignored.
- * 1 = Use 2 stacks. User stack and interrupt stack will both be used.
- * NOTE: This setting is available only when using CCRX and GNUC.
- *       This is invalid when using Renesas RTOS with CCRX.
- */
-#define BSP_CFG_USER_STACK_ENABLE       (1)
-
-/* If only 1 stack is chosen using BSP_CFG_USER_STACK_ENABLE then no RAM will be allocated for the user stack. */
-#if BSP_CFG_USER_STACK_ENABLE == 1
-/* User Stack size in bytes.
- * NOTE: This setting is available only when using CCRX and GNUC.
- *       This is invalid when using Renesas RTOS with CCRX. */
-#define BSP_CFG_USTACK_BYTES            (0x1000)
-#endif
-
-/* Interrupt Stack size in bytes.
-   NOTE: This setting is available only when using CCRX and GNUC. */
-#define BSP_CFG_ISTACK_BYTES            (0x400)
-
-/* Heap size in bytes.
-   To disable the heap you must follow these steps:
-   1) Set this macro (BSP_CFG_HEAP_BYTES) to 0.
-   2) Set the macro BSP_CFG_IO_LIB_ENABLE to 0.
-   3) Disable stdio from being built into the project library. This is done by going into the Renesas RX Toolchain 
-      settings and choosing the Standard Library section. After that choose 'Contents' in e2 studio.
-      This will present a list of modules that can be included. Uncheck the box for stdio.h.
-   NOTE: This setting is available only when using CCRX and GNUC. */
-#define BSP_CFG_HEAP_BYTES              (0x400)
-
-/* Initializes C input & output library functions.
-   0 = Disable I/O library initialization in resetprg.c. If you are not using stdio then use this value.
-   1 = Enable I/O library initialization in resetprg.c. This is default and needed if you are using stdio.
-   NOTE: This setting is available only when using CCRX. */
-#define BSP_CFG_IO_LIB_ENABLE           (1)
-
-/* If desired the user may redirect the stdio charget() and/or charput() functions to their own respective functions
-   by enabling below and providing and replacing the my_sw_... function names with the names of their own functions. */
-#define BSP_CFG_USER_CHARGET_ENABLED    (0)
-#define BSP_CFG_USER_CHARGET_FUNCTION     my_sw_charget_function
-
-#define BSP_CFG_USER_CHARPUT_ENABLED    (1)
-#define BSP_CFG_USER_CHARPUT_FUNCTION     my_sw_charput_function
-
-/* After reset MCU will operate in Supervisor mode. To switch to User mode, set this macro to '1'. For more information
-   on the differences between these 2 modes see the CPU >> Processor Mode section of your MCU's hardware manual.
-   0 = Stay in Supervisor mode.
-   1 = Switch to User mode.
-   NOTE: This is invalid when using Renesas RTOS with CCRX.
-*/
-#define BSP_CFG_RUN_IN_USER_MODE        (0)
-
-/* Set your desired ID code. NOTE, leave at the default (all 0xFF's) if you do not wish to use an ID code. If you set 
-   this value and program it into the MCU then you will need to remember the ID code because the debugger will ask for 
-   it when trying to connect. Note that the E1/E20 will ignore the ID code when programming the MCU during debugging.
-   If you set this value and then forget it then you can clear the ID code by connecting up in serial boot mode using 
-   FDT. The ID Code is 16 bytes long. The macro below define the ID Code in 4-byte sections. */
-/* Lowest 4-byte section, address 0xFE7F5D50. From MSB to LSB: ID code 4, ID code 3, ID code 2, ID code 1/Control Code.
- */
-#define BSP_CFG_ID_CODE_LONG_1          (0xFFFFFFFF)
-/* 2nd ID Code section, address 0xFE7F5D54. From MSB to LSB: ID code 8, ID code 7, ID code 6, ID code 5. */
-#define BSP_CFG_ID_CODE_LONG_2          (0xFFFFFFFF)
-/* 3rd ID Code section, address 0xFE7F5D58. From MSB to LSB: ID code 12, ID code 11, ID code 10, ID code 9. */
-#define BSP_CFG_ID_CODE_LONG_3          (0xFFFFFFFF)
-/* 4th ID Code section, address 0xFE7F5D5C. From MSB to LSB: ID code 16, ID code 15, ID code 14, ID code 13. */
-#define BSP_CFG_ID_CODE_LONG_4          (0xFFFFFFFF)
-
-/* Select whether to enables or disables the connection of serial programmer.
-   0 = Connection of a serial programmer is prohibited after a reset.
-   1 = Connection of a serial programmer is permitted after a reset. (default)
-*/
-#define BSP_CFG_SERIAL_PROGRAMMER_CONECT_ENABLE   (1)
-
-/* Select whether to oscillate the Main Clock Oscillator.
-   0 = Stop Oscillating the Main Clock.
-   1 = Enable oscillating the Main Clock. (default)
-*/
-#define BSP_CFG_MAIN_CLOCK_OSCILLATE_ENABLE    (1) /* Generated value. Do not edit this manually */
-
-/* Select whether to oscillate the Sub Clock Oscillator.
-   0 = Stop Oscillating the Sub Clock. (default)
-   1 = Enable Oscillating the Sub Clock.
-*/
-#define BSP_CFG_SUB_CLOCK_OSCILLATE_ENABLE     (1) /* Generated value. Do not edit this manually */
-
-/* Select whether to oscillate the High Speed On-Chip Oscillator (HOCO).
-   0 = Stop Oscillating the HOCO. (default)
-   1 = Enable Oscillating the HOCO.
-*/
-#define BSP_CFG_HOCO_OSCILLATE_ENABLE          (0) /* Generated value. Do not edit this manually */
-
-/* Select whether to oscillate the Low Speed On-Chip Oscillator (LOCO).
-   0 = Stop Oscillating the LOCO. (default)
-   1 = Enable Oscillating the LOCO.
-*/
-#define BSP_CFG_LOCO_OSCILLATE_ENABLE          (0) /* Generated value. Do not edit this manually */
-
-/* Select whether to oscillate the IWDT-Dedicated On-Chip Oscillator (IWDT).
-   0 = Stop Oscillating the IWDT Clock. (default)
-   1 = Enable Oscillating the IWDT Clock.
-*/
-#define BSP_CFG_IWDT_CLOCK_OSCILLATE_ENABLE    (0) /* Generated value. Do not edit this manually */
-
-/* Clock source select (CKSEL).
-   0 = Low Speed On-Chip Oscillator  (LOCO)
-   1 = High Speed On-Chip Oscillator (HOCO)
-   2 = Main Clock Oscillator
-   3 = Sub-Clock Oscillator
-   4 = PLL Circuit
-*/
-#define BSP_CFG_CLOCK_SOURCE            (4) /* Generated value. Do not edit this manually */
-
-/* Main clock Oscillator Switching (MOSEL).
-   0 = Resonator
-   1 = External clock input
-*/
-#define BSP_CFG_MAIN_CLOCK_SOURCE       (0) /* Generated value. Do not edit this manually */
-
-/* The sub-clock oscillation control for using the RTC.
-   When '1' is selected, the registers related to RTC are initialized and the sub-clock oscillator is operated.
-   0 = The RTC is not to be used.
-   1 = The RTC is to be used.
-*/
-#define BSP_CFG_RTC_ENABLE              (0) /* Generated value. Do not edit this manually */
-
-/* Sub-Clock Oscillator Drive Capacity Control (RTCDV).
-   0 = Drive capacity for standard CL. (default)
-   1 = Drive capacity for low CL.
-*/
-#define BSP_CFG_SOSC_DRV_CAP            (0) /* Generated value. Do not edit this manually */
-
-/* Clock configuration options.
-   The input clock frequency is specified and then the system clocks are set by specifying the multipliers used. The
-   multiplier settings are used to set the clock registers in resetprg.c. If a 24MHz clock is used and the
-   ICLK is 120MHz, PCLKA is 120MHz, PCLKB is 60MHz, PCLKC is 60MHz, PCLKD is 60MHz, FCLK is 60MHz, USB Clock is 48MHz,
-   and BCLK is 120MHz then the settings would be:
-
-   BSP_CFG_XTAL_HZ  = 24000000
-   BSP_CFG_PLL_DIV  = 1        (no division)
-   BSP_CFG_PLL_MUL  = 10.0     (24MHz x 10.0 = 240MHz)
-   BSP_CFG_ICK_DIV  = 2      : System Clock (ICLK)        = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_ICK_DIV)  = 120MHz
-   BSP_CFG_PCKA_DIV = 2      : Peripheral Clock A (PCLKA) = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_PCKA_DIV) = 120MHz
-   BSP_CFG_PCKB_DIV = 4      : Peripheral Clock B (PCLKB) = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_PCKB_DIV) = 60MHz
-   BSP_CFG_PCKC_DIV = 4      : Peripheral Clock C (PCLKC) = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_PCKC_DIV) = 60MHz
-   BSP_CFG_PCKD_DIV = 4      : Peripheral Clock D (PCLKD) = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_PCKD_DIV) = 60MHz
-   BSP_CFG_FCK_DIV  = 4      : Flash IF Clock (FCLK)      = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_FCK_DIV)  = 60MHz
-   BSP_CFG_BCK_DIV  = 2      : External Bus Clock (BCK)   = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_BCK_DIV)  = 120MHz
-   BSP_CFG_UCK_DIV  = 5      : USB Clock (UCLK)           = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_UCK_DIV)  = 48MHz
-*/
-
-/* Input clock frequency in Hz (XTAL or EXTAL). */
-#define BSP_CFG_XTAL_HZ                 (24000000) /* Generated value. Do not edit this manually */
-
-/* The HOCO can operate at several different frequencies. Choose which one using the macro below.
-   Available frequency settings:
-   0 = 16MHz (default)
-   1 = 18MHz
-   2 = 20MHz
-*/
-#define BSP_CFG_HOCO_FREQUENCY          (0) /* Generated value. Do not edit this manually */
-
-/* PLL clock source (PLLSRCSEL). Choose which clock source to input to the PLL circuit.
-   Available clock sources:
-   0 = Main clock (default)
-   1 = HOCO
-*/
-#define BSP_CFG_PLL_SRC                 (0) /* Generated value. Do not edit this manually */
-
-/* PLL Input Frequency Division Ratio Select (PLIDIV).
-   Available divisors = /1 (no division), /2, /3
-*/
-#define BSP_CFG_PLL_DIV                 (1) /* Generated value. Do not edit this manually */
-
-/* PLL Frequency Multiplication Factor Select (STC).
-   Available multipliers = x10.0 to x30.0 in 0.5 increments (e.g. 10.0, 10.5, 11.0, 11.5, ..., 29.0, 29.5, 30.0)
-*/
-#define BSP_CFG_PLL_MUL                 (10.0) /* Generated value. Do not edit this manually */
-
-/* System Clock Divider (ICK).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_ICK_DIV                 (2) /* Generated value. Do not edit this manually */
-
-/* Peripheral Module Clock A Divider (PCKA).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_PCKA_DIV                (2) /* Generated value. Do not edit this manually */
-
-/* Peripheral Module Clock B Divider (PCKB).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_PCKB_DIV                (4) /* Generated value. Do not edit this manually */
-
-/* Peripheral Module Clock C Divider (PCKC).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_PCKC_DIV                (4) /* Generated value. Do not edit this manually */
-
-/* Peripheral Module Clock D Divider (PCKD).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_PCKD_DIV                (4) /* Generated value. Do not edit this manually */
-
-/* External Bus Clock Divider (BCLK).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_BCK_DIV                 (2) /* Generated value. Do not edit this manually */
-
-/* Flash IF Clock Divider (FCK).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_FCK_DIV                 (4) /* Generated value. Do not edit this manually */
-
-/* USB Clock Divider Select.
-   Available divisors = /2, /3, /4, /5
-*/
-#define BSP_CFG_UCK_DIV                 (5) /* Generated value. Do not edit this manually */
-
-/* Configure BCLK output pin (only effective when external bus enabled)
-   Values 0=no output, 1 = BCK frequency, 2= BCK/2 frequency
-*/
-#define BSP_CFG_BCLK_OUTPUT             (0) /* Generated value. Do not edit this manually */
-
-/* Configure SDCLK output pin (only effective when external bus enabled)
-   Values 0=no output, 1 = BCK frequency
-*/
-#define BSP_CFG_SDCLK_OUTPUT            (0) /* Generated value. Do not edit this manually */
-
-/* Main Clock Oscillator Wait Time (MOSCWTCR).
-   The value of MOSCWTCR register required for correspondence with the waiting time required to secure stable 
-   oscillation by the main clock oscillator is obtained by using the maximum frequency for fLOCO in the formula below.
-
-   BSP_CFG_MOSC_WAIT_TIME > (tMAINOSC * (fLOCO_max) + 16)/32
-   (tMAINOSC: main clock oscillation stabilization time; fLOCO_max: maximum frequency for fLOCO)
-
-   If tMAINOSC is 9.98 ms and fLOCO_max is 264 kHz (the period is 1/3.78 us), the formula gives 
-   BSP_CFG_MOSC_WAIT_TIME > (9.98 ms * (264 kHZ) + 16)/32 = 82.83, so set the BSP_CFG_MOSC_WAIT_TIME to 83(53h).
-
-   NOTE: The waiting time is not required when an external clock signal is input for the main clock oscillator.
-         Set the BSP_CFG_MOSC_WAIT_TIME to 00h.
-*/
-#define BSP_CFG_MOSC_WAIT_TIME          (0x53) /* Generated value. Do not edit this manually */
-
-/* Sub-Clock Oscillator Wait Time (SOSCWTCR).
-   The value of SOSCWTCR register required for correspondence with the expected time to secure settling of oscillation
-   by the sub-clock oscillator is obtained by using the maximum frequency for fLOCO in the formula below.
-
-   BSP_CFG_SOSC_WAIT_TIME > (tSUBOSC * (fLOCO_max) + 16)/16384
-   (tSUBOSC: sub-clock oscillation stabilization time; fLOCO_max: maximum frequency for fLOCO)
-
-   If tSUBOSC is 2 s and fLOCO is 264 kHz (the period is 1/3.78 us), the formula gives
-    BSP_CFG_SOSC_WAIT_TIME > (2 s * (264 kHz) +16)/16384 = 32.22, so set the  BSP_CFG_SOSC_WAIT_TIME bits to 33(21h).
-*/
-#define BSP_CFG_SOSC_WAIT_TIME          (0x21) /* Generated value. Do not edit this manually */
-
-/* ROM Cache Enable Register (ROMCE).
-   0 = ROM cache operation disabled.
-   1 = ROM cache operation enabled.
-*/
-#define BSP_CFG_ROM_CACHE_ENABLE        (0)
-
-/* Configure WDT and IWDT settings.
-   OFS0 - Option Function Select Register 0
-       b31:b29 Reserved When reading, these bits return the value written by the user. The write value should be 1.
-       b28     WDTRSTIRQS - WDT Reset Interrupt Request - What to do on underflow (0=take interrupt, 1=reset MCU)
-       b27:b26 WDTRPSS   - WDT Window Start Position Select - (0=25%, 1=50%, 2=75%, 3=100%,don't use)
-       b25:b24 WDTRPES   - WDT Window End Position Select - (0=75%, 1=50%, 2=25%, 3=0%,don't use)
-       b23:b20 WDTCKS    - WDT Clock Frequency Division Ratio - (1=PCLKB/4, 4=PCLKB/64, 0xF=PCLKB/128, 6=PCLKB/256,
-                                                                 7=PCLKB/2048, 8=PCLKB/8192)
-       b19:b18 WDTTOPS   - WDT Timeout Period Select (0=1024 cycles, 1=4096, 2=8192, 3=16384)
-       b17     WDTSTRT   - WDT Start Mode Select - (0=auto-start after reset, 1=halt after reset)
-       b16:b15 Reserved (set to 1)
-       b14     IWDTSLCSTP - IWDT Sleep Mode Count Stop Control - (0=can't stop count, 1=stop w/some low power modes)
-       b13     Reserved (set to 1)
-       b12     IWDTRSTIRQS - IWDT Reset Interrupt Request - What to do on underflow (0=take interrupt, 1=reset MCU)
-       b11:b10 IWDTRPSS - IWDT Window Start Position Select - (0=25%, 1=50%, 2=75%, 3=100%,don't use)
-       b9:b8   IWDTRPES - IWDT Window End Position Select - (0=75%, 1=50%, 2=25%, 3=0%,don't use)
-       b7:b4   IWDTCKS - IWDT Clock Frequency Division Ratio - (0=none, 2=/16, 3 = /32, 4=/64, 0xF=/128, 5=/256)
-       b3:b2   IWDTTOPS - IWDT Timeout Period Select - (0=1024 cycles, 1=4096, 2=8192, 3=16384)
-       b1      IWDTSTRT - IWDT Start Mode Select - (0=auto-start after reset, 1=halt after reset)
-       b0      Reserved (set to 1)
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_OFS0_REG_VALUE  (0xFFFFFFFF) /* Generated value. Do not edit this manually */
-
-/* Configure whether voltage detection 0 circuit and HOCO are enabled after reset.
-   OFS1 - Option Function Select Register 1
-       b31:b9 Reserved (set to 1)
-       b8     HOCOEN - Enable/disable HOCO oscillation after a reset (0=enable, 1=disable)
-       b7:b3  Reserved When reading, these bits return the value written by the user. The write value should be 1.
-       b2     LVDAS - Voltage Detection 0 circuit start (1=monitoring disabled)
-       b1:b0  VDSEL - Voltage Detection 0 level select (1=2.94v, 2=2.87v, 3=2.80v)
-       NOTE: If HOCO oscillation is enabled by OFS1.HOCOEN, HOCO frequency is 16MHz.
-             BSP_CFG_HOCO_FREQUENCY should be default value.
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_OFS1_REG_VALUE  (0xFFFFFFFF) /* Generated value. Do not edit this manually */
-
-/* Trusted memory is facility to prevent the reading of blocks 8 and 9 and blocks 46 and 47 (in dual mode) in 
-   the code flash memory by third party software. This feature is disabled by default.
-   TMEF - TM Enable Flag Register
-       b31     Reserved (set to 1)
-       b30:b28 TMEFDB - Dual-Bank TM Enable - 000: The TM function in the address range from FFEE 0000h to 
-                                                   FFEE FFFFh is enabled in dual mode.
-                                            - 111: The TM function in the address range from FFEE 0000h to 
-                                                   FFEE FFFFh is disabled in dual mode.
-       b27     Reserved (set to 1)
-       b26:b24 TMEF   - TM Enable - 000: TM function is enabled.
-                                  - 111: TM function is disabled.
-       b23:b0  Reserved (set to 1)
-       NOTE: If the dual bank function has not been incorporated in a device,
-             TMEFDB bits [b30:b26] are reserved area.
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_TRUSTED_MODE_FUNCTION  (0xFFFFFFFF)
-
-/* Configure FAW register is used to set the write protection flag and boot area select flag 
-   for setting the flash access window startaddress and flash access window end address.
-   FAW - Flash Access Window Setting Register
-       b31      BTFLG - Boot Area Select Flag - 0: FFFF C000h to FFFF DFFFh are used as the boot area
-                                              - 1: FFFF E000h to FFFF FFFFh are used as the boot area
-       b30:b28  Reserved - When reading, these bits return the value written by the user.The write value should be 1.
-       b27:b16  FAWE - Flash Access Window End Address - Flash access window end address
-       b15      FSPR - Access Window Protection Flag - 0: With protection (P/E disabled)
-                                                     - 1: Without protection (P/E enabled)
-       b14:b12  Reserved - When reading, these bits return the value written by the user.The write value should be 1.
-       b11:b0   FAWS - Flash Access Window Start Address - Flash access window start address 
-       NOTE: Once 0 is written to this bit, the bit can never be restored to 1.
-             Therefore, the access window and the BTFLG bit never be set again or the TM function 
-             never be disabled once it has been enabled.
-             Exercise extra caution when handling the FSPR bit.
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_FAW_REG_VALUE  (0xFFFFFFFF)
-
-/* The ROM code protection register is a function to prohibit reading from or programming to the flash memory
-   when the flash programmer is used during off-board programming.
-   ROMCODE - ROM Code Protection Register
-       b31:b0  ROM Code - 0000 0000h: ROM code protection enabled (ROM code protection 1).
-                          0000 0001h: ROM code protection enabled (ROM code protection 2).
-                          Other than above: ROM code protection disabled.
-       Note: The ROMCODE register should be set in 32-bit units.
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_ROMCODE_REG_VALUE  (0xFFFFFFFF)
-
-/* Select the bank mode of dual-bank function of the code flash memory.
-   0 = Dual mode.
-   1 = Linear mode. (default)
-   NOTE: If the dual bank function has been incorporated in a device, select the bank mode in this macro.
-         Default setting of the bank mode is linear mode.
-         If the dual bank function has not been incorporated in a device, this macro should be 1.
-*/
-#define BSP_CFG_CODE_FLASH_BANK_MODE    (0)
-
-/* Select the startup bank of the program when dual bank function is in dual mode.
-   0 = The address range of bank 1 from FFE00000h to FFEFFFFFh and bank 0 from FFF00000h to FFFFFFFFh. (default)
-   1 = The address range of bank 1 from FFF00000h to FFFFFFFFh and bank 0 from FFE00000h to FFEFFFFFh.
-   NOTE: If the dual bank function has been incorporated in a device, select the start bank in this macro.
-         Default setting of the start bank is bank0.
-         If the dual bank function has not been incorporated in a device, this macro should be 0.
-*/
-#define BSP_CFG_CODE_FLASH_START_BANK   (0)
-
-/* This macro lets other modules no if a RTOS is being used.
-   0 = RTOS is not used.
-   1 = FreeRTOS is used.
-   2 = embOS is used.(This is not available.)
-   3 = MicroC_OS is used.(This is not available.)
-   4 = Renesas ITRON OS (RI600V4 or RI600PX) is used.
-   5 = Azure RTOS is used.(This is not available.)
-*/
-#define BSP_CFG_RTOS_USED               (0)
-
-/* This macro is used to select which Renesas ITRON OS.
-   0 = RI600V4 is used.
-   1 = RI600PX is used.
-*/
-#define BSP_CFG_RENESAS_RTOS_USED       (0)
-
-/* This macro is used to select which CMT channel used for system timer of RTOS.
- * The setting of this macro is only valid if the macro BSP_CFG_RTOS_USED is set to a value other than 0. */
-#if BSP_CFG_RTOS_USED != 0
-/* Setting value.
- * 0      = CMT channel 0 used for system timer of RTOS (recommended to be used for RTOS).
- * 1      = CMT channel 1 used for system timer of RTOS.
- * 2      = CMT channel 2 used for system timer of RTOS.
- * 3      = CMT channel 3 used for system timer of RTOS.
- * Others = Invalid.
- * NOTE: This is invalid when using Renesas RTOS with CCRX.
- */
-#define BSP_CFG_RTOS_SYSTEM_TIMER       (0)
-#endif
-
-/* By default modules will use global locks found in mcu_locks.c. If the user is using a RTOS and would rather use its
-   locking mechanisms then they can change this macro.
-   NOTE: If '1' is chosen for this macro then the user must also change the next macro 'BSP_CFG_USER_LOCKING_TYPE'.
-   0 = Use default locking (non-RTOS)
-   1 = Use user defined locking mechanism.
-*/
-#define BSP_CFG_USER_LOCKING_ENABLED    (0)
-
-/* If the user decides to use their own locking mechanism with FIT modules then they will need to redefine the typedef
-   that is used for the locks. If the user is using a RTOS then they would likely redefine the typedef to be 
-   a semaphore/mutex type of their RTOS. Use the macro below to set the type that will be used for the locks.
-   NOTE: If BSP_CFG_USER_LOCKING_ENABLED == 0 then this typedef is ignored.
-   NOTE: Do not surround the type with parentheses '(' ')'.
-*/
-#define BSP_CFG_USER_LOCKING_TYPE       bsp_lock_t
-
-/* If the user decides to use their own locking mechanism with FIT modules then they will need to define the functions
-   that will handle the locking and unlocking. These functions should be defined below.
-   If BSP_CFG_USER_LOCKING_ENABLED is != 0:
-   R_BSP_HardwareLock(mcu_lock_t hw_index) will call BSP_CFG_USER_LOCKING_HW_LOCK_FUNCTION(mcu_lock_t hw_index)
-   R_BSP_HardwareUnlock(mcu_lock_t hw_index) will call BSP_CFG_USER_LOCKING_HW_UNLOCK_FUNCTION(mcu_lock_t hw_index)
-       NOTE:With these functions the index into the array holding the global hardware locks is passed as the parameter.
-   R_BSP_SoftwareLock(BSP_CFG_USER_LOCKING_TYPE * plock) will call 
-   BSP_CFG_USER_LOCKING_SW_LOCK_FUNCTION(BSP_CFG_USER_LOCKING_TYPE * plock)
-   R_BSP_SoftwareUnlock(BSP_CFG_USER_LOCKING_TYPE * plock) will call 
-   BSP_CFG_USER_LOCKING_SW_UNLOCK_FUNCTION(BSP_CFG_USER_LOCKING_TYPE * plock)
-       NOTE:With these functions the actual address of the lock to use is passed as the parameter.
-   NOTE: These functions must return a boolean. If lock was obtained or released successfully then return true. Else, 
-         return false.
-   NOTE: If BSP_CFG_USER_LOCKING_ENABLED == 0 then this typedef is ignored.
-   NOTE: Do not surround the type with parentheses '(' ')'.
-*/
-#define BSP_CFG_USER_LOCKING_HW_LOCK_FUNCTION      my_hw_locking_function
-#define BSP_CFG_USER_LOCKING_HW_UNLOCK_FUNCTION    my_hw_unlocking_function
-#define BSP_CFG_USER_LOCKING_SW_LOCK_FUNCTION      my_sw_locking_function
-#define BSP_CFG_USER_LOCKING_SW_UNLOCK_FUNCTION    my_sw_unlocking_function
-
-/* If the user would like to determine if a warm start reset has occurred, then they may enable one or more of the
-   following callback definitions AND provide a call back function name for the respective callback
-   function (to be defined by the user). Setting BSP_CFG_USER_WARM_START_CALLBACK_PRE_INITC_ENABLED = 1 will result
-   in a callback to the user defined my_sw_warmstart_prec_function just prior to the initialization of the C
-   runtime environment by resetprg.
-   Setting BSP_CFG_USER_WARM_START_CALLBACK_POST_INITC_ENABLED = 1 will result in a callback to the user defined
-   my_sw_warmstart_postc_function just after the initialization of the C runtime environment by resetprg.
-*/
-#define BSP_CFG_USER_WARM_START_CALLBACK_PRE_INITC_ENABLED    (0)
-#define BSP_CFG_USER_WARM_START_PRE_C_FUNCTION     my_sw_warmstart_prec_function
-
-#define BSP_CFG_USER_WARM_START_CALLBACK_POST_INITC_ENABLED    (0)
-#define BSP_CFG_USER_WARM_START_POST_C_FUNCTION    my_sw_warmstart_postc_function
-
-/* By default FIT modules will check input parameters to be valid. This is helpful during development but some users
-   will want to disable this for production code. The reason for this would be to save execution time and code space.
-   This macro is a global setting for enabling or disabling parameter checking. Each FIT module will also have its
-   own local macro for this same purpose. By default the local macros will take the global value from here though
-   they can be overridden. Therefore, the local setting has priority over this global setting. Disabling parameter
-   checking should only used when inputs are known to be good and the increase in speed or decrease in code space is 
-   needed.
-   0 = Global setting for parameter checking is disabled.
-   1 = Global setting for parameter checking is enabled (Default).
-*/
-#define BSP_CFG_PARAM_CHECKING_ENABLE               (0)
-
-/* The extended bus master has five transfer sources: EDMAC, GLCDC-GRA1 (GLCDC graphics 1 data read), GLCDCGRA2 (GLCDC
-   graphics 2 data read), DRW2D-TX (DRW2D texture data read), and DRW2D-FB (DRW2D frame buffer data read write and
-   display list data read).
-   The default priority order in bsp is below
-   GLCDC-GRA1 > GLCDC-GRA2 > DRW2D-TX > DRW2D-FB > EDMAC.
-   Priority can be changed with this macro.
-
-   Extended Bus Master Priority setting
-   0 = GLCDC graphics 1 data read
-   1 = DRW2D texture data read
-   2 = DRW2D frame buffer data read write and display list data read
-   3 = GLCDC graphics 2 data read
-   4 = EDMAC
-
-   Note : This macro is only available for products with at least 1.5 Mbytes of code flash memory.
-          Settings other than above are prohibited.
-          Duplicate priority settings can not be made.
-*/
-#define BSP_CFG_EBMAPCR_1ST_PRIORITY                (0) /* Extended Bus Master 1st Priority Selection */
-#define BSP_CFG_EBMAPCR_2ND_PRIORITY                (3) /* Extended Bus Master 2nd Priority Selection */
-#define BSP_CFG_EBMAPCR_3RD_PRIORITY                (1) /* Extended Bus Master 3rd Priority Selection */
-#define BSP_CFG_EBMAPCR_4TH_PRIORITY                (2) /* Extended Bus Master 4th Priority Selection */
-#define BSP_CFG_EBMAPCR_5TH_PRIORITY                (4) /* Extended Bus Master 5th Priority Selection */
-
-/* This macro is used to define the voltage that is supplied to the MCU (Vcc). This macro is defined in millivolts. This
-   macro does not actually change anything on the MCU. Some FIT modules need this information so it is defined here. */
-#define BSP_CFG_MCU_VCC_MV                          (3300) /* Generated value. Do not edit this manually */
-
-/* Allow initialization of auto-generated peripheral initialization code by Smart Configurator tool.
-   When not using the Smart Configurator, set the value of BSP_CFG_CONFIGURATOR_SELECT to 0.
-   0 = Disabled (default)
-   1 = Smart Configurator initialization code used
-*/
-#define BSP_CFG_CONFIGURATOR_SELECT                 (1) /* Generated value. Do not edit this manually */
-
-/* Version number of Smart Configurator.
-   This macro definition is updated by Smart Configurator.
-*/
-#define BSP_CFG_CONFIGURATOR_VERSION                (2160) /* Generated value. Do not edit this manually */
-
-/* For some BSP functions, it is necessary to ensure that, while these functions are executing, interrupts from other 
-   FIT modules do not occur. By controlling the IPL, these functions disable interrupts that are at or below the 
-   specified interrupt priority level.
-   This macro sets the IPL. Range is 0x0 - 0xF.
-   Please set this macro more than IPR for other FIT module interrupts.
-   The default value is 0xF (maximum value).
-   Don't change if there is no special processing with higher priority than all fit modules.
-*/
-#define BSP_CFG_FIT_IPL_MAX                         (0xF)
-
-/* Software Interrupt (SWINT).
-   0 = Software interrupt is not used.
-   1 = Software interrupt is used.
-   NOTE: When this macro is set to 1, the software interrupt is initialized in bsp startup routine. 
-*/
-#define BSP_CFG_SWINT_UNIT1_ENABLE    (0)
-#define BSP_CFG_SWINT_UNIT2_ENABLE    (0)
-
-/* Software Interrupt Task Buffer Number.
-   For software interrupt, this value is number of buffering user tasks.
-   So user can increase this value if user system would have many software interrupt tasks
-   and user system has enough buffer. This value requires 9 byte per task.
-   NOTE: This setting is common to all units. It can not be set individually. 
-         The maximum value is 254.
-*/
-#define BSP_CFG_SWINT_TASK_BUFFER_NUMBER     (8)
-
-/* Initial value of the software interrupt priority.
-   For software interrupt, this value is interrupt priority. Range is 0x0 - 0xF.
-   NOTE: This setting is common to all units. It can not be set individually. 
-         Please be careful that this setting is the initial value of the interrupt priority register(IPR).
-         It is possible to dynamically change the IPR.
-*/
-#define BSP_CFG_SWINT_IPR_INITIAL_VALUE     (0x1)
-
-/* This macro is used for serial terminal on the board selected by smart configurator.
-   0 = SCI UART Terminal is disabled.
-   1 = SCI UART Terminal is enabled.
-*/
-#define BSP_CFG_SCI_UART_TERMINAL_ENABLE         (1)
-
-/* This macro is channel number for serial terminal.
-*/
-#define BSP_CFG_SCI_UART_TERMINAL_CHANNEL        (5)
-
-/* This macro is bit-rate for serial terminal.
-*/
-#define BSP_CFG_SCI_UART_TERMINAL_BITRATE        (115200)
-
-/* This macro is interrupt priority for serial terminal.
-   0(low) - 15(high)
-*/
-#define BSP_CFG_SCI_UART_TERMINAL_INTERRUPT_PRIORITY   (15)
-
-/* This macro is used for C++ project and updated by Smart Configurator.
-   0 = This project is a C project.(Not a C++ project).
-   1 = This project is a C++ project.
-*/
-#define BSP_CFG_CPLUSPLUS             (0) /* Generated value. Do not edit this manually */
-
-#endif /* R_BSP_CONFIG_REF_HEADER_FILE */
-
diff --git a/Configuration/samples/bootloader/ck-rx65n/src/smc_gen/r_config/r_bsp_interrupt_config.h b/Configuration/samples/bootloader/ck-rx65n/src/smc_gen/r_config/r_bsp_interrupt_config.h
deleted file mode 100644
index 39237823..00000000
--- a/Configuration/samples/bootloader/ck-rx65n/src/smc_gen/r_config/r_bsp_interrupt_config.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer 
-*
-* Copyright (C) 2016 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name    : r_bsp_interrupt_config.h
-* Description  : This module maps Interrupt A & B interrupts. More information on how this is done is given below.
-***********************************************************************************************************************/
-/**********************************************************************************************************************
-* History : DD.MM.YYYY Version   Description
-*         : 01.10.2016 1.00      First Release
-*         : 15.05.2017 2.00      Changed the name of the following macro definition, because there was a mistake
-*                                in the name of macro definition.
-*                                - From XXX_TPU0_TGI0V to XXX_TPU0_TCI0V.
-*                                - From XXX_TPU1_TGI1V to XXX_TPU1_TCI1V.
-*                                - From XXX_TPU1_TGI1U to XXX_TPU1_TCI1U.
-*                                - From XXX_TPU2_TGI2V to XXX_TPU2_TCI2V.
-*                                - From XXX_TPU2_TGI2U to XXX_TPU2_TCI2U.
-*                                - From XXX_TPU3_TGI3V to XXX_TPU3_TCI3V.
-*                                - From XXX_TPU4_TGI4V to XXX_TPU4_TCI4V.
-*                                - From XXX_TPU4_TGI4U to XXX_TPU4_TCI4U.
-*                                - From XXX_TPU5_TGI5V to XXX_TPU5_TCI5V.
-*                                - From XXX_TPU5_TGI5U to XXX_TPU5_TCI5U.
-*                                - From XXX_MTU0_TGIV0 to XXX_MTU0_TCIV0.
-*                                - From XXX_MTU1_TGIV1 to XXX_MTU1_TCIV1.
-*                                - From XXX_MTU1_TGIU1 to XXX_MTU1_TCIU1.
-*                                - From XXX_MTU2_TGIV2 to XXX_MTU2_TCIV2.
-*                                - From XXX_MTU2_TGIU2 to XXX_MTU2_TCIU2.
-*                                - From XXX_MTU3_TGIV3 to XXX_MTU3_TCIV3.
-*                                - From XXX_MTU4_TGIV4 to XXX_MTU4_TCIV4.
-*                                - From XXX_MTU6_TGIV6 to XXX_MTU6_TCIV6.
-*                                - From XXX_MTU7_TGIV7 to XXX_MTU7_TCIV7.
-*                                - From XXX_MTU8_TGIV8 to XXX_MTU8_TCIV8.
-*                                Added select processing of the following software configurable interrupt source.
-*                                - TSIP_PROC_BUSY
-*                                - TSIP_ROMOK
-*                                - TSIP_LONG_PLG
-*                                - TSIP_TEST_BUSY
-*                                - TSIP_WRRDY0
-*                                - TSIP_WRRDY1
-*                                - TSIP_WRRDY4
-*                                - TSIP_RDRDY0
-*                                - TSIP_RDRDY1
-*                                - TSIP_INTEGRATE_WRRDY
-*                                - TSIP_INTEGRATE_RDRDY
-***********************************************************************************************************************/
-#ifndef R_BSP_INTERRUPT_CONFIG_REF_HEADER_FILE
-#define R_BSP_INTERRUPT_CONFIG_REF_HEADER_FILE
-
-/***********************************************************************************************************************
-Macro definitions
-***********************************************************************************************************************/
-
-/* If you wish to use one of the interrupt below then set the appropriate configuration macro to the vector number you
- * wish to use for that interrupt. For example, if you want to use the RTC carry interrupt (CUP) at vector 176 then you
- * would do the following:
- *
- * #define BSP_MAPPED_INT_CFG_B_VECT_RTC_CUP                                 176
- */
-
-/* Interrupt B Sources.
- * -Valid vector numbers are 128-207.
- * -There are more vector slots for B sources than actual B sources. By default all B sources are mapped.
- * -If using the 'TPU1, TGI1A' interrupt it must be vector 144 or 145. It is set to 144 by default.
- * -If a peripheral interrupt is going to be used to wake up the MCU from All-Module Clock Stop Mode then it must be
- *  in a vector between 146 to 157. Peripheral interrupts that can do this are TMR interrupts and the 'USB0, USBI0'
- *  interrupt. By default the TMR interrupts are chosen since there are 12 of them and there are 12 slots.
- */
-#define BSP_MAPPED_INT_CFG_B_VECT_CMT2_CMI2                               128
-#define BSP_MAPPED_INT_CFG_B_VECT_CMT3_CMI3                               129
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR0_CMIA0                              146
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR0_CMIB0                              147
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR0_OVI0                               148
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR1_CMIA1                              149
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR1_CMIB1                              150
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR1_OVI1                               151
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR2_CMIA2                              152
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR2_CMIB2                              153
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR2_OVI2                               154
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR3_CMIA3                              155
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR3_CMIB3                              156
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR3_OVI3                               157
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TGI0A                              130
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TGI0B                              131
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TGI0C                              132
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TGI0D                              133
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TCI0V                              134
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU1_TGI1A                              144
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU1_TGI1B                              135
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU1_TCI1V                              136
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU1_TCI1U                              137
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU2_TGI2A                              138
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU2_TGI2B                              139
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU2_TCI2V                              140
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU2_TCI2U                              141
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TGI3A                              142
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TGI3B                              143
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TGI3C                              145
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TGI3D                              158
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TCI3V                              159
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU4_TGI4A                              160
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU4_TGI4B                              161
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU4_TCI4V                              162
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU4_TCI4U                              163
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU5_TGI5A                              164
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU5_TGI5B                              165
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU5_TCI5V                              166
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU5_TCI5U                              167
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW0_IC0I0                             168
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW0_IC1I0                             169
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW0_OC0I0                             170
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW0_OC1I0                             171
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW1_IC0I1                             172
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW1_IC1I1                             173
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW1_OC0I1                             174
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW1_OC1I1                             175
-#define BSP_MAPPED_INT_CFG_B_VECT_RTC_CUP                                 176
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN0_RXF0                               177
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN0_TXF0                               178
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN0_RXM0                               179
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN0_TXM0                               180
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN1_RXF1                               181
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN1_TXF1                               182
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN1_RXM1                               183
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN1_TXM1                               184
-#define BSP_MAPPED_INT_CFG_B_VECT_USB0_USBI0                              185
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC0_S12ADI0                         186
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC0_S12GBADI0                       187
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC0_S12GCADI0                       188
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC1_S12ADI1                         189
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC1_S12GBADI1                       190
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC1_S12GCADI1                       191
-#define BSP_MAPPED_INT_CFG_B_VECT_RNG_RNGEND                              192
-#define BSP_MAPPED_INT_CFG_B_VECT_ELC_ELSR18I                             193
-#define BSP_MAPPED_INT_CFG_B_VECT_ELC_ELSR19I                             194
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_PROC_BUSY                          195
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_ROMOK                              196
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_LONG_PLG                           197
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_TEST_BUSY                          198
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_WRRDY0                             199
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_WRRDY1                             200
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_WRRDY4                             201
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_RDRDY0                             202
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_RDRDY1                             203
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_INTEGRATE_WRRDY                    204
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_INTEGRATE_RDRDY                    205
-
-/* Interrupt A Sources.
- * -Valid vector numbers are 208-255.
- * -There are more A sources than A vector slots. By default none of the GPT interrupts are mapped.
- * -If using the 'MTU1, TGI1A' interrupt it must be vector 208 or 209. It is set to 208 by default.
- */
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIA0                              209
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIB0                              210
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIC0                              211
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGID0                              212
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TCIV0                              213
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIE0                              214
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIF0                              215
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU1_TGIA1                              208
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU1_TGIB1                              216
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU1_TCIV1                              217
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU1_TCIU1                              218
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU2_TGIA2                              219
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU2_TGIB2                              220
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU2_TCIV2                              221
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU2_TCIU2                              222
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TGIA3                              223
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TGIB3                              224
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TGIC3                              225
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TGID3                              226
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TCIV3                              227
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TGIA4                              228
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TGIB4                              229
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TGIC4                              230
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TGID4                              231
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TCIV4                              232
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU5_TGIU5                              233
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU5_TGIV5                              234
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU5_TGIW5                              235
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TGIA6                              236
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TGIB6                              237
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TGIC6                              238
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TGID6                              239
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TCIV6                              240
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TGIA7                              241
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TGIB7                              242
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TGIC7                              243
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TGID7                              244
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TCIV7                              245
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TGIA8                              246
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TGIB8                              247
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TGIC8                              248
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TGID8                              249
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TCIV8                              250
-#define BSP_MAPPED_INT_CFG_A_VECT_AES_AESRDY                              251
-#define BSP_MAPPED_INT_CFG_A_VECT_AES_AESEND                              252
-
-#endif /* R_BSP_INTERRUPT_CONFIG_REF_HEADER_FILE */
-
diff --git a/Configuration/samples/bootloader/ck-rx65n/src/smc_gen/r_config/r_byteq_config.h b/Configuration/samples/bootloader/ck-rx65n/src/smc_gen/r_config/r_byteq_config.h
deleted file mode 100644
index 7c0e15a9..00000000
--- a/Configuration/samples/bootloader/ck-rx65n/src/smc_gen/r_config/r_byteq_config.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer 
-*
-* Copyright (C) 2013 Renesas Electronics Corporation. All rights reserved.    
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name     : r_byteq_config.h
-* Description   : Configures the byte queue memory allocation
-************************************************************************************************************************
-* History : DD.MM.YYYY Version Description  
-*         : 24.07.2013 1.00     Initial Release
-*         : 11.21.2014 1.20     Removed dependency to BSP
-*         : 30.09.2015 1.50     Added dependency to BSP
-*         : 01.06.2018 1.70     Changed the default value of the following macro definition.
-*                                - BYTEQ_CFG_MAX_CTRL_BLKS - Changed the default value from 4 to 32.
-*         : 31.03.2021 1.90     Updated for queue protection.
-*         : 29.10.2021 2.00     Updated for critical section protection.
-***********************************************************************************************************************/
-#ifndef BYTEQ_CONFIG_H
-#define BYTEQ_CONFIG_H
-
-/***********************************************************************************************************************
-Includes   <System Includes> , "Project Includes"
-***********************************************************************************************************************/
-#include "platform.h"
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-
-/* SPECIFY WHETHER TO INCLUDE CODE FOR API PARAMETER CHECKING
-   Available settings:
-   BSP_CFG_PARAM_CHECKING_ENABLE:
-       Utilizes the system default setting
-   1:
-       Includes parameter checking
-   0:
-       Compiles out parameter checking
-*/
-#define BYTEQ_CFG_PARAM_CHECKING_ENABLE     (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-/* SPECIFY IF SHOULD USE MALLOC() TO ALLOCATE MEMORY FOR QUEUE CONTROL BLOCKS */
-#define BYTEQ_CFG_USE_HEAP_FOR_CTRL_BLKS    (0)
-
-/* SPECIFY NUMBER OF STATIC QUEUE CONTROL BLOCKS TO SUPPORT */
-/* valid only when BYTEQ_USE_HEAP_FOR_CTRL_BLKS is set to 0 */
-#define BYTEQ_CFG_MAX_CTRL_BLKS             (32)
-
-/* Selects to use disable interrupt to protect queue. */
-#define BYTEQ_CFG_PROTECT_QUEUE             (0)
-
-/* Selects to use disable interrupt to protect critical section. */
-#define BYTEQ_CFG_CRITICAL_SECTION          (0)
-
-#endif /* BYTEQ_CONFIG_H */
diff --git a/Configuration/samples/bootloader/ck-rx65n/src/smc_gen/r_config/r_flash_rx_config.h b/Configuration/samples/bootloader/ck-rx65n/src/smc_gen/r_config/r_flash_rx_config.h
deleted file mode 100644
index 994a5da2..00000000
--- a/Configuration/samples/bootloader/ck-rx65n/src/smc_gen/r_config/r_flash_rx_config.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
- * DISCLAIMER
- * This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
- * other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
- * applicable laws, including copyright laws.
- * THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
- * THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
- * EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
- * SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS
- * SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
- * this software. By using this software, you agree to the additional terms and conditions found by accessing the
- * following link:
- * http://www.renesas.com/disclaimer
- *
- * Copyright (C) 2014-2019 Renesas Electronics Corporation. All rights reserved.
- ***********************************************************************************************************************/
-/***********************************************************************************************************************
- * File Name    : r_flash_rx_config_reference.h
- * Description  : Configures the FLASH API module for RX200 and RX600 Series MCU's.
- ***********************************************************************************************************************/
-/***********************************************************************************************************************
-* History : DD.MM.YYYY Version Description
-*           12.04.2014 1.00    First Release
-*           22.12.2014 1.10    Added flash type usage comments.
-*           25.06.2015 1.20    Added FLASH_CFG_CODE_FLASH_RUN_FROM_ROM.
-*         : 12.10.2016 2.00    Modified for BSPless operation (added FLASH_CFG_USE_FIT_BSP).
-*         : 19.04.2019 4.00    Removed BSPless operation (FLASH_CFG_USE_FIT_BSP).
-*                              Removed flash type 2 only operation (FLASH_CFG_FLASH_READY_IPL).
-*                              Removed flash type 2 only operation (FLASH_CFG_IGNORE_LOCK_BITS).
-*         : 19.07.2019 4.20    Modified comments (FLASH_CFG_CODE_FLASH_ENABLE, FLASH_CFG_CODE_FLASH_RUN_FROM_ROM).
-*         : 09.09.2019 4.30    Modified comments (FLASH_CFG_CODE_FLASH_ENABLE, FLASH_CFG_CODE_FLASH_RUN_FROM_ROM).
-***********************************************************************************************************************/
-#ifndef FLASH_CONFIG_HEADER_FILE
-#define FLASH_CONFIG_HEADER_FILE
-
-/***********************************************************************************************************************
- Configuration Options
- ***********************************************************************************************************************/
-/* SPECIFY WHETHER TO INCLUDE CODE FOR API PARAMETER CHECKING
- * Setting to BSP_CFG_PARAM_CHECKING_ENABLE utilizes the system default setting
- * Setting to 1 includes parameter checking; 0 compiles out parameter checking
- */
-#define FLASH_CFG_PARAM_CHECKING_ENABLE     (1)
-
-
-/******************************************************************************
- ENABLE CODE FLASH PROGRAMMING
-******************************************************************************/
-/* If you are only using data flash, set this to 0.
- * Setting to 1 includes code to program the ROM area. When programming ROM,
- * code must be executed from RAM, except under certain restrictions for flash
- * type 3 (see section 2.16 in App Note). See section 2.15 in the App Note for
- * details on how to set up code and the linker to execute code from RAM.
- */
-#define FLASH_CFG_CODE_FLASH_ENABLE (1)
-
-
-/******************************************************************************
- ENABLE BGO/NON-BLOCKING DATA FLASH OPERATIONS
-******************************************************************************/
-/* Setting this to 0 forces data flash API function to block until completed.
- * Setting to 1 places the module in BGO (background operations) mode. In BGO 
- * mode, data flash operations return immediately after the operation has been 
- * started. Notification of the operation completion is done via the callback 
- * function. 
- */
-#define FLASH_CFG_DATA_FLASH_BGO   (0)
-
-
-/******************************************************************************
- ENABLE BGO/NON-BLOCKING CODE FLASH (ROM) OPERATIONS
-******************************************************************************/
-/* Setting this to 0 forces ROM API function to block until completed.
- * Setting to 1 places the module in BGO (background operations) mode. In BGO 
- * mode, ROM operations return immediately after the operation has been started.
- * Notification of the operation completion is done via the callback function. 
- * When reprogramming ROM, THE RELOCATABLE VECTOR TABLE AND CORRESPONDING
- * INTERRUPT ROUTINES MUST BE IN RAM.  
- * See sections 2.17 Usage Notes in the App Note.
- */
-#define FLASH_CFG_CODE_FLASH_BGO   (0)
-
-
-/******************************************************************************
- ENABLE CODE FLASH SELF-PROGRAMMING
-******************************************************************************/
-/* Set this to 0 when programming code flash while executing in RAM.
- * Set this to 1 when programming code flash while executing from another
- * segment in ROM (possible only with RX64M, RX71M, RX65N-2, RX72M groups).
- * See section 2.16 in the App Note.
- */
-#define FLASH_CFG_CODE_FLASH_RUN_FROM_ROM   (1)
-
-
-#endif /* FLASH_CONFIG_HEADER_FILE */
diff --git a/Configuration/samples/bootloader/ck-rx65n/src/smc_gen/r_config/r_fwup_config.h b/Configuration/samples/bootloader/ck-rx65n/src/smc_gen/r_config/r_fwup_config.h
deleted file mode 100644
index 2c32adde..00000000
--- a/Configuration/samples/bootloader/ck-rx65n/src/smc_gen/r_config/r_fwup_config.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
-* applicable laws, including copyright laws.
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the
-* following link:
-* http://www.renesas.com/disclaimer
-*
-* Copyright (C) 2023 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name     : r_fwup_config.h
-* Description   : Configures the Firmware update module.
-************************************************************************************************************************
-* History : DD.MM.YYYY Version Description
-*         : 20.07.2023 2.00    First Release
-*         : 29.09.2023 2.01    Fixed log messages.
-*                              Add parameter checking.
-*                              Added arguments to R_FWUP_WriteImageProgram API.
-***********************************************************************************************************************/
-#include "platform.h"
-
-#ifndef R_FWUP_CONFIG_H
-#define R_FWUP_CONFIG_H
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-/* Select the update mode.
-    0 = Dual bank
-    1 = Single bank with buffer. (default)
-    2 = Single bank without buffer.
-    3 = Single bank with ext-buffer.
-*/
-#define FWUP_CFG_UPDATE_MODE                        (0)
-
-/* Select the function mode.
-    0 = use for Boot loader
-    1 = use for User program
-*/
-#define FWUP_CFG_FUNCTION_MODE                      (0)
-
-/* Area configuration */
-#define FWUP_CFG_MAIN_AREA_ADDR_L                   (0xFFF00000U)      /* Main area start address     */
-#define FWUP_CFG_BUF_AREA_ADDR_L                    (0xFFE00000U)      /* Buffer area start address   */
-#define FWUP_CFG_AREA_SIZE                          (0xF0000U)         /* Install area size           */
-
-/* Internal flash */
-#define FWUP_CFG_CF_BLK_SIZE                        (0x8000U)          /* Code flash block size       */
-#define FWUP_CFG_CF_W_UNIT_SIZE                     (128U)             /* Code flash write unit size  */
-
-/* External flash */
-#define FWUP_CFG_EXT_BUF_AREA_ADDR_L                (0x00000U)         /* External Buffer area Start address */
-#define FWUP_CFG_EXT_BUF_AREA_BLK_SIZE              (4096U)            /* Block(Sector) size  */
-
-/* Data flash */
-#define FWUP_CFG_DF_ADDR_L                          (0x00100000)       /* DF Start address    */
-#define FWUP_CFG_DF_BLK_SIZE                        (64U)              /* DF Block size       */
-#define FWUP_CFG_DF_NUM_BLKS                        (512U)             /* DF number of blocks */
-
-/* FWUP v1 compatible */
-#define FWUP_CFG_FWUPV1_COMPATIBLE                  (0)                /* 0:Disable, 1:Enable */
-
-/* Select the algorithm of signature verification.
-    0 = ECDSA. (default)
-    1 = SHA256
-*/
-#define FWUP_CFG_SIGNATURE_VERIFICATION             (0)
-
-/* Disable Printf Output Setting.
-    Disables the character output by printf to the terminal software.
-    0 = Enable (default)
-    1 = Disable.
- */
-#define FWUP_CFG_PRINTF_DISABLE                     (0)
-
-#endif /* R_FWUP_CONFIG_H */
diff --git a/Configuration/samples/bootloader/ck-rx65n/src/smc_gen/r_config/r_sci_rx_config.h b/Configuration/samples/bootloader/ck-rx65n/src/smc_gen/r_config/r_sci_rx_config.h
deleted file mode 100644
index 4038efc3..00000000
--- a/Configuration/samples/bootloader/ck-rx65n/src/smc_gen/r_config/r_sci_rx_config.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer 
-*
-* Copyright (C) 2013-2022 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name     : r_sci_rx_config.h
-* Description   : Configures the SCI driver
-************************************************************************************************************************
-* History : DD.MM.YYYY Version Description
-*           25.09.2013 1.00    Initial Release
-*           17.04.2014 1.20    Added comments for new RX110 support.
-*           02.07.2014 1.30    Fixed bug that caused Group12 rx errors to only be enabled for channel 2.
-*           25.11.2014 1.40    Added comments for RX113 support
-*           30.09.2015 1.70    Added comments for RX23T support
-*           01.10.2016 1.80    Added support for RX65N (comments and TX/RX FIFO THRESHOLD options)
-*           19.12.2016 1.90    Added comments for RX24U support
-*           07.03.2017 2.00    Added comments for RX130-512KB support
-*           28.09.2018 2.10    Added comments for RX66T support
-*           01.02.2019 2.20    Added comments for RX72T, RX65N-64pin support
-*                              Added support received data match function for RX65N
-*           28.06.2019 3.10    Added comments for RX23W support
-*           15.08.2019 3.20    Added support received data match function for RX72M (SCI0- SCI11)
-*                              Added support FIFO mode for RX72M (SCI7 - SCI11)
-*           25.11.2019 3.30    Added support RX13T.
-*                              Removed support for Generation 1 devices.
-*           30.12.2019 3.40    Added support RX66N, RX72N.
-*           31.03.2020 3.50    Added support RX23E-A.
-*           25.08.2020 3.60    Added feature using DTC/DMAC in SCI transfer.
-*                              Merged IrDA functionality to SCI FIT.
-*           31.03.2021 3.80    Added support for RX671.
-*                              Added support circular buffer in mode asynchronous.
-*           15.04.2021 3.90    Added support for RX140.
-*           31.03.2022 4.40    Added support for RX660.
-***********************************************************************************************************************/
-#ifndef SCI_CONFIG_H
-#define SCI_CONFIG_H
-
-#include "platform.h"
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-
-/* SPECIFY WHETHER TO INCLUDE CODE FOR API PARAMETER CHECKING */
-/* Setting to BSP_CFG_PARAM_CHECKING_ENABLE utilizes the system default setting */
-/* Setting to 1 includes parameter checking; 0 compiles out parameter checking */
-#define SCI_CFG_PARAM_CHECKING_ENABLE   (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-/* SPECIFY WHETHER TO INCLUDE CODE FOR DIFFERENT SCI MODES */
-/* Setting an equate to 1 includes code specific to that mode. */
-#define SCI_CFG_ASYNC_INCLUDED  (1)
-#define SCI_CFG_SYNC_INCLUDED   (0)
-#define SCI_CFG_SSPI_INCLUDED   (0)
-#define SCI_CFG_IRDA_INCLUDED   (0)
-
-/* Use circular buffer in mode asynchronous */
-/* 1=Use , 0=Unused */
-/* When SCI_CFG_USE_CIRCULAR is 1, please set BSP_CFG_RUN_IN_USER_MODE = 0  and BYTEQ_CFG_PROTECT_QUEUE = 1*/
-#define SCI_CFG_USE_CIRCULAR_BUFFER (0)
-
-/* SPECIFY BYTE VALUE TO TRANSMIT WHILE CLOCKING IN DATA IN SSPI MODES */
-#define SCI_CFG_DUMMY_TX_BYTE   (0xFF)
-
-/* SPECIFY CHANNELS TO INCLUDE SOFTWARE SUPPORT FOR 1=included, 0=not */
-/*
- * NOTE: If using ASYNC mode, adjust BYTEQ_CFG_MAX_CTRL_BLKS in r_byteq_config.h
- * to provide 2 queues per channel (static mode only).
- * * = port connector RSKRX11x
- * u = channel used by the USB-UART port (G1CUSB0)
- * a = this channel is used only for RX130-512KB
- * n = this channel is not available for RX65N-64pin.
- * s = this channel is not available in simple SPI mode.
- * i = this channel is available in IrDA interface.
- * RX MCU supported channels
- *
- * CH#  110 111 113 130 140 230  231  23T 24T 24U 64M 71M 65N 66T 72T 23W 72M 13T 72N 66N 23E-A 671 660
- * ---  --- --- --- --- --- --- ----- --- --- --- --- --- --- --- --- --- --- --- --- --- ----- --- ---
- * CH0           X   Xa      X    X                X   X   Xn              X       X   X          X   X
- * CH1   X   X*  X*  Xu   X  X    X    Xu  Xu  Xu  X   X   Xs  X   X   X   X   X   X   X    Xu    X   X
- * CH2           X                                 X   X   Xu              X       X   X          X   X
- * CH3                                             X   X   Xs              X       X   X          X   X
- * CH4                                             X   X   Xn              X       X   X          X   X
- * CH5   X   X   Xi  X    X  Xi   Xu,i X   X   X   X   X   X   X   X   Xi  X   X   X   X    X     X   X
- * CH6           X   X    X  X    X        X   X   X   X   Xn  X   X       Xu      X   X    X     X   X
- * CH7                                             Xu  Xu  Xn              X       X   X          X   X
- * CH8           X   Xa   X  X    X            X           X   X   X   Xu  X       X   X          X   X
- * CH9           X   Xa   X  X    X            X           Xs  X   X       X       X   X          X   X
- * CH10                                                    X               X       X   X          X   X
- * CH11                                        X           Xs  X   X       X       X   X          X   X
- * CH12  X   X   X   X    X  X    X                X   X   Xs  X   X   X   X   X   X   X    X     X   X
-*/
-                                   
-#define SCI_CFG_CH0_INCLUDED    (0)
-#define SCI_CFG_CH1_INCLUDED    (0)
-#define SCI_CFG_CH2_INCLUDED    (0)
-#define SCI_CFG_CH3_INCLUDED    (0)
-#define SCI_CFG_CH4_INCLUDED    (0)
-#define SCI_CFG_CH5_INCLUDED    (1)
-#define SCI_CFG_CH6_INCLUDED    (0)
-#define SCI_CFG_CH7_INCLUDED    (0)
-#define SCI_CFG_CH8_INCLUDED    (0)
-#define SCI_CFG_CH9_INCLUDED    (0)
-#define SCI_CFG_CH10_INCLUDED   (0)
-#define SCI_CFG_CH11_INCLUDED   (0)
-#define SCI_CFG_CH12_INCLUDED   (0)
-
-/* SPECIFY ASYNC MODE TX QUEUE BUFFER SIZES (will not allocate if chan not enabled */
-#define SCI_CFG_CH0_TX_BUFSIZ   (80)
-#define SCI_CFG_CH1_TX_BUFSIZ   (80)
-#define SCI_CFG_CH2_TX_BUFSIZ   (80)
-#define SCI_CFG_CH3_TX_BUFSIZ   (80)
-#define SCI_CFG_CH4_TX_BUFSIZ   (80)
-#define SCI_CFG_CH5_TX_BUFSIZ   (80)
-#define SCI_CFG_CH6_TX_BUFSIZ   (80)
-#define SCI_CFG_CH7_TX_BUFSIZ   (80)
-#define SCI_CFG_CH8_TX_BUFSIZ   (80)
-#define SCI_CFG_CH9_TX_BUFSIZ   (80)
-#define SCI_CFG_CH10_TX_BUFSIZ  (80)
-#define SCI_CFG_CH11_TX_BUFSIZ  (80)
-#define SCI_CFG_CH12_TX_BUFSIZ  (80)
-
-/* SPECIFY ASYNC MODE RX QUEUE BUFFER SIZES (will not allocate if chan not enabled */
-#define SCI_CFG_CH0_RX_BUFSIZ   (80)
-#define SCI_CFG_CH1_RX_BUFSIZ   (80)
-#define SCI_CFG_CH2_RX_BUFSIZ   (80)
-#define SCI_CFG_CH3_RX_BUFSIZ   (80)
-#define SCI_CFG_CH4_RX_BUFSIZ   (80)
-#define SCI_CFG_CH5_RX_BUFSIZ   (80)
-#define SCI_CFG_CH6_RX_BUFSIZ   (80)
-#define SCI_CFG_CH7_RX_BUFSIZ   (80)
-#define SCI_CFG_CH8_RX_BUFSIZ   (80)
-#define SCI_CFG_CH9_RX_BUFSIZ   (80)
-#define SCI_CFG_CH10_RX_BUFSIZ  (80)
-#define SCI_CFG_CH11_RX_BUFSIZ  (80)
-#define SCI_CFG_CH12_RX_BUFSIZ  (80)
-
-/* 
-* ENABLE TRANSMIT END INTERRUPT (ASYNCHRONOUS)
-* This interrupt only occurs when the last bit of the last byte of data 
-* has been sent and the transmitter has become idle. The interrupt calls
-* the user's callback function specified in R_SCI_Open() and passes it an
-* SCI_EVT_TEI event. A typical use of this feature is to disable an external
-* transceiver to save power. It would then be up to the user's code to 
-* re-enable the transceiver before sending again. Not including this feature
-* reduces code space used by the interrupt. Note that this equate is only
-* for including the TEI code. The interrupt itself must be enabled using an
-* R_SCI_Control(hdl, SCI_CMD_EN_TEI, NULL) call.
-*/
-#define SCI_CFG_TEI_INCLUDED    (0)      /* 1=included, 0=not */
-
-/* 
-* SET GROUPBL0 (ERI, TEI) INTERRUPT PRIORITY; RX64M/RX71M/RX65N/RX72M/RX72N/RX66N/RX671/RX660 ONLY
-* SET GROUPBL1; RX65N ONLY
-* SET GROUPAL0 (ERI,TEI) INTERRUPT PRIORITY; RX65N, RX72M, RX72N, RX66N ONLY
-* This sets the priority level for receiver overrun, framing, and parity errors
-* as well as TEI interrupts for all SCI channels.
-*/
-#define SCI_CFG_ERI_TEI_PRIORITY (3)     /* (RX64M/RX71M/RX65N/RX72M/RX72N/RX66N/RX671/RX660 ONLY) 1 lowest, 15 highest */
-
-/* ENABLE TX/RX FIFO; (SCIi supported MCU ONLY) 1=included, 0=not */
-#define SCI_CFG_CH7_FIFO_INCLUDED   (0)
-#define SCI_CFG_CH8_FIFO_INCLUDED   (0)
-#define SCI_CFG_CH9_FIFO_INCLUDED   (0)
-#define SCI_CFG_CH10_FIFO_INCLUDED  (0)
-#define SCI_CFG_CH11_FIFO_INCLUDED  (0)
-
-/* SET TX FIFO THRESHOLD; (SCIi supported MCU ONLY) 0 lowest, 15 highest */
-/* TX FIFO THRESHOLD is invalid in Clock Synchronous Mode and Simple SPI Mode. */
-/* Set the same value for TX FIFO THRESHOLD and RX FIFO THRESHOLD in Clock Synchronous Mode and Simple SPI Mode. */
-#define SCI_CFG_CH7_TX_FIFO_THRESH (8)
-#define SCI_CFG_CH8_TX_FIFO_THRESH (8)
-#define SCI_CFG_CH9_TX_FIFO_THRESH (8)
-#define SCI_CFG_CH10_TX_FIFO_THRESH (8)
-#define SCI_CFG_CH11_TX_FIFO_THRESH (8)
-
-/* SET RX FIFO THRESHOLD; (SCIi supported MCU ONLY) 1 lowest, 15 highest */
-#define SCI_CFG_CH7_RX_FIFO_THRESH (8)
-#define SCI_CFG_CH8_RX_FIFO_THRESH (8)
-#define SCI_CFG_CH9_RX_FIFO_THRESH (8)
-#define SCI_CFG_CH10_RX_FIFO_THRESH (8)
-#define SCI_CFG_CH11_RX_FIFO_THRESH (8)
-
-/* ENABLE Received Data match function (SCIj and SCIi supported MCU RX65N/RX66T/RX72T/RX72M/RX72N/RX66N ONLY) 1=included, 0=not */
-/*((SCIk and SCIm supported MCU RX671/RX660 ONLY) 1=included, 0=not */
-#define SCI_CFG_CH0_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH1_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH2_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH3_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH4_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH5_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH6_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH7_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH8_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH9_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH10_DATA_MATCH_INCLUDED (0)
-#define SCI_CFG_CH11_DATA_MATCH_INCLUDED (0)
-
-/* 0=Disable, 1=DTC, 2=DMAC */
-#define SCI_CFG_CH0_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH1_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH2_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH3_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH4_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH5_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH6_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH7_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH8_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH9_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH10_TX_DTC_DMACA_ENABLE (0)
-#define SCI_CFG_CH11_TX_DTC_DMACA_ENABLE (0)
-#define SCI_CFG_CH12_TX_DTC_DMACA_ENABLE (0)
-
-#define SCI_CFG_CH0_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH1_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH2_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH3_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH4_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH5_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH6_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH7_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH8_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH9_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH10_RX_DTC_DMACA_ENABLE (0)
-#define SCI_CFG_CH11_RX_DTC_DMACA_ENABLE (0)
-#define SCI_CFG_CH12_RX_DTC_DMACA_ENABLE (0)
-
-/* 0~7 8 channels dmac, but maximum of SCI channel is 13 channel => cost 13*2 = 26 dmac channels in case all of sci channels run simultaneously */
-#define SCI_CFG_CH0_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH1_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH2_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH3_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH4_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH5_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH6_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH7_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH8_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH9_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH10_TX_DMACA_CH_NUM     (0)
-#define SCI_CFG_CH11_TX_DMACA_CH_NUM     (0)
-#define SCI_CFG_CH12_TX_DMACA_CH_NUM     (0)
-
-#define SCI_CFG_CH0_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH1_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH2_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH3_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH4_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH5_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH6_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH7_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH8_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH9_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH10_RX_DMACA_CH_NUM     (1)
-#define SCI_CFG_CH11_RX_DMACA_CH_NUM     (1)
-#define SCI_CFG_CH12_RX_DMACA_CH_NUM     (1)
-
-/* Set enable/ disable transmit signal transition timing adjust feature for each channel*/
-#define SCI_CFG_CH0_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH1_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH2_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH3_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH4_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH5_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH6_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH7_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH8_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH9_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH10_TX_SIGNAL_TRANSITION_TIMING_INCLUDED   (0)
-#define SCI_CFG_CH11_TX_SIGNAL_TRANSITION_TIMING_INCLUDED   (0)
-
-/* Set enable/ disable receive data sampling timing adjust feature for each channel*/
-#define SCI_CFG_CH0_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH1_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH2_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH3_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH4_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH5_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH6_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH7_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH8_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH9_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH10_RX_DATA_SAMPLING_TIMING_INCLUDED   (0)
-#define SCI_CFG_CH11_RX_DATA_SAMPLING_TIMING_INCLUDED   (0)
-
-/* SPECIFY IRDA CHANNELS TO INCLUDE SOFTWARE (SUPPORTED MCU RX113/RX23W/RX231/RX230 ONLY) 1=included, 0=not */
-#define SCI_CFG_CH5_IRDA_INCLUDED    (0)
-
-/* Set the non-active level of the TXD pin */
-/* 1=High , 0=Low */
-#define SCI_CFG_CH5_IRDA_IRTXD_INACTIVE_LEVEL (1)
-
-/* Set the non-active level of the RXD pin */
-/* 1=High , 0=Low */
-#define SCI_CFG_CH5_IRDA_IRRXD_INACTIVE_LEVEL (1)
-
-#endif /* SCI_CONFIG_H */
diff --git a/Configuration/samples/common/ck-rx65n/cellular/CK-RX65N_cellular_scfg.ftl b/Configuration/samples/common/ck-rx65n/cellular/CK-RX65N_cellular_scfg.ftl
deleted file mode 100644
index 06bd5921..00000000
--- a/Configuration/samples/common/ck-rx65n/cellular/CK-RX65N_cellular_scfg.ftl
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<smc>
-    <general version="2.0.0.0">
-        <configuration active="true" id="${configurationTypeReleaseID}">
-            <property id="com.renesas.smc.service.project.buildArtefactType" values="com.renesas.smc.service.project.buildArtefactType.exe"/>
-            <toolchain id="${toolChainID}">
-                <option id="com.renesas.smc.toolchain.option.buildArtefactType" key="com.renesas.smc.toolchain.option.buildArtefactType.exe"/>
-                <option id="com.renesas.smc.toolchain.option.rtos" key="com.renesas.smc.toolchain.option.rtos.freertoslts">
-                    <item id="com.renesas.smc.toolchain.option.rtos.freertoslts" value="${packageVersion}"/>
-                </option>
-            </toolchain>
-        </configuration>
-        <platform id="${targetDevice}"/>
-    </general>
-    <tool id="SWComponent" version="1.0.0.0">
-        <configuration inuse="true" name="r_bsp">
-            <component display="r_bsp" id="r_bsp7.20" version="7.20">
-                <gridItem id="BSP_CFG_HEAP_BYTES" selectedIndex="0x1000"/>
-                <gridItem id="BSP_CFG_SCI_UART_TERMINAL_ENABLE" selectedIndex="1"/>
-                <gridItem id="BSP_CFG_SCI_UART_TERMINAL_CHANNEL" selectedIndex="5"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_s12ad_rx">
-            <component detailDescription="ADC Driver" display="r_s12ad_rx" id="r_s12ad_rx5.00" version="5.00">
-                <gridItem id="AN115" selectedIndex="1"/>
-                <gridItem id="AN117" selectedIndex="1"/>
-                <gridItem id="S12AD1" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_flash_rx">
-            <component display="r_flash_rx" id="r_flash_rx5.00" version="5.00">
-                <gridItem id="FLASH_CFG_PARAM_CHECKING_ENABLE" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_CODE_FLASH_ENABLE" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_DATA_FLASH_BGO" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_CODE_FLASH_BGO" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_CODE_FLASH_RUN_FROM_ROM" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_irq_rx">
-            <component display="r_irq_rx" id="r_irq_rx4.00" version="4.00">
-                <gridItem id="IRQ1" selectedIndex="1"/>
-                <gridItem id="IRQ2" selectedIndex="1"/>
-                <gridItem id="IRQ7" selectedIndex="1"/>
-                <gridItem id="IRQ13" selectedIndex="1"/>
-                <gridItem id="IRQ14" selectedIndex="1"/>
-                <gridItem id="IRQ15" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_cellular">
-            <component display="r_cellular" id="r_cellular1.11" version="1.11">
-                <gridItem id="CELLULAR_CFG_AP_NAME" selectedIndex="ibasis.iot"/>
-                <gridItem id="CELLULAR_CFG_AUTH_TYPE" selectedIndex="2"/>
-                <gridItem id="CELLULAR_CFG_DEBUGLOG" selectedIndex="4"/>
-                <gridItem id="CELLULAR_CFG_UART_SCI_CH" selectedIndex="6"/>
-                <gridItem id="CELLULAR_CFG_RTS_PORT" selectedIndex="0"/>
-                <gridItem id="CELLULAR_CFG_RESET_PORT" selectedIndex="5"/>
-                <gridItem id="CELLULAR_CFG_RESET_PIN" selectedIndex="5"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_sci_rx">
-            <component detailDescription="Multi-Channel Multi-Mode SCI Driver." display="r_sci_rx" id="r_sci_rx4.40" version="4.40">
-                <gridItem id="RXD5/SMISO5/SSCL5" selectedIndex="1"/>
-                <gridItem id="TXD5/SMOSI5/SSDA5" selectedIndex="1"/>
-                <gridItem id="SCI5" selectedIndex="1"/>
-                <gridItem id="RXD6/SMISO6/SSCL6" selectedIndex="1"/>
-                <gridItem id="TXD6/SMOSI6/SSDA6" selectedIndex="1"/>
-                <gridItem id="CTS6#/RTS6#/SS6#" selectedIndex="1"/>
-                <gridItem id="SCI6" selectedIndex="1"/>
-                <gridItem id="SCI_CFG_CH1_INCLUDED" selectedIndex="0"/>
-                <gridItem id="SCI_CFG_CH5_INCLUDED" selectedIndex="1"/>
-                <gridItem id="SCI_CFG_CH6_INCLUDED" selectedIndex="1"/>
-                <gridItem id="SCI_CFG_CH6_TX_BUFSIZ" selectedIndex="2180"/>
-                <gridItem id="SCI_CFG_CH6_RX_BUFSIZ" selectedIndex="8192"/>
-                <gridItem id="SCI_CFG_TEI_INCLUDED" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_byteq">
-            <component display="r_byteq" id="r_byteq2.00" version="2.00">
-                <gridItem id="BYTEQ_CFG_PARAM_CHECKING_ENABLE" selectedIndex="0"/>
-                <gridItem id="BYTEQ_CFG_USE_HEAP_FOR_CTRL_BLKS" selectedIndex="0"/>
-                <gridItem id="BYTEQ_CFG_MAX_CTRL_BLKS" selectedIndex="32"/>
-                <gridItem id="BYTEQ_CFG_PROTECT_QUEUE" selectedIndex="0"/>
-                <gridItem id="BYTEQ_CFG_CRITICAL_SECTION" selectedIndex="0"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_tsip_rx">
-            <component display="r_tsip_rx" id="r_tsip_rx1.17.l" version="1.17.l"/>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration enable="true" exclude="false" inuse="true" name="FreeRTOS_Kernel">
-            <component display="FreeRTOS Kernel" id="FreeRTOS_Kernel${packageVersion}" version="${packageVersion}">
-                <gridItem id="configMINIMAL_STACK_SIZE" selectedIndex="768"/>
-                <gridItem id="configUSE_TICK_HOOK" selectedIndex="1"/>
-                <gridItem id="configUSE_IDLE_HOOK" selectedIndex="1"/>
-                <gridItem id="configUSE_MALLOC_FAILED_HOOK" selectedIndex="1"/>
-                <gridItem id="configCHECK_FOR_STACK_OVERFLOW" selectedIndex="2"/>
-                <gridItem id="configCOMMAND_INT_MAX_OUTPUT_SIZE" selectedIndex="850"/>
-                <gridItem id="configIP_ADDR0" selectedIndex="192"/>
-                <gridItem id="configIP_ADDR1" selectedIndex="168"/>
-                <gridItem id="configIP_ADDR2" selectedIndex="11"/>
-                <gridItem id="configIP_ADDR3" selectedIndex="12"/>
-            </component>
-            <source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
-        </configuration>
-        <configuration enable="true" exclude="false" inuse="true" name="LittleFS">
-            <component display="LittleFS" id="LittleFS${packageVersion}" version="${packageVersion}">
-                <gridItem id="RM_LITTLEFS_FLASH_DATA_START" selectedIndex="FLASH_DF_BLOCK_0_MACRO"/>
-            </component>
-            <source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
-        </configuration>
-        <configuration enable="true" exclude="false" inuse="true" name="FreeRTOS Object">
-            <allocatable id="OBJECT" name="OBJECT" type="">
-                <allocatable id="TASK" name="TASK" type="">
-                    <allocatable id="TASKOBJECTLINK1" name="TASK" type="" readonly="true">
-                        <option defaultValue="1" id="Initialize" value="0"/>
-                        <option defaultValue="task_[X]" id="TaskCode" value="main_task"/>
-                        <option defaultValue="task_[X]" id="TaskName" value="MAIN_TASK"/>
-                        <option defaultValue="512" id="StackSize" value="512"/>
-                        <option defaultValue="NULL" id="TaskHandler" value="NULL"/>
-                        <option defaultValue="NULL" id="Parameter" value="NULL"/>
-                        <option defaultValue="1" id="Priority" value="1"/>
-                    </allocatable>
-                    <option defaultValue="0" id="LinkNum" value="1"/>
-                </allocatable>
-                <allocatable id="QUEUE" name="QUEUE" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="SEMAPHORE" name="SEMAPHORE" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="SWTIMER" name="SWTIMER" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="EVENTGROUP" name="EVENTGROUP" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="STREAMBUFFER" name="STREAMBUFFER" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="MESSAGEBUFFER" name="MESSAGEBUFFER" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-            </allocatable>
-            <component description="" detailDescription="" display="FreeRTOS Object" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.freertos.object" version="1.0.120"/>
-            <source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
-        </configuration>
-    </tool>
-    <tool id="System">
-        <section id="ocd">
-            <option enabled="true" id="debugIF" selection="fine">
-                <item enabled="true" id="unused"/>
-                <item enabled="true" id="fine"/>
-                <item enabled="true" id="jtag"/>
-                <item enabled="true" id="jtagTrace"/>
-            </option>
-        </section>
-    </tool>
-</smc>
diff --git a/Configuration/samples/common/ck-rx65n/cellular/README.md b/Configuration/samples/common/ck-rx65n/cellular/README.md
deleted file mode 100644
index 313af689..00000000
--- a/Configuration/samples/common/ck-rx65n/cellular/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
----------------
-1. Usage Notes
----------------
-  
-1.1. Please take note that the sample project is verified with C project.  
-If you create new project with C++ option, please confirm its behaviour by yourself.  
-For example, if you create project with C++ option and CC-RX compiler, you will need to add abort() function manually.  
-  
-1.2. This sample project requires a "DUAL" device setting.  
-If using e2studio_2024-01 and earlier, and "non-DUAL" target board (e.g: CK-RX65N) is selected in the PG wizard, please change to "DUAL" device following the steps below:  
-###
-        1. In the Smart Configurator window, select the Board tab to open the Device selection window.
-        2. Click the ... button next to Board: to open the Change Device window.
-        3. In the Change Device window, change the value of the Target Device: item to R5F565NEHxFB_DUAL.
-           (You can click the ... button to the right of the text entry field to choose from a list of candidates.
-            Leave the Target Board: setting of Custom unchanged.)
-        4. After changing the device, click the Next > button.
-           On the information window that appears, click the Next > button again without making changes.
-        5. Finally, a window appears asking you to confirm the change. Click the Finish button.
-           (If a window asking you to confirm a change of target board appears, click the Yes button.)
-  
-1.3 If using e2studio_2024-04 and later, and Bank Mode is configured as "Single Bank" in the PG wizard, please change to "Dual Bank" following the steps below:  
-###
-        1. In the Smart Configurator window, select the Board tab to open the Device configuration window.
-        2. Change the value of the Bank Mode: item to "Dual Bank".
-        3. Click "Generate Code" to apply the changes.
-  
-1.4. After device/bank mode is changed, compiler setting is reset, please update the linker settings following the steps below:  
-###
-      - Under [Project] > [C/C++ Project Settings]:
-      - For CC-RX,
-        1. Go to Linker > Section, click Import...
-        2. Select "linker_section_sample.esi" under src folder of current project.
-  
-1.5. Please make sure to configure Smart Configurator 'Code generation behavior' to 'Update configuration files'.  
-You can do so in e2studio Windows > Preferences > Renesas > Smart Configurator > Component.  
-This is necessary because the FWUP module uses custom wrapper code for this application, this Smart Configurator setting ensures that wrapper code is not overwritten.
-  
-1.6. Issue with added sections when generating code.  
-After generating code by Smart Configurator, sections (C_FIRMWARE_UPDATE_CONTROL_BLOCK and C_FIRMWARE_UPDATE_CONTROL_BLOCK_MIRROR) are added at address 0x00100000 due to the TSIP module (v1.17.l and above).  
-They are empty sections and will not use any additional memory.
\ No newline at end of file
diff --git a/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_bsp_config.h b/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_bsp_config.h
deleted file mode 100644
index 9e38ff28..00000000
--- a/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_bsp_config.h
+++ /dev/null
@@ -1,743 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer
-*
-* Copyright (C) 2017 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name    : r_bsp_config_reference.h
-* Device(s)    : RX65N
-* Description  : The file r_bsp_config.h is used to configure your BSP. r_bsp_config.h should be included
-*                somewhere in your package so that the r_bsp code has access to it. This file (r_bsp_config_reference.h)
-*                is just a reference file that the user can use to make their own r_bsp_config.h file.
-************************************************************************************************************************
-* History : DD.MM.YYYY Version   Description
-*         : 15.05.2017 1.00      First Release
-*         : 01.12.2017 1.01      Added the following macro definition.
-*                                - BSP_CFG_EBMAPCR_1ST_PRIORITY
-*                                - BSP_CFG_EBMAPCR_2ND_PRIORITY
-*                                - BSP_CFG_EBMAPCR_3RD_PRIORITY
-*                                - BSP_CFG_EBMAPCR_4TH_PRIORITY
-*                                - BSP_CFG_EBMAPCR_5TH_PRIORITY
-*         : 01.07.2018 1.02      Added the following macro definition.
-*                                - BSP_CFG_CONFIGURATOR_SELECT
-*                                Add RTOS support. FreeRTOS. Define a timer for RTOS.
-*         : 27.07.2018 1.03      Modified the comment of PLL clock source.
-*                                Added the following macro definition for ID code protection.
-*                                 - BSP_CFG_ID_CODE_LONG_1
-*                                 - BSP_CFG_ID_CODE_LONG_2
-*                                 - BSP_CFG_ID_CODE_LONG_3
-*                                 - BSP_CFG_ID_CODE_LONG_4
-*                                Added the following macro definition.
-*                                 - BSP_CFG_FIT_IPL_MAX
-*         : 31.10.2018 1.04      Added support for RX651 with 64 pin package.
-*         : 28.02.2019 2.00      Added support for GNUC and ICCRX.
-*                                Fixed coding style.
-*         : 26.07.2019 2.01      Modified comment.
-*         : 08.10.2019 2.02      Added the following macro definition.
-*                                - BSP_CFG_SWINT_UNIT1_ENABLE
-*                                - BSP_CFG_SWINT_UNIT2_ENABLE
-*                                - BSP_CFG_SWINT_TASK_BUFFER_NUMBER
-*                                - BSP_CFG_SWINT_IPR_INITIAL_VALUE
-*                                Modified comment for added support of Renesas RTOS (RI600V4 or RI600PX).
-*                                Added the following macro definition.
-*                                - BSP_CFG_RENESAS_RTOS_USED
-*         : 31.07.2020 2.03      Modified comment.
-*         : 29.01.2021 2.04      Added the following macro definition.
-*                                - BSP_CFG_SCI_UART_TERMINAL_ENABLE
-*                                - BSP_CFG_SCI_UART_TERMINAL_CHANNEL
-*                                - BSP_CFG_SCI_UART_TERMINAL_BITRATE
-*                                - BSP_CFG_SCI_UART_TERMINAL_INTERRUPT_PRIORITY
-*         : 26.02.2021 2.05      Added a comment for Azure RTOS to BSP_CFG_RTOS_USED.
-*         : 30.11.2021 3.00      Added the following macro definitions.
-*                                - BSP_CFG_MAIN_CLOCK_OSCILLATE_ENABLE
-*                                - BSP_CFG_SUB_CLOCK_OSCILLATE_ENABLE
-*                                - BSP_CFG_HOCO_OSCILLATE_ENABLE
-*                                - BSP_CFG_LOCO_OSCILLATE_ENABLE
-*                                - BSP_CFG_IWDT_CLOCK_OSCILLATE_ENABLE
-*                                - BSP_CFG_CONFIGURATOR_VERSION
-*                                - BSP_CFG_CPLUSPLUS
-*                                - BSP_CFG_SERIAL_PROGRAMMER_CONECT_ENABLE
-*                                Changed initial value of the following macro definitions.
-*                                - BSP_CFG_MCU_PART_GROUP
-*                                - BSP_CFG_MCU_PART_SERIES
-*         : 11.02.2022 3.01      Changed initial value of the following macro definitions.
-*                                - BSP_CFG_SWINT_UNIT1_ENABLE
-*                                - BSP_CFG_SWINT_UNIT2_ENABLE
-***********************************************************************************************************************/
-#ifndef R_BSP_CONFIG_REF_HEADER_FILE
-#define R_BSP_CONFIG_REF_HEADER_FILE
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-
-/* NOTE:
-   The default settings are the same as when using RSKRX65N-2MB.
-   Change to the settings for the user board.
-*/
-
-/* Start up select
-   0 = Enable BSP startup program.
-   1 = Disable BSP startup program. (e.g. Using user startup program.)
-   NOTE: This setting is available only when using CCRX. */
-#define BSP_CFG_STARTUP_DISABLE (0)
-
-/* Enter the product part number for your MCU. This information will be used to obtain information about your MCU such 
-   as package and memory size.
-   To help parse this information, the part number will be defined using multiple macros.
-   R 5 F 56 5N E D D FP
-   | | | |  |  | | | |  Macro Name                             Description
-   | | | |  |  | | | |__BSP_CFG_MCU_PART_PACKAGE             = Package type, number of pins, and pin pitch
-   | | | |  |  | | |____not used                             = Products with wide temperature range
-   | | | |  |  | |______BSP_CFG_MCU_PART_ENCRYPTION_INCLUDED = Encryption module included/not included
-   | | | |  |  |________BSP_CFG_MCU_PART_MEMORY_SIZE         = ROM, RAM, and Data Flash Capacity
-   | | | |  |___________BSP_CFG_MCU_PART_GROUP               = Group name
-   | | | |______________BSP_CFG_MCU_PART_SERIES              = Series name
-   | | |________________BSP_CFG_MCU_PART_MEMORY_TYPE         = Type of memory (Flash, ROMless)
-   | |__________________not used                             = Renesas MCU
-   |____________________not used                             = Renesas semiconductor product.
-*/
-
-/* Package type. Set the macro definition based on values below:
-   Character(s) = Value for macro = Package Type/Number of Pins/Pin Pitch
-   FC           = 0x0             = LFQFP/176/0.50
-   BG           = 0x1             = LFBGA/176/0.80
-   LC           = 0x2             = TFLGA/177/0.50
-   FB           = 0x3             = LFQFP/144/0.50
-   LK           = 0x4             = TFLGA/145/0.50
-   FP           = 0x5             = LFQFP/100/0.50
-   FM           = 0x8             = LFQFP/64/0.50
-   LJ           = 0xA             = TFLGA/100/0.65
-   BP           = 0xC             = TFBGA/64/0.50
-*/
-#define BSP_CFG_MCU_PART_PACKAGE        (0x3) /* Generated value. Do not edit this manually */
-
-/* Whether Encryption and SDHI/SDSI are included or not.
-   Character(s) = Value for macro = Description
-   A            = false           = Encryption module not included, SDHI/SDSI module not included
-   B            = false           = Encryption module not included, SDHI/SDSI module included
-   D            = false           = Encryption module not included, SDHI/SDSI module included, dual-bank structure
-   E            = true            = Encryption module included, SDHI/SDSI module not included
-   F            = true            = Encryption module included, SDHI/SDSI module included
-   H            = true            = Encryption module included, SDHI/SDSI module included, dual-bank structure
-*/
-#define BSP_CFG_MCU_PART_ENCRYPTION_INCLUDED   (true) /* Generated value. Do not edit this manually */
-
-/* ROM, RAM, and Data Flash Capacity.
-   Character(s) = Value for macro = ROM Size/Ram Size/Data Flash Size
-   4            = 0x4             = 512KB/256KB/Not equipped
-   7            = 0x7             = 768KB/256KB/Not equipped
-   9            = 0x9             = 1MB/256KB/Not equipped
-   C            = 0xC             = 1.5MB/640KB/32KB
-   E            = 0xE             = 2MB/640KB/32KB
-   NOTE: When the RAM capacity is 640KB, the RAM areas are not contiguous.
-*/
-#define BSP_CFG_MCU_PART_MEMORY_SIZE    (0xE) /* Generated value. Do not edit this manually */
-
-/* Group name.
-   Character(s) = Description
-   5N/51        = RX65N Group/RX651 Group
-*/
-#define BSP_CFG_MCU_PART_GROUP          "RX65N" /* Generated value. Do not edit this manually */
-
-/* Series name.
-   Character(s) = Description
-   56           = RX600 Series
-*/
-#define BSP_CFG_MCU_PART_SERIES         "RX600" /* Generated value. Do not edit this manually */
-
-/* Memory type.
-   Character(s) = Value for macro = Description
-   F            = 0x0             = Flash memory version
-*/
-#define BSP_CFG_MCU_PART_MEMORY_TYPE    (0x0) /* Generated value. Do not edit this manually */
-
-/* Whether to use 1 stack or 2. RX MCUs have the ability to use 2 stacks: an interrupt stack and a user stack.
- * When using 2 stacks the user stack will be used during normal user code. When an interrupt occurs the CPU
- * will automatically shift to using the interrupt stack. Having 2 stacks can make it easier to figure out how
- * much stack space to allocate since the user does not have to worry about always having enough room on the
- * user stack for if-and-when an interrupt occurs. Some users will not want 2 stacks though because it is not
- * needed in all applications and can lead to wasted RAM (i.e. space in between stacks that is not used).
- * If only 1 stack is used then the interrupt stack is the one that will be used. If 1 stack is chosen then
- * the user may want to remove the 'SU' section from the linker sections to remove any linker warnings.
- *
- * 0 = Use 1 stack. Disable user stack. User stack size set below will be ignored.
- * 1 = Use 2 stacks. User stack and interrupt stack will both be used.
- * NOTE: This setting is available only when using CCRX and GNUC.
- *       This is invalid when using Renesas RTOS with CCRX.
- */
-#define BSP_CFG_USER_STACK_ENABLE       (1)
-
-/* If only 1 stack is chosen using BSP_CFG_USER_STACK_ENABLE then no RAM will be allocated for the user stack. */
-#if BSP_CFG_USER_STACK_ENABLE == 1
-/* User Stack size in bytes.
- * NOTE: This setting is available only when using CCRX and GNUC.
- *       This is invalid when using Renesas RTOS with CCRX. */
-#define BSP_CFG_USTACK_BYTES            (0x1000)
-#endif
-
-/* Interrupt Stack size in bytes.
-   NOTE: This setting is available only when using CCRX and GNUC. */
-#define BSP_CFG_ISTACK_BYTES            (0x400)
-
-/* Heap size in bytes.
-   To disable the heap you must follow these steps:
-   1) Set this macro (BSP_CFG_HEAP_BYTES) to 0.
-   2) Set the macro BSP_CFG_IO_LIB_ENABLE to 0.
-   3) Disable stdio from being built into the project library. This is done by going into the Renesas RX Toolchain 
-      settings and choosing the Standard Library section. After that choose 'Contents' in e2 studio.
-      This will present a list of modules that can be included. Uncheck the box for stdio.h.
-   NOTE: This setting is available only when using CCRX and GNUC. */
-#define BSP_CFG_HEAP_BYTES              (0x1000)
-
-/* Initializes C input & output library functions.
-   0 = Disable I/O library initialization in resetprg.c. If you are not using stdio then use this value.
-   1 = Enable I/O library initialization in resetprg.c. This is default and needed if you are using stdio.
-   NOTE: This setting is available only when using CCRX. */
-#define BSP_CFG_IO_LIB_ENABLE           (1)
-
-/* If desired the user may redirect the stdio charget() and/or charput() functions to their own respective functions
-   by enabling below and providing and replacing the my_sw_... function names with the names of their own functions. */
-#define BSP_CFG_USER_CHARGET_ENABLED    (0)
-#define BSP_CFG_USER_CHARGET_FUNCTION     my_sw_charget_function
-
-#define BSP_CFG_USER_CHARPUT_ENABLED    (0)
-#define BSP_CFG_USER_CHARPUT_FUNCTION     my_sw_charput_function
-
-/* After reset MCU will operate in Supervisor mode. To switch to User mode, set this macro to '1'. For more information
-   on the differences between these 2 modes see the CPU >> Processor Mode section of your MCU's hardware manual.
-   0 = Stay in Supervisor mode.
-   1 = Switch to User mode.
-   NOTE: This is invalid when using Renesas RTOS with CCRX.
-*/
-#define BSP_CFG_RUN_IN_USER_MODE        (0)
-
-/* Set your desired ID code. NOTE, leave at the default (all 0xFF's) if you do not wish to use an ID code. If you set 
-   this value and program it into the MCU then you will need to remember the ID code because the debugger will ask for 
-   it when trying to connect. Note that the E1/E20 will ignore the ID code when programming the MCU during debugging.
-   If you set this value and then forget it then you can clear the ID code by connecting up in serial boot mode using 
-   FDT. The ID Code is 16 bytes long. The macro below define the ID Code in 4-byte sections. */
-/* Lowest 4-byte section, address 0xFE7F5D50. From MSB to LSB: ID code 4, ID code 3, ID code 2, ID code 1/Control Code.
- */
-#define BSP_CFG_ID_CODE_LONG_1          (0xFFFFFFFF)
-/* 2nd ID Code section, address 0xFE7F5D54. From MSB to LSB: ID code 8, ID code 7, ID code 6, ID code 5. */
-#define BSP_CFG_ID_CODE_LONG_2          (0xFFFFFFFF)
-/* 3rd ID Code section, address 0xFE7F5D58. From MSB to LSB: ID code 12, ID code 11, ID code 10, ID code 9. */
-#define BSP_CFG_ID_CODE_LONG_3          (0xFFFFFFFF)
-/* 4th ID Code section, address 0xFE7F5D5C. From MSB to LSB: ID code 16, ID code 15, ID code 14, ID code 13. */
-#define BSP_CFG_ID_CODE_LONG_4          (0xFFFFFFFF)
-
-/* Select whether to enables or disables the connection of serial programmer.
-   0 = Connection of a serial programmer is prohibited after a reset.
-   1 = Connection of a serial programmer is permitted after a reset. (default)
-*/
-#define BSP_CFG_SERIAL_PROGRAMMER_CONECT_ENABLE   (1)
-
-/* Select whether to oscillate the Main Clock Oscillator.
-   0 = Stop Oscillating the Main Clock.
-   1 = Enable oscillating the Main Clock. (default)
-*/
-#define BSP_CFG_MAIN_CLOCK_OSCILLATE_ENABLE    (1) /* Generated value. Do not edit this manually */
-
-/* Select whether to oscillate the Sub Clock Oscillator.
-   0 = Stop Oscillating the Sub Clock. (default)
-   1 = Enable Oscillating the Sub Clock.
-*/
-#define BSP_CFG_SUB_CLOCK_OSCILLATE_ENABLE     (1) /* Generated value. Do not edit this manually */
-
-/* Select whether to oscillate the High Speed On-Chip Oscillator (HOCO).
-   0 = Stop Oscillating the HOCO. (default)
-   1 = Enable Oscillating the HOCO.
-*/
-#define BSP_CFG_HOCO_OSCILLATE_ENABLE          (0) /* Generated value. Do not edit this manually */
-
-/* Select whether to oscillate the Low Speed On-Chip Oscillator (LOCO).
-   0 = Stop Oscillating the LOCO. (default)
-   1 = Enable Oscillating the LOCO.
-*/
-#define BSP_CFG_LOCO_OSCILLATE_ENABLE          (0) /* Generated value. Do not edit this manually */
-
-/* Select whether to oscillate the IWDT-Dedicated On-Chip Oscillator (IWDT).
-   0 = Stop Oscillating the IWDT Clock. (default)
-   1 = Enable Oscillating the IWDT Clock.
-*/
-#define BSP_CFG_IWDT_CLOCK_OSCILLATE_ENABLE    (0) /* Generated value. Do not edit this manually */
-
-/* Clock source select (CKSEL).
-   0 = Low Speed On-Chip Oscillator  (LOCO)
-   1 = High Speed On-Chip Oscillator (HOCO)
-   2 = Main Clock Oscillator
-   3 = Sub-Clock Oscillator
-   4 = PLL Circuit
-*/
-#define BSP_CFG_CLOCK_SOURCE            (4) /* Generated value. Do not edit this manually */
-
-/* Main clock Oscillator Switching (MOSEL).
-   0 = Resonator
-   1 = External clock input
-*/
-#define BSP_CFG_MAIN_CLOCK_SOURCE       (0) /* Generated value. Do not edit this manually */
-
-/* The sub-clock oscillation control for using the RTC.
-   When '1' is selected, the registers related to RTC are initialized and the sub-clock oscillator is operated.
-   0 = The RTC is not to be used.
-   1 = The RTC is to be used.
-*/
-#define BSP_CFG_RTC_ENABLE              (0) /* Generated value. Do not edit this manually */
-
-/* Sub-Clock Oscillator Drive Capacity Control (RTCDV).
-   0 = Drive capacity for standard CL. (default)
-   1 = Drive capacity for low CL.
-*/
-#define BSP_CFG_SOSC_DRV_CAP            (0) /* Generated value. Do not edit this manually */
-
-/* Clock configuration options.
-   The input clock frequency is specified and then the system clocks are set by specifying the multipliers used. The
-   multiplier settings are used to set the clock registers in resetprg.c. If a 24MHz clock is used and the
-   ICLK is 120MHz, PCLKA is 120MHz, PCLKB is 60MHz, PCLKC is 60MHz, PCLKD is 60MHz, FCLK is 60MHz, USB Clock is 48MHz,
-   and BCLK is 120MHz then the settings would be:
-
-   BSP_CFG_XTAL_HZ  = 24000000
-   BSP_CFG_PLL_DIV  = 1        (no division)
-   BSP_CFG_PLL_MUL  = 10.0     (24MHz x 10.0 = 240MHz)
-   BSP_CFG_ICK_DIV  = 2      : System Clock (ICLK)        = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_ICK_DIV)  = 120MHz
-   BSP_CFG_PCKA_DIV = 2      : Peripheral Clock A (PCLKA) = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_PCKA_DIV) = 120MHz
-   BSP_CFG_PCKB_DIV = 4      : Peripheral Clock B (PCLKB) = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_PCKB_DIV) = 60MHz
-   BSP_CFG_PCKC_DIV = 4      : Peripheral Clock C (PCLKC) = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_PCKC_DIV) = 60MHz
-   BSP_CFG_PCKD_DIV = 4      : Peripheral Clock D (PCLKD) = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_PCKD_DIV) = 60MHz
-   BSP_CFG_FCK_DIV  = 4      : Flash IF Clock (FCLK)      = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_FCK_DIV)  = 60MHz
-   BSP_CFG_BCK_DIV  = 2      : External Bus Clock (BCK)   = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_BCK_DIV)  = 120MHz
-   BSP_CFG_UCK_DIV  = 5      : USB Clock (UCLK)           = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_UCK_DIV)  = 48MHz
-*/
-
-/* Input clock frequency in Hz (XTAL or EXTAL). */
-#define BSP_CFG_XTAL_HZ                 (24000000) /* Generated value. Do not edit this manually */
-
-/* The HOCO can operate at several different frequencies. Choose which one using the macro below.
-   Available frequency settings:
-   0 = 16MHz (default)
-   1 = 18MHz
-   2 = 20MHz
-*/
-#define BSP_CFG_HOCO_FREQUENCY          (0) /* Generated value. Do not edit this manually */
-
-/* PLL clock source (PLLSRCSEL). Choose which clock source to input to the PLL circuit.
-   Available clock sources:
-   0 = Main clock (default)
-   1 = HOCO
-*/
-#define BSP_CFG_PLL_SRC                 (0) /* Generated value. Do not edit this manually */
-
-/* PLL Input Frequency Division Ratio Select (PLIDIV).
-   Available divisors = /1 (no division), /2, /3
-*/
-#define BSP_CFG_PLL_DIV                 (1) /* Generated value. Do not edit this manually */
-
-/* PLL Frequency Multiplication Factor Select (STC).
-   Available multipliers = x10.0 to x30.0 in 0.5 increments (e.g. 10.0, 10.5, 11.0, 11.5, ..., 29.0, 29.5, 30.0)
-*/
-#define BSP_CFG_PLL_MUL                 (10.0) /* Generated value. Do not edit this manually */
-
-/* System Clock Divider (ICK).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_ICK_DIV                 (2) /* Generated value. Do not edit this manually */
-
-/* Peripheral Module Clock A Divider (PCKA).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_PCKA_DIV                (2) /* Generated value. Do not edit this manually */
-
-/* Peripheral Module Clock B Divider (PCKB).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_PCKB_DIV                (4) /* Generated value. Do not edit this manually */
-
-/* Peripheral Module Clock C Divider (PCKC).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_PCKC_DIV                (4) /* Generated value. Do not edit this manually */
-
-/* Peripheral Module Clock D Divider (PCKD).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_PCKD_DIV                (4) /* Generated value. Do not edit this manually */
-
-/* External Bus Clock Divider (BCLK).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_BCK_DIV                 (2) /* Generated value. Do not edit this manually */
-
-/* Flash IF Clock Divider (FCK).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_FCK_DIV                 (4) /* Generated value. Do not edit this manually */
-
-/* USB Clock Divider Select.
-   Available divisors = /2, /3, /4, /5
-*/
-#define BSP_CFG_UCK_DIV                 (5) /* Generated value. Do not edit this manually */
-
-/* Configure BCLK output pin (only effective when external bus enabled)
-   Values 0=no output, 1 = BCK frequency, 2= BCK/2 frequency
-*/
-#define BSP_CFG_BCLK_OUTPUT             (0) /* Generated value. Do not edit this manually */
-
-/* Configure SDCLK output pin (only effective when external bus enabled)
-   Values 0=no output, 1 = BCK frequency
-*/
-#define BSP_CFG_SDCLK_OUTPUT            (0) /* Generated value. Do not edit this manually */
-
-/* Main Clock Oscillator Wait Time (MOSCWTCR).
-   The value of MOSCWTCR register required for correspondence with the waiting time required to secure stable 
-   oscillation by the main clock oscillator is obtained by using the maximum frequency for fLOCO in the formula below.
-
-   BSP_CFG_MOSC_WAIT_TIME > (tMAINOSC * (fLOCO_max) + 16)/32
-   (tMAINOSC: main clock oscillation stabilization time; fLOCO_max: maximum frequency for fLOCO)
-
-   If tMAINOSC is 9.98 ms and fLOCO_max is 264 kHz (the period is 1/3.78 us), the formula gives 
-   BSP_CFG_MOSC_WAIT_TIME > (9.98 ms * (264 kHZ) + 16)/32 = 82.83, so set the BSP_CFG_MOSC_WAIT_TIME to 83(53h).
-
-   NOTE: The waiting time is not required when an external clock signal is input for the main clock oscillator.
-         Set the BSP_CFG_MOSC_WAIT_TIME to 00h.
-*/
-#define BSP_CFG_MOSC_WAIT_TIME          (0x53) /* Generated value. Do not edit this manually */
-
-/* Sub-Clock Oscillator Wait Time (SOSCWTCR).
-   The value of SOSCWTCR register required for correspondence with the expected time to secure settling of oscillation
-   by the sub-clock oscillator is obtained by using the maximum frequency for fLOCO in the formula below.
-
-   BSP_CFG_SOSC_WAIT_TIME > (tSUBOSC * (fLOCO_max) + 16)/16384
-   (tSUBOSC: sub-clock oscillation stabilization time; fLOCO_max: maximum frequency for fLOCO)
-
-   If tSUBOSC is 2 s and fLOCO is 264 kHz (the period is 1/3.78 us), the formula gives
-    BSP_CFG_SOSC_WAIT_TIME > (2 s * (264 kHz) +16)/16384 = 32.22, so set the  BSP_CFG_SOSC_WAIT_TIME bits to 33(21h).
-*/
-#define BSP_CFG_SOSC_WAIT_TIME          (0x21) /* Generated value. Do not edit this manually */
-
-/* ROM Cache Enable Register (ROMCE).
-   0 = ROM cache operation disabled.
-   1 = ROM cache operation enabled.
-*/
-#define BSP_CFG_ROM_CACHE_ENABLE        (0)
-
-/* Configure WDT and IWDT settings.
-   OFS0 - Option Function Select Register 0
-       b31:b29 Reserved When reading, these bits return the value written by the user. The write value should be 1.
-       b28     WDTRSTIRQS - WDT Reset Interrupt Request - What to do on underflow (0=take interrupt, 1=reset MCU)
-       b27:b26 WDTRPSS   - WDT Window Start Position Select - (0=25%, 1=50%, 2=75%, 3=100%,don't use)
-       b25:b24 WDTRPES   - WDT Window End Position Select - (0=75%, 1=50%, 2=25%, 3=0%,don't use)
-       b23:b20 WDTCKS    - WDT Clock Frequency Division Ratio - (1=PCLKB/4, 4=PCLKB/64, 0xF=PCLKB/128, 6=PCLKB/256,
-                                                                 7=PCLKB/2048, 8=PCLKB/8192)
-       b19:b18 WDTTOPS   - WDT Timeout Period Select (0=1024 cycles, 1=4096, 2=8192, 3=16384)
-       b17     WDTSTRT   - WDT Start Mode Select - (0=auto-start after reset, 1=halt after reset)
-       b16:b15 Reserved (set to 1)
-       b14     IWDTSLCSTP - IWDT Sleep Mode Count Stop Control - (0=can't stop count, 1=stop w/some low power modes)
-       b13     Reserved (set to 1)
-       b12     IWDTRSTIRQS - IWDT Reset Interrupt Request - What to do on underflow (0=take interrupt, 1=reset MCU)
-       b11:b10 IWDTRPSS - IWDT Window Start Position Select - (0=25%, 1=50%, 2=75%, 3=100%,don't use)
-       b9:b8   IWDTRPES - IWDT Window End Position Select - (0=75%, 1=50%, 2=25%, 3=0%,don't use)
-       b7:b4   IWDTCKS - IWDT Clock Frequency Division Ratio - (0=none, 2=/16, 3 = /32, 4=/64, 0xF=/128, 5=/256)
-       b3:b2   IWDTTOPS - IWDT Timeout Period Select - (0=1024 cycles, 1=4096, 2=8192, 3=16384)
-       b1      IWDTSTRT - IWDT Start Mode Select - (0=auto-start after reset, 1=halt after reset)
-       b0      Reserved (set to 1)
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_OFS0_REG_VALUE  (0xFFFFFFFF) /* Generated value. Do not edit this manually */
-
-/* Configure whether voltage detection 0 circuit and HOCO are enabled after reset.
-   OFS1 - Option Function Select Register 1
-       b31:b9 Reserved (set to 1)
-       b8     HOCOEN - Enable/disable HOCO oscillation after a reset (0=enable, 1=disable)
-       b7:b3  Reserved When reading, these bits return the value written by the user. The write value should be 1.
-       b2     LVDAS - Voltage Detection 0 circuit start (1=monitoring disabled)
-       b1:b0  VDSEL - Voltage Detection 0 level select (1=2.94v, 2=2.87v, 3=2.80v)
-       NOTE: If HOCO oscillation is enabled by OFS1.HOCOEN, HOCO frequency is 16MHz.
-             BSP_CFG_HOCO_FREQUENCY should be default value.
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_OFS1_REG_VALUE  (0xFFFFFFFF) /* Generated value. Do not edit this manually */
-
-/* Trusted memory is facility to prevent the reading of blocks 8 and 9 and blocks 46 and 47 (in dual mode) in 
-   the code flash memory by third party software. This feature is disabled by default.
-   TMEF - TM Enable Flag Register
-       b31     Reserved (set to 1)
-       b30:b28 TMEFDB - Dual-Bank TM Enable - 000: The TM function in the address range from FFEE 0000h to 
-                                                   FFEE FFFFh is enabled in dual mode.
-                                            - 111: The TM function in the address range from FFEE 0000h to 
-                                                   FFEE FFFFh is disabled in dual mode.
-       b27     Reserved (set to 1)
-       b26:b24 TMEF   - TM Enable - 000: TM function is enabled.
-                                  - 111: TM function is disabled.
-       b23:b0  Reserved (set to 1)
-       NOTE: If the dual bank function has not been incorporated in a device,
-             TMEFDB bits [b30:b26] are reserved area.
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_TRUSTED_MODE_FUNCTION  (0xFFFFFFFF)
-
-/* Configure FAW register is used to set the write protection flag and boot area select flag 
-   for setting the flash access window startaddress and flash access window end address.
-   FAW - Flash Access Window Setting Register
-       b31      BTFLG - Boot Area Select Flag - 0: FFFF C000h to FFFF DFFFh are used as the boot area
-                                              - 1: FFFF E000h to FFFF FFFFh are used as the boot area
-       b30:b28  Reserved - When reading, these bits return the value written by the user.The write value should be 1.
-       b27:b16  FAWE - Flash Access Window End Address - Flash access window end address
-       b15      FSPR - Access Window Protection Flag - 0: With protection (P/E disabled)
-                                                     - 1: Without protection (P/E enabled)
-       b14:b12  Reserved - When reading, these bits return the value written by the user.The write value should be 1.
-       b11:b0   FAWS - Flash Access Window Start Address - Flash access window start address 
-       NOTE: Once 0 is written to this bit, the bit can never be restored to 1.
-             Therefore, the access window and the BTFLG bit never be set again or the TM function 
-             never be disabled once it has been enabled.
-             Exercise extra caution when handling the FSPR bit.
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_FAW_REG_VALUE  (0xFFFFFFFF)
-
-/* The ROM code protection register is a function to prohibit reading from or programming to the flash memory
-   when the flash programmer is used during off-board programming.
-   ROMCODE - ROM Code Protection Register
-       b31:b0  ROM Code - 0000 0000h: ROM code protection enabled (ROM code protection 1).
-                          0000 0001h: ROM code protection enabled (ROM code protection 2).
-                          Other than above: ROM code protection disabled.
-       Note: The ROMCODE register should be set in 32-bit units.
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_ROMCODE_REG_VALUE  (0xFFFFFFFF)
-
-/* Select the bank mode of dual-bank function of the code flash memory.
-   0 = Dual mode.
-   1 = Linear mode. (default)
-   NOTE: If the dual bank function has been incorporated in a device, select the bank mode in this macro.
-         Default setting of the bank mode is linear mode.
-         If the dual bank function has not been incorporated in a device, this macro should be 1.
-*/
-#define BSP_CFG_CODE_FLASH_BANK_MODE    (0)
-
-/* Select the startup bank of the program when dual bank function is in dual mode.
-   0 = The address range of bank 1 from FFE00000h to FFEFFFFFh and bank 0 from FFF00000h to FFFFFFFFh. (default)
-   1 = The address range of bank 1 from FFF00000h to FFFFFFFFh and bank 0 from FFE00000h to FFEFFFFFh.
-   NOTE: If the dual bank function has been incorporated in a device, select the start bank in this macro.
-         Default setting of the start bank is bank0.
-         If the dual bank function has not been incorporated in a device, this macro should be 0.
-*/
-#define BSP_CFG_CODE_FLASH_START_BANK   (0)
-
-/* This macro lets other modules no if a RTOS is being used.
-   0 = RTOS is not used.
-   1 = FreeRTOS is used.
-   2 = embOS is used.(This is not available.)
-   3 = MicroC_OS is used.(This is not available.)
-   4 = Renesas ITRON OS (RI600V4 or RI600PX) is used.
-   5 = Azure RTOS is used.(This is not available.)
-*/
-#define BSP_CFG_RTOS_USED               (1)
-
-/* This macro is used to select which Renesas ITRON OS.
-   0 = RI600V4 is used.
-   1 = RI600PX is used.
-*/
-#define BSP_CFG_RENESAS_RTOS_USED       (0)
-
-/* This macro is used to select which CMT channel used for system timer of RTOS.
- * The setting of this macro is only valid if the macro BSP_CFG_RTOS_USED is set to a value other than 0. */
-#if BSP_CFG_RTOS_USED != 0
-/* Setting value.
- * 0      = CMT channel 0 used for system timer of RTOS (recommended to be used for RTOS).
- * 1      = CMT channel 1 used for system timer of RTOS.
- * 2      = CMT channel 2 used for system timer of RTOS.
- * 3      = CMT channel 3 used for system timer of RTOS.
- * Others = Invalid.
- * NOTE: This is invalid when using Renesas RTOS with CCRX.
- */
-#define BSP_CFG_RTOS_SYSTEM_TIMER       (0)
-#endif
-
-/* By default modules will use global locks found in mcu_locks.c. If the user is using a RTOS and would rather use its
-   locking mechanisms then they can change this macro.
-   NOTE: If '1' is chosen for this macro then the user must also change the next macro 'BSP_CFG_USER_LOCKING_TYPE'.
-   0 = Use default locking (non-RTOS)
-   1 = Use user defined locking mechanism.
-*/
-#define BSP_CFG_USER_LOCKING_ENABLED    (0)
-
-/* If the user decides to use their own locking mechanism with FIT modules then they will need to redefine the typedef
-   that is used for the locks. If the user is using a RTOS then they would likely redefine the typedef to be 
-   a semaphore/mutex type of their RTOS. Use the macro below to set the type that will be used for the locks.
-   NOTE: If BSP_CFG_USER_LOCKING_ENABLED == 0 then this typedef is ignored.
-   NOTE: Do not surround the type with parentheses '(' ')'.
-*/
-#define BSP_CFG_USER_LOCKING_TYPE       bsp_lock_t
-
-/* If the user decides to use their own locking mechanism with FIT modules then they will need to define the functions
-   that will handle the locking and unlocking. These functions should be defined below.
-   If BSP_CFG_USER_LOCKING_ENABLED is != 0:
-   R_BSP_HardwareLock(mcu_lock_t hw_index) will call BSP_CFG_USER_LOCKING_HW_LOCK_FUNCTION(mcu_lock_t hw_index)
-   R_BSP_HardwareUnlock(mcu_lock_t hw_index) will call BSP_CFG_USER_LOCKING_HW_UNLOCK_FUNCTION(mcu_lock_t hw_index)
-       NOTE:With these functions the index into the array holding the global hardware locks is passed as the parameter.
-   R_BSP_SoftwareLock(BSP_CFG_USER_LOCKING_TYPE * plock) will call 
-   BSP_CFG_USER_LOCKING_SW_LOCK_FUNCTION(BSP_CFG_USER_LOCKING_TYPE * plock)
-   R_BSP_SoftwareUnlock(BSP_CFG_USER_LOCKING_TYPE * plock) will call 
-   BSP_CFG_USER_LOCKING_SW_UNLOCK_FUNCTION(BSP_CFG_USER_LOCKING_TYPE * plock)
-       NOTE:With these functions the actual address of the lock to use is passed as the parameter.
-   NOTE: These functions must return a boolean. If lock was obtained or released successfully then return true. Else, 
-         return false.
-   NOTE: If BSP_CFG_USER_LOCKING_ENABLED == 0 then this typedef is ignored.
-   NOTE: Do not surround the type with parentheses '(' ')'.
-*/
-#define BSP_CFG_USER_LOCKING_HW_LOCK_FUNCTION      my_hw_locking_function
-#define BSP_CFG_USER_LOCKING_HW_UNLOCK_FUNCTION    my_hw_unlocking_function
-#define BSP_CFG_USER_LOCKING_SW_LOCK_FUNCTION      my_sw_locking_function
-#define BSP_CFG_USER_LOCKING_SW_UNLOCK_FUNCTION    my_sw_unlocking_function
-
-/* If the user would like to determine if a warm start reset has occurred, then they may enable one or more of the
-   following callback definitions AND provide a call back function name for the respective callback
-   function (to be defined by the user). Setting BSP_CFG_USER_WARM_START_CALLBACK_PRE_INITC_ENABLED = 1 will result
-   in a callback to the user defined my_sw_warmstart_prec_function just prior to the initialization of the C
-   runtime environment by resetprg.
-   Setting BSP_CFG_USER_WARM_START_CALLBACK_POST_INITC_ENABLED = 1 will result in a callback to the user defined
-   my_sw_warmstart_postc_function just after the initialization of the C runtime environment by resetprg.
-*/
-#define BSP_CFG_USER_WARM_START_CALLBACK_PRE_INITC_ENABLED    (0)
-#define BSP_CFG_USER_WARM_START_PRE_C_FUNCTION     my_sw_warmstart_prec_function
-
-#define BSP_CFG_USER_WARM_START_CALLBACK_POST_INITC_ENABLED    (0)
-#define BSP_CFG_USER_WARM_START_POST_C_FUNCTION    my_sw_warmstart_postc_function
-
-/* By default FIT modules will check input parameters to be valid. This is helpful during development but some users
-   will want to disable this for production code. The reason for this would be to save execution time and code space.
-   This macro is a global setting for enabling or disabling parameter checking. Each FIT module will also have its
-   own local macro for this same purpose. By default the local macros will take the global value from here though
-   they can be overridden. Therefore, the local setting has priority over this global setting. Disabling parameter
-   checking should only used when inputs are known to be good and the increase in speed or decrease in code space is 
-   needed.
-   0 = Global setting for parameter checking is disabled.
-   1 = Global setting for parameter checking is enabled (Default).
-*/
-#define BSP_CFG_PARAM_CHECKING_ENABLE               (1)
-
-/* The extended bus master has five transfer sources: EDMAC, GLCDC-GRA1 (GLCDC graphics 1 data read), GLCDCGRA2 (GLCDC
-   graphics 2 data read), DRW2D-TX (DRW2D texture data read), and DRW2D-FB (DRW2D frame buffer data read write and
-   display list data read).
-   The default priority order in bsp is below
-   GLCDC-GRA1 > GLCDC-GRA2 > DRW2D-TX > DRW2D-FB > EDMAC.
-   Priority can be changed with this macro.
-
-   Extended Bus Master Priority setting
-   0 = GLCDC graphics 1 data read
-   1 = DRW2D texture data read
-   2 = DRW2D frame buffer data read write and display list data read
-   3 = GLCDC graphics 2 data read
-   4 = EDMAC
-
-   Note : This macro is only available for products with at least 1.5 Mbytes of code flash memory.
-          Settings other than above are prohibited.
-          Duplicate priority settings can not be made.
-*/
-#define BSP_CFG_EBMAPCR_1ST_PRIORITY                (0) /* Extended Bus Master 1st Priority Selection */
-#define BSP_CFG_EBMAPCR_2ND_PRIORITY                (3) /* Extended Bus Master 2nd Priority Selection */
-#define BSP_CFG_EBMAPCR_3RD_PRIORITY                (1) /* Extended Bus Master 3rd Priority Selection */
-#define BSP_CFG_EBMAPCR_4TH_PRIORITY                (2) /* Extended Bus Master 4th Priority Selection */
-#define BSP_CFG_EBMAPCR_5TH_PRIORITY                (4) /* Extended Bus Master 5th Priority Selection */
-
-/* This macro is used to define the voltage that is supplied to the MCU (Vcc). This macro is defined in millivolts. This
-   macro does not actually change anything on the MCU. Some FIT modules need this information so it is defined here. */
-#define BSP_CFG_MCU_VCC_MV                          (3300) /* Generated value. Do not edit this manually */
-
-/* Allow initialization of auto-generated peripheral initialization code by Smart Configurator tool.
-   When not using the Smart Configurator, set the value of BSP_CFG_CONFIGURATOR_SELECT to 0.
-   0 = Disabled (default)
-   1 = Smart Configurator initialization code used
-*/
-#define BSP_CFG_CONFIGURATOR_SELECT                 (1) /* Generated value. Do not edit this manually */
-
-/* Version number of Smart Configurator.
-   This macro definition is updated by Smart Configurator.
-*/
-#define BSP_CFG_CONFIGURATOR_VERSION                (2170) /* Generated value. Do not edit this manually */
-
-/* For some BSP functions, it is necessary to ensure that, while these functions are executing, interrupts from other 
-   FIT modules do not occur. By controlling the IPL, these functions disable interrupts that are at or below the 
-   specified interrupt priority level.
-   This macro sets the IPL. Range is 0x0 - 0xF.
-   Please set this macro more than IPR for other FIT module interrupts.
-   The default value is 0xF (maximum value).
-   Don't change if there is no special processing with higher priority than all fit modules.
-*/
-#define BSP_CFG_FIT_IPL_MAX                         (0xF)
-
-/* Software Interrupt (SWINT).
-   0 = Software interrupt is not used.
-   1 = Software interrupt is used.
-   NOTE: When this macro is set to 1, the software interrupt is initialized in bsp startup routine. 
-*/
-#define BSP_CFG_SWINT_UNIT1_ENABLE    (0)
-#define BSP_CFG_SWINT_UNIT2_ENABLE    (0)
-
-/* Software Interrupt Task Buffer Number.
-   For software interrupt, this value is number of buffering user tasks.
-   So user can increase this value if user system would have many software interrupt tasks
-   and user system has enough buffer. This value requires 9 byte per task.
-   NOTE: This setting is common to all units. It can not be set individually. 
-         The maximum value is 254.
-*/
-#define BSP_CFG_SWINT_TASK_BUFFER_NUMBER     (8)
-
-/* Initial value of the software interrupt priority.
-   For software interrupt, this value is interrupt priority. Range is 0x0 - 0xF.
-   NOTE: This setting is common to all units. It can not be set individually. 
-         Please be careful that this setting is the initial value of the interrupt priority register(IPR).
-         It is possible to dynamically change the IPR.
-*/
-#define BSP_CFG_SWINT_IPR_INITIAL_VALUE     (0x1)
-
-/* This macro is used for serial terminal on the board selected by smart configurator.
-   0 = SCI UART Terminal is disabled.
-   1 = SCI UART Terminal is enabled.
-*/
-#define BSP_CFG_SCI_UART_TERMINAL_ENABLE         (1)
-
-/* This macro is channel number for serial terminal.
-*/
-#define BSP_CFG_SCI_UART_TERMINAL_CHANNEL        (5)
-
-/* This macro is bit-rate for serial terminal.
-*/
-#define BSP_CFG_SCI_UART_TERMINAL_BITRATE        (115200)
-
-/* This macro is interrupt priority for serial terminal.
-   0(low) - 15(high)
-*/
-#define BSP_CFG_SCI_UART_TERMINAL_INTERRUPT_PRIORITY   (15)
-
-/* This macro is used for C++ project and updated by Smart Configurator.
-   0 = This project is a C project.(Not a C++ project).
-   1 = This project is a C++ project.
-*/
-#define BSP_CFG_CPLUSPLUS             (0) /* Generated value. Do not edit this manually */
-
-#endif /* R_BSP_CONFIG_REF_HEADER_FILE */
-
diff --git a/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_bsp_interrupt_config.h b/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_bsp_interrupt_config.h
deleted file mode 100644
index 39237823..00000000
--- a/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_bsp_interrupt_config.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer 
-*
-* Copyright (C) 2016 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name    : r_bsp_interrupt_config.h
-* Description  : This module maps Interrupt A & B interrupts. More information on how this is done is given below.
-***********************************************************************************************************************/
-/**********************************************************************************************************************
-* History : DD.MM.YYYY Version   Description
-*         : 01.10.2016 1.00      First Release
-*         : 15.05.2017 2.00      Changed the name of the following macro definition, because there was a mistake
-*                                in the name of macro definition.
-*                                - From XXX_TPU0_TGI0V to XXX_TPU0_TCI0V.
-*                                - From XXX_TPU1_TGI1V to XXX_TPU1_TCI1V.
-*                                - From XXX_TPU1_TGI1U to XXX_TPU1_TCI1U.
-*                                - From XXX_TPU2_TGI2V to XXX_TPU2_TCI2V.
-*                                - From XXX_TPU2_TGI2U to XXX_TPU2_TCI2U.
-*                                - From XXX_TPU3_TGI3V to XXX_TPU3_TCI3V.
-*                                - From XXX_TPU4_TGI4V to XXX_TPU4_TCI4V.
-*                                - From XXX_TPU4_TGI4U to XXX_TPU4_TCI4U.
-*                                - From XXX_TPU5_TGI5V to XXX_TPU5_TCI5V.
-*                                - From XXX_TPU5_TGI5U to XXX_TPU5_TCI5U.
-*                                - From XXX_MTU0_TGIV0 to XXX_MTU0_TCIV0.
-*                                - From XXX_MTU1_TGIV1 to XXX_MTU1_TCIV1.
-*                                - From XXX_MTU1_TGIU1 to XXX_MTU1_TCIU1.
-*                                - From XXX_MTU2_TGIV2 to XXX_MTU2_TCIV2.
-*                                - From XXX_MTU2_TGIU2 to XXX_MTU2_TCIU2.
-*                                - From XXX_MTU3_TGIV3 to XXX_MTU3_TCIV3.
-*                                - From XXX_MTU4_TGIV4 to XXX_MTU4_TCIV4.
-*                                - From XXX_MTU6_TGIV6 to XXX_MTU6_TCIV6.
-*                                - From XXX_MTU7_TGIV7 to XXX_MTU7_TCIV7.
-*                                - From XXX_MTU8_TGIV8 to XXX_MTU8_TCIV8.
-*                                Added select processing of the following software configurable interrupt source.
-*                                - TSIP_PROC_BUSY
-*                                - TSIP_ROMOK
-*                                - TSIP_LONG_PLG
-*                                - TSIP_TEST_BUSY
-*                                - TSIP_WRRDY0
-*                                - TSIP_WRRDY1
-*                                - TSIP_WRRDY4
-*                                - TSIP_RDRDY0
-*                                - TSIP_RDRDY1
-*                                - TSIP_INTEGRATE_WRRDY
-*                                - TSIP_INTEGRATE_RDRDY
-***********************************************************************************************************************/
-#ifndef R_BSP_INTERRUPT_CONFIG_REF_HEADER_FILE
-#define R_BSP_INTERRUPT_CONFIG_REF_HEADER_FILE
-
-/***********************************************************************************************************************
-Macro definitions
-***********************************************************************************************************************/
-
-/* If you wish to use one of the interrupt below then set the appropriate configuration macro to the vector number you
- * wish to use for that interrupt. For example, if you want to use the RTC carry interrupt (CUP) at vector 176 then you
- * would do the following:
- *
- * #define BSP_MAPPED_INT_CFG_B_VECT_RTC_CUP                                 176
- */
-
-/* Interrupt B Sources.
- * -Valid vector numbers are 128-207.
- * -There are more vector slots for B sources than actual B sources. By default all B sources are mapped.
- * -If using the 'TPU1, TGI1A' interrupt it must be vector 144 or 145. It is set to 144 by default.
- * -If a peripheral interrupt is going to be used to wake up the MCU from All-Module Clock Stop Mode then it must be
- *  in a vector between 146 to 157. Peripheral interrupts that can do this are TMR interrupts and the 'USB0, USBI0'
- *  interrupt. By default the TMR interrupts are chosen since there are 12 of them and there are 12 slots.
- */
-#define BSP_MAPPED_INT_CFG_B_VECT_CMT2_CMI2                               128
-#define BSP_MAPPED_INT_CFG_B_VECT_CMT3_CMI3                               129
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR0_CMIA0                              146
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR0_CMIB0                              147
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR0_OVI0                               148
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR1_CMIA1                              149
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR1_CMIB1                              150
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR1_OVI1                               151
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR2_CMIA2                              152
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR2_CMIB2                              153
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR2_OVI2                               154
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR3_CMIA3                              155
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR3_CMIB3                              156
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR3_OVI3                               157
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TGI0A                              130
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TGI0B                              131
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TGI0C                              132
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TGI0D                              133
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TCI0V                              134
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU1_TGI1A                              144
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU1_TGI1B                              135
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU1_TCI1V                              136
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU1_TCI1U                              137
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU2_TGI2A                              138
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU2_TGI2B                              139
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU2_TCI2V                              140
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU2_TCI2U                              141
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TGI3A                              142
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TGI3B                              143
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TGI3C                              145
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TGI3D                              158
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TCI3V                              159
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU4_TGI4A                              160
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU4_TGI4B                              161
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU4_TCI4V                              162
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU4_TCI4U                              163
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU5_TGI5A                              164
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU5_TGI5B                              165
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU5_TCI5V                              166
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU5_TCI5U                              167
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW0_IC0I0                             168
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW0_IC1I0                             169
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW0_OC0I0                             170
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW0_OC1I0                             171
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW1_IC0I1                             172
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW1_IC1I1                             173
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW1_OC0I1                             174
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW1_OC1I1                             175
-#define BSP_MAPPED_INT_CFG_B_VECT_RTC_CUP                                 176
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN0_RXF0                               177
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN0_TXF0                               178
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN0_RXM0                               179
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN0_TXM0                               180
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN1_RXF1                               181
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN1_TXF1                               182
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN1_RXM1                               183
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN1_TXM1                               184
-#define BSP_MAPPED_INT_CFG_B_VECT_USB0_USBI0                              185
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC0_S12ADI0                         186
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC0_S12GBADI0                       187
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC0_S12GCADI0                       188
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC1_S12ADI1                         189
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC1_S12GBADI1                       190
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC1_S12GCADI1                       191
-#define BSP_MAPPED_INT_CFG_B_VECT_RNG_RNGEND                              192
-#define BSP_MAPPED_INT_CFG_B_VECT_ELC_ELSR18I                             193
-#define BSP_MAPPED_INT_CFG_B_VECT_ELC_ELSR19I                             194
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_PROC_BUSY                          195
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_ROMOK                              196
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_LONG_PLG                           197
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_TEST_BUSY                          198
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_WRRDY0                             199
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_WRRDY1                             200
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_WRRDY4                             201
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_RDRDY0                             202
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_RDRDY1                             203
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_INTEGRATE_WRRDY                    204
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_INTEGRATE_RDRDY                    205
-
-/* Interrupt A Sources.
- * -Valid vector numbers are 208-255.
- * -There are more A sources than A vector slots. By default none of the GPT interrupts are mapped.
- * -If using the 'MTU1, TGI1A' interrupt it must be vector 208 or 209. It is set to 208 by default.
- */
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIA0                              209
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIB0                              210
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIC0                              211
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGID0                              212
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TCIV0                              213
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIE0                              214
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIF0                              215
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU1_TGIA1                              208
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU1_TGIB1                              216
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU1_TCIV1                              217
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU1_TCIU1                              218
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU2_TGIA2                              219
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU2_TGIB2                              220
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU2_TCIV2                              221
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU2_TCIU2                              222
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TGIA3                              223
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TGIB3                              224
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TGIC3                              225
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TGID3                              226
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TCIV3                              227
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TGIA4                              228
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TGIB4                              229
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TGIC4                              230
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TGID4                              231
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TCIV4                              232
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU5_TGIU5                              233
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU5_TGIV5                              234
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU5_TGIW5                              235
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TGIA6                              236
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TGIB6                              237
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TGIC6                              238
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TGID6                              239
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TCIV6                              240
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TGIA7                              241
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TGIB7                              242
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TGIC7                              243
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TGID7                              244
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TCIV7                              245
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TGIA8                              246
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TGIB8                              247
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TGIC8                              248
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TGID8                              249
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TCIV8                              250
-#define BSP_MAPPED_INT_CFG_A_VECT_AES_AESRDY                              251
-#define BSP_MAPPED_INT_CFG_A_VECT_AES_AESEND                              252
-
-#endif /* R_BSP_INTERRUPT_CONFIG_REF_HEADER_FILE */
-
diff --git a/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_byteq_config.h b/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_byteq_config.h
deleted file mode 100644
index 7c0e15a9..00000000
--- a/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_byteq_config.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer 
-*
-* Copyright (C) 2013 Renesas Electronics Corporation. All rights reserved.    
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name     : r_byteq_config.h
-* Description   : Configures the byte queue memory allocation
-************************************************************************************************************************
-* History : DD.MM.YYYY Version Description  
-*         : 24.07.2013 1.00     Initial Release
-*         : 11.21.2014 1.20     Removed dependency to BSP
-*         : 30.09.2015 1.50     Added dependency to BSP
-*         : 01.06.2018 1.70     Changed the default value of the following macro definition.
-*                                - BYTEQ_CFG_MAX_CTRL_BLKS - Changed the default value from 4 to 32.
-*         : 31.03.2021 1.90     Updated for queue protection.
-*         : 29.10.2021 2.00     Updated for critical section protection.
-***********************************************************************************************************************/
-#ifndef BYTEQ_CONFIG_H
-#define BYTEQ_CONFIG_H
-
-/***********************************************************************************************************************
-Includes   <System Includes> , "Project Includes"
-***********************************************************************************************************************/
-#include "platform.h"
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-
-/* SPECIFY WHETHER TO INCLUDE CODE FOR API PARAMETER CHECKING
-   Available settings:
-   BSP_CFG_PARAM_CHECKING_ENABLE:
-       Utilizes the system default setting
-   1:
-       Includes parameter checking
-   0:
-       Compiles out parameter checking
-*/
-#define BYTEQ_CFG_PARAM_CHECKING_ENABLE     (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-/* SPECIFY IF SHOULD USE MALLOC() TO ALLOCATE MEMORY FOR QUEUE CONTROL BLOCKS */
-#define BYTEQ_CFG_USE_HEAP_FOR_CTRL_BLKS    (0)
-
-/* SPECIFY NUMBER OF STATIC QUEUE CONTROL BLOCKS TO SUPPORT */
-/* valid only when BYTEQ_USE_HEAP_FOR_CTRL_BLKS is set to 0 */
-#define BYTEQ_CFG_MAX_CTRL_BLKS             (32)
-
-/* Selects to use disable interrupt to protect queue. */
-#define BYTEQ_CFG_PROTECT_QUEUE             (0)
-
-/* Selects to use disable interrupt to protect critical section. */
-#define BYTEQ_CFG_CRITICAL_SECTION          (0)
-
-#endif /* BYTEQ_CONFIG_H */
diff --git a/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_cellular_config.h b/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_cellular_config.h
deleted file mode 100644
index 00b1622f..00000000
--- a/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_cellular_config.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* Generated configuration header file - do not edit */
-/**********************************************************************************************************************
- * DISCLAIMER
- * This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
- * other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
- * applicable laws, including copyright laws.
- * THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
- * THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
- * EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
- * SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO
- * THIS SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
- * this software. By using this software, you agree to the additional terms and conditions found by accessing the
- * following link:
- * http://www.renesas.com/disclaimer
- *
- * Copyright (C) 2023 Renesas Electronics Corporation. All rights reserved.
- *********************************************************************************************************************/
-/**********************************************************************************************************************
- * File Name    : r_cellular_config.h
- * Description  : Configures the driver.
- *********************************************************************************************************************/
-
-#ifndef CELLULAR_CONFIG_H
-#define CELLULAR_CONFIG_H
-
-/**********************************************************************************************************************
- * Includes   <System Includes> , "Project Includes"
- *********************************************************************************************************************/
-#include "platform.h"
-
-/***********************************************************************************************************************
- * Configuration Options
- **********************************************************************************************************************/
-#define CELLULAR_CFG_AP_NAME        ibasis.iot      /* Access point name */
-#define CELLULAR_CFG_AP_USERID          /* Login ID */
-#define CELLULAR_CFG_AP_PASSWORD      /* Access point password */
-#define CELLULAR_CFG_PIN_CODE                /* SIM card PIN code */
-#define CELLULAR_CFG_AUTH_TYPE      (2)          /* Authentication protocol type (0=None,1=PAP,2=CHAP)*/
-
-#define CELLULAR_CFG_NETWORK_NOTIFY_LEVEL   (2)         /* Network status notification level */
-#define CELLULAR_CFG_ATC_RETRY_CGATT        (600)       /* Connection retry limit */
-#define CELLULAR_CFG_EX_TIMEOUT             (0)         /* Exchange timeout (1sec,0~65535,0=no_limit) */
-#define CELLULAR_CFG_SCI_PRIORITY           (4)         /* SCI interrupt priority */
-#define CELLULAR_CFG_SEMAPHORE_BLOCK_TIME   (15000)     /* Maximum semaphore acquisition latency(msec) */
-#define CELLULAR_CFG_PSM_PREPARATION_TIME   (100)       /* Reception guard time before the module transitions to PSM(1msec,100~10000) */
-#define CELLULAR_CFG_PSM_WAKEUP_LATENCY     (5000)      /* Maximum authorized wake-up latency(1msec,0~10000) */
-#define CELLULAR_CFG_RING_LINE_ACTIVE_TIME  (1000)      /* RING line active duration(1msec,1000~5000)*/
-#define CELLULAR_CFG_UPGRADE_TIME           (60)        /* Maximum FW update latency(min) */
-
-#define CELLULAR_CFG_URC_CHARGET_ENABLED    (0)         /* Whether the callback function is invoked when a URC is received(0: No, 1: Yes)*/
-#define CELLULAR_CFG_URC_CHARGET_FUNCTION   my_sw_urc_charget_function  /* Name of the callback function to be invoked during ringline operation.*/
-
-#define CELLULAR_CFG_DEBUGLOG               (4) /* 0: OFF, 1: ERROR, 2: +WARN, 3: +INFO, 4: +DEBUG(AT command data) */
-                                                /* This macro can be used with FreeRTOS logging task. https://www.freertos.org/logging.html */
-
-#define CELLULAR_CFG_RESET_SIGNAL_LOGIC     (1) /* 1: active high (in this case when user would use PMOD RYZ014A) 0: active low */
-#if CELLULAR_CFG_RESET_SIGNAL_LOGIC == 1
-#define CELLULAR_CFG_RESET_SIGNAL_ON        (1)
-#define CELLULAR_CFG_RESET_SIGNAL_OFF       (0)
-#else
-#define CELLULAR_CFG_RESET_SIGNAL_ON        (0)
-#define CELLULAR_CFG_RESET_SIGNAL_OFF       (1)
-#endif
-
-/* These default value is for using RX65N Cloud Kit PMOD to control PMOD-RYZ014A */
-#define CELLULAR_CFG_UART_SCI_CH            (6)
-
-#define CELLULAR_CFG_CTS_SW_CTRL            (0)
-#define CELLULAR_CFG_CTS_PORT               2
-#define CELLULAR_CFG_CTS_PIN                2
-#define CELLULAR_CFG_PFS_SET_VALUE          0x0BU
-
-#define CELLULAR_CFG_RTS_PORT               0
-#define CELLULAR_CFG_RTS_PIN                2
-
-#define CELLULAR_CFG_RESET_PORT             5
-#define CELLULAR_CFG_RESET_PIN              5
-
-#define CELLULAR_CFG_IRQ_NUM                (4)
-
-/* Board dependent settings; please use the value for each setting listed below depending on the board you use.
-
-Preprocessors that define board dependent settings and the corresponding values to be set are as follows:
-Confirmed board number              1  2  3  4  5  6,
-CELLULAR_CFG_UART_SCI_CH            0  2  6  5  6  5,
-CELLULAR_CFG_RTS_PORT               2  5  0  C  0  C,
-CELLULAR_CFG_RTS_PIN                2  1  2  1  2  1,
-CELLULAR_CFG_RESET_PORT             D  5  F  B  5  B,
-CELLULAR_CFG_RESET_PIN              0  5  5  1  5  1,
-CELLULAR_CFG_IRQ_NUM                4 13  5 12  5 12,
-where the confirmed board numbers listed in the first row above are as follows:
-1: RX65N Cloud Kit (PMOD(CN5)),
-2: RX65N Envision Kit (PMOD(CN14)),
-3: RX65N RSK (2MB)(PMOD1),
-4: RX671 Target Board (PMOD(CN1)), *note1.
-5: Cloud Kit for RX65N, CK-RX65N v1 (PMOD1),
-6: RX66N Target Board (PMOD(CN1)), *note3.
-In the above preprocessor list, please use one of the values listed on the right side.
-On the right side, each column corresponds to each confirmed board number.
-
-Note1:
-When you use RX671 Target Board, you need pattern cut and so on to use SCI channel 5(TXD5/RXD5/CTS5) and GPIO(PC1). 
-Please refer to User's Manual: https://www.renesas.com/products/microcontrollers-microprocessors/rx-32-bit-performance-efficiency-mcus/rtk5rx6710c00000bj-target-board-rx671
-
-Note2:
-Please supply power source to USB(CN4) port on RYZ014A-PMOD.
-E2 emulator supplying power to RYZ014A-PMOD may result in insufficient power source.
-The E2 emulator can provide 200mA, but RYZ014A needs more current while connecting to the network.
-
-Note3:
-When you use RX66N Target Board, you need remodeling of the board to use SCI channel 5(TXD5/RXD5/CTS5) and GPIO(PC1). 
-Please refer to User's Manual: https://www.renesas.com/products/microcontrollers-microprocessors/rx-32-bit-performance-efficiency-mcus/rtk5rx66n0c00000bj-target-board-rx66n
-
-*/
-
-#endif /* CELLULAR_CONFIG_H */
diff --git a/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_flash_rx_config.h b/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_flash_rx_config.h
deleted file mode 100644
index ef1be384..00000000
--- a/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_flash_rx_config.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
- * DISCLAIMER
- * This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
- * other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
- * applicable laws, including copyright laws.
- * THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
- * THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
- * EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
- * SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS
- * SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
- * this software. By using this software, you agree to the additional terms and conditions found by accessing the
- * following link:
- * http://www.renesas.com/disclaimer
- *
- * Copyright (C) 2014-2019 Renesas Electronics Corporation. All rights reserved.
- ***********************************************************************************************************************/
-/***********************************************************************************************************************
- * File Name    : r_flash_rx_config_reference.h
- * Description  : Configures the FLASH API module for RX200 and RX600 Series MCU's.
- ***********************************************************************************************************************/
-/***********************************************************************************************************************
-* History : DD.MM.YYYY Version Description
-*           12.04.2014 1.00    First Release
-*           22.12.2014 1.10    Added flash type usage comments.
-*           25.06.2015 1.20    Added FLASH_CFG_CODE_FLASH_RUN_FROM_ROM.
-*         : 12.10.2016 2.00    Modified for BSPless operation (added FLASH_CFG_USE_FIT_BSP).
-*         : 19.04.2019 4.00    Removed BSPless operation (FLASH_CFG_USE_FIT_BSP).
-*                              Removed flash type 2 only operation (FLASH_CFG_FLASH_READY_IPL).
-*                              Removed flash type 2 only operation (FLASH_CFG_IGNORE_LOCK_BITS).
-*         : 19.07.2019 4.20    Modified comments (FLASH_CFG_CODE_FLASH_ENABLE, FLASH_CFG_CODE_FLASH_RUN_FROM_ROM).
-*         : 09.09.2019 4.30    Modified comments (FLASH_CFG_CODE_FLASH_ENABLE, FLASH_CFG_CODE_FLASH_RUN_FROM_ROM).
-***********************************************************************************************************************/
-#ifndef FLASH_CONFIG_HEADER_FILE
-#define FLASH_CONFIG_HEADER_FILE
-
-/***********************************************************************************************************************
- Configuration Options
- ***********************************************************************************************************************/
-/* SPECIFY WHETHER TO INCLUDE CODE FOR API PARAMETER CHECKING
- * Setting to BSP_CFG_PARAM_CHECKING_ENABLE utilizes the system default setting
- * Setting to 1 includes parameter checking; 0 compiles out parameter checking
- */
-#define FLASH_CFG_PARAM_CHECKING_ENABLE     (1)
-
-
-/******************************************************************************
- ENABLE CODE FLASH PROGRAMMING
-******************************************************************************/
-/* If you are only using data flash, set this to 0.
- * Setting to 1 includes code to program the ROM area. When programming ROM,
- * code must be executed from RAM, except under certain restrictions for flash
- * type 3 (see section 2.16 in App Note). See section 2.15 in the App Note for
- * details on how to set up code and the linker to execute code from RAM.
- */
-#define FLASH_CFG_CODE_FLASH_ENABLE (1)
-
-
-/******************************************************************************
- ENABLE BGO/NON-BLOCKING DATA FLASH OPERATIONS
-******************************************************************************/
-/* Setting this to 0 forces data flash API function to block until completed.
- * Setting to 1 places the module in BGO (background operations) mode. In BGO 
- * mode, data flash operations return immediately after the operation has been 
- * started. Notification of the operation completion is done via the callback 
- * function. 
- */
-#define FLASH_CFG_DATA_FLASH_BGO   (1)
-
-
-/******************************************************************************
- ENABLE BGO/NON-BLOCKING CODE FLASH (ROM) OPERATIONS
-******************************************************************************/
-/* Setting this to 0 forces ROM API function to block until completed.
- * Setting to 1 places the module in BGO (background operations) mode. In BGO 
- * mode, ROM operations return immediately after the operation has been started.
- * Notification of the operation completion is done via the callback function. 
- * When reprogramming ROM, THE RELOCATABLE VECTOR TABLE AND CORRESPONDING
- * INTERRUPT ROUTINES MUST BE IN RAM.  
- * See sections 2.17 Usage Notes in the App Note.
- */
-#define FLASH_CFG_CODE_FLASH_BGO   (1)
-
-
-/******************************************************************************
- ENABLE CODE FLASH SELF-PROGRAMMING
-******************************************************************************/
-/* Set this to 0 when programming code flash while executing in RAM.
- * Set this to 1 when programming code flash while executing from another
- * segment in ROM (possible only with RX64M, RX71M, RX65N-2, RX72M groups).
- * See section 2.16 in the App Note.
- */
-#define FLASH_CFG_CODE_FLASH_RUN_FROM_ROM   (1)
-
-
-#endif /* FLASH_CONFIG_HEADER_FILE */
diff --git a/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_irq_rx_config.h b/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_irq_rx_config.h
deleted file mode 100644
index 3fd5e871..00000000
--- a/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_irq_rx_config.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
-* applicable laws, including copyright laws.
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the
-* following link:
-* http://www.renesas.com/disclaimer
-*
-* Copyright (C) 2013-2018 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name    : r_irq_rx_config.h
-* Device(s)    : Renesas RX Family
-* Tool-Chain   : Renesas RX Standard Toolchain
-* H/W Platform :
-* Description  : User configurable options and setup definitions for the RX IRQ support module.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* History : DD.MM.YYYY  Version Description
-*         : 15.07.2013  1.00    First Release
-*         : 04.04.2014  1.20    Using the definition of VECT_ICU_IRQ15 to check the number of IRQs.
-*         : 30.09.2015  1.70    Using the definition of VECT_ICU_IRQ7  to check the number of IRQs.
-*         : 28.09.2018  2.30    Updated the coding rules of Renesas.
-***********************************************************************************************************************/
-#ifndef IRQ_CONFIG_H
-#define IRQ_CONFIG_H
-/***********************************************************************************************************************
-Includes   <System Includes> , "Project Includes"
-***********************************************************************************************************************/
-#include "platform.h"
-#include "r_irq_rx_if.h"
-
-/***********************************************************************************************************************
-Macro definitions
-***********************************************************************************************************************/
-
-/* Set this value to 1 to enable locking functions for the IRQ APIs, otherwise set to 0 to ignore locking.
- * If locking is enabled, the application must obtain a lock on the selected IRQ before making calls to the API
- * for that IRQ. If locking is disabled, any caller has unrestricted access to any IRQ function. Disabling is
- * provided for systems that require faster and smaller code, however care must be taken to prevent reentrancy or
- * conflict over resource usage.
- */
-#define IRQ_CFG_REQUIRE_LOCK    (1)
-
-/* Checking of arguments passed to IRQ API functions can be enable or disabled.
- * Disabling argument checking is provided for systems that absolutely require faster and smaller code.
- * By default the module is configured to use the setting of the system-wide BSP_CFG_PARAM_CHECKING_ENABLE macro.
- * This can be overridden for the local module by redefining IRQ_CFG_PARAM_CHECKING.
- * To control parameter checking locally, set IRQ_CFG_PARAM_CHECKING to 1 to enable it, otherwise set to 0 skip checking.
- *
- * Use this option with caution.
- */
-
-#define IRQ_CFG_PARAM_CHECKING  (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-
-/* *********************************************************************************************************************
- * IRQ enabling and port assignments
- *
- * If you are using Smart Configurator for pin assignment, use the following:
- *   #include "r_irq_rx_pinset.h"
- *   #ifndef R_IRQ_RX_PINSET_H
- *   #error "Please check IRQ port assignments in Smart Configurator"
- *   #endif
- * and comment out the following:
- *   #define IRQ_PORT_IRQ0_PORT     ('m') 
- *   #define IRQ_PORT_IRQ0_BIT      ('n')
- *          ...
- *   #define IRQ_PORT_IRQ15_PORT     ('m') 
- *   #define IRQ_PORT_IRQ15_BIT      ('n')
- * --------------------------------------------------------------------------------------------
- * Conversely, if you are using FIT Configurator for pin assignment, comment out the following:
- *   #include "r_irq_rx_pinset.h"
- *   #ifndef R_IRQ_RX_PINSET_H
- *   #error "Please check IRQ port assignments in Smart Configurator"
- *   #endif
- * and use the following:
- *   #define IRQ_PORT_IRQ0_PORT     ('m') 
- *   #define IRQ_PORT_IRQ0_BIT      ('n')
- *          ...
- *   #define IRQ_PORT_IRQ15_PORT     ('m') 
- *   #define IRQ_PORT_IRQ15_BIT      ('n')
- * Use these defines to select IRQs that are to be used in your system.
- * This will eliminate the generation of code for unused IRQs.
- *
- * IRQs intended for use must have an I/O port and bit assigned. Use these definitions to make the assignments.
- * These are decoded by the API to map to the port input data registers.
- * Set these as required according to the following format:
- * #define IRQ_PORT_IRQ0_PORT     ('m') where m is the port number and the IRQ number replaces *
- * ##define IRQ_PORT_IRQ0_BIT     ('n') where n is the bit number and the IRQ number replaces *
- * Port assignments here must match the port configuration settings performed externally for them.
-***********************************************************************************************************************/
-#include "r_irq_rx_pinset.h"
-#ifndef R_IRQ_RX_H
-#error "Please add IRQ Pin setting in Smart Configurator, or if you are using FIT Configurator remove the comment of following macros"
-#endif
-/*
-#define IRQ_PORT_IRQ0_PORT      ('m')
-#define IRQ_PORT_IRQ0_BIT       ('n')
-
-#define IRQ_PORT_IRQ1_PORT      ('m')
-#define IRQ_PORT_IRQ1_BIT       ('n')
-
-#define IRQ_PORT_IRQ2_PORT      ('m')
-#define IRQ_PORT_IRQ2_BIT       ('n')
-
-#define IRQ_PORT_IRQ3_PORT      ('m')
-#define IRQ_PORT_IRQ3_BIT       ('n')
-
-#define IRQ_PORT_IRQ4_PORT      ('m')
-#define IRQ_PORT_IRQ4_BIT       ('n')
-
-#define IRQ_PORT_IRQ5_PORT      ('m')
-#define IRQ_PORT_IRQ5_BIT       ('n')
-
-#if defined(VECT_ICU_IRQ7)               // For MCUs with 8 IRQs
-#define IRQ_PORT_IRQ6_PORT      ('m')
-#define IRQ_PORT_IRQ6_BIT       ('n')
-
-#define IRQ_PORT_IRQ7_PORT      ('m')
-#define IRQ_PORT_IRQ7_BIT       ('n')
-#endif // #if defined(VECT_ICU_IRQ7)
-
-#if defined(VECT_ICU_IRQ15)              // For MCUs with 16 IRQs
-#define IRQ_PORT_IRQ8_PORT      ('m')
-#define IRQ_PORT_IRQ8_BIT       ('n')
-
-#define IRQ_PORT_IRQ9_PORT      ('m')
-#define IRQ_PORT_IRQ9_BIT       ('n')
-
-#define IRQ_PORT_IRQ10_PORT     ('m')
-#define IRQ_PORT_IRQ10_BIT      ('n')
-
-#define IRQ_PORT_IRQ11_PORT     ('m')
-#define IRQ_PORT_IRQ11_BIT      ('n')
-
-#define IRQ_PORT_IRQ12_PORT     ('m')
-#define IRQ_PORT_IRQ12_BIT      ('n')
-
-#define IRQ_PORT_IRQ13_PORT     ('m')
-#define IRQ_PORT_IRQ13_BIT      ('n')
-
-#define IRQ_PORT_IRQ14_PORT     ('m')
-#define IRQ_PORT_IRQ14_BIT      ('n')
-
-#define IRQ_PORT_IRQ15_PORT     ('m')
-#define IRQ_PORT_IRQ15_BIT      ('n')
-#endif // #if defined(VECT_ICU_IRQ15)
-*/
-
-/***********************************************************************************************************************
-Digital Filtering
-***********************************************************************************************************************/
-/* To enable digital noise filtering with the selected IRQ.
- * Set the value to 1 to enable the filter or 0 to disable it. */
-#define IRQ_CFG_FILT_EN_IRQ0       (0)   /* Filtering disabled on IRQ 0. */
-#define IRQ_CFG_FILT_EN_IRQ1       (0)   /* Filtering disabled on IRQ 1. */
-#define IRQ_CFG_FILT_EN_IRQ2       (0)   /* Filtering disabled on IRQ 2. */
-#define IRQ_CFG_FILT_EN_IRQ3       (0)   /* Filtering disabled on IRQ 3. */
-#define IRQ_CFG_FILT_EN_IRQ4       (0)   /* Filtering disabled on IRQ 4. */
-#define IRQ_CFG_FILT_EN_IRQ5       (0)   /* Filtering disabled on IRQ 5. */
-#define IRQ_CFG_FILT_EN_IRQ6       (0)   /* Filtering disabled on IRQ 6. */
-#define IRQ_CFG_FILT_EN_IRQ7       (0)   /* Filtering disabled on IRQ 7. */
-#define IRQ_CFG_FILT_EN_IRQ8       (0)   /* Filtering disabled on IRQ 8. */
-#define IRQ_CFG_FILT_EN_IRQ9       (0)   /* Filtering disabled on IRQ 9. */
-#define IRQ_CFG_FILT_EN_IRQ10      (0)   /* Filtering disabled on IRQ 10. */
-#define IRQ_CFG_FILT_EN_IRQ11      (0)   /* Filtering disabled on IRQ 11. */
-#define IRQ_CFG_FILT_EN_IRQ12      (0)   /* Filtering disabled on IRQ 12. */
-#define IRQ_CFG_FILT_EN_IRQ13      (0)   /* Filtering disabled on IRQ 13. */
-#define IRQ_CFG_FILT_EN_IRQ14      (0)   /* Filtering disabled on IRQ 14. */
-#define IRQ_CFG_FILT_EN_IRQ15      (0)   /* Filtering disabled on IRQ 15. */
-
-/* Example settings for IRQ input pin digital filtering sample clock divisors for each IRQ.
- * Change as required by selecting a divisor value from the IRQ_CFG_PCLK_DIVxx definitions.
- * Filtering must be enabled for the corresponding IRQ for these settings to be effective.  */
-#define IRQ_CFG_FILT_PLCK_IRQ0    (IRQ_CFG_PCLK_DIV64)  /* Filter sample clock divisor for IRQ 0 = PCLK/64. */
-#define IRQ_CFG_FILT_PLCK_IRQ1    (IRQ_CFG_PCLK_DIV64)  /* Filter sample clock divisor for IRQ 1 = PCLK/64. */
-#define IRQ_CFG_FILT_PLCK_IRQ2    (IRQ_CFG_PCLK_DIV64)  /* Filter sample clock divisor for IRQ 2 = PCLK/64. */
-#define IRQ_CFG_FILT_PLCK_IRQ3    (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 3 = PCLK. */
-#define IRQ_CFG_FILT_PLCK_IRQ4    (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 4 = PCLK. */
-#define IRQ_CFG_FILT_PLCK_IRQ5    (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 5 = PCLK. */
-#define IRQ_CFG_FILT_PLCK_IRQ6    (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 6 = PCLK. */
-#define IRQ_CFG_FILT_PLCK_IRQ7    (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 7 = PCLK. */
-#define IRQ_CFG_FILT_PLCK_IRQ8    (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 8 = PCLK. */
-#define IRQ_CFG_FILT_PLCK_IRQ9    (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 9 = PCLK. */
-#define IRQ_CFG_FILT_PLCK_IRQ10   (IRQ_CFG_PCLK_DIV64)  /* Filter sample clock divisor for IRQ 10 = PCLK/64. */
-#define IRQ_CFG_FILT_PLCK_IRQ11   (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 11 = PCLK. */
-#define IRQ_CFG_FILT_PLCK_IRQ12   (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 12 = PCLK. */
-#define IRQ_CFG_FILT_PLCK_IRQ13   (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 13 = PCLK. */
-#define IRQ_CFG_FILT_PLCK_IRQ14   (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 14 = PCLK. */
-#define IRQ_CFG_FILT_PLCK_IRQ15   (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 15 = PCLK. */
-
-/***********************************************************************************************************************
-Typedef definitions
-***********************************************************************************************************************/
-
-      
-#endif /* IRQ_CONFIG_H */
diff --git a/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_s12ad_rx_config.h b/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_s12ad_rx_config.h
deleted file mode 100644
index 3b94f537..00000000
--- a/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_s12ad_rx_config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer 
-*
-* Copyright (C) 2013 Renesas Electronics Corporation. All rights reserved.    
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name     : r_s12ad_rx_config.h
-* Description   : Configures the 12-bit A/D driver
-************************************************************************************************************************
-* History : DD.MM.YYYY Version Description
-*           22.07.2013 1.00    Initial Release.
-*           21.04.2014 1.20    Updated for RX210 advanced features; RX110/63x support.
-*           05.04.2019 4.00    Deleted the macro definition of ADC_CFG_PGA_GAIN.
-***********************************************************************************************************************/
-#ifndef S12AD_CONFIG_H
-#define S12AD_CONFIG_H
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-
-/*
- * SPECIFY WHETHER TO INCLUDE CODE FOR API PARAMETER CHECKING
- * Setting to BSP_CFG_PARAM_CHECKING_ENABLE utilizes the system default setting.
- * Setting to 1 includes parameter checking; 0 compiles out parameter checking.
- */
-#define ADC_CFG_PARAM_CHECKING_ENABLE   BSP_CFG_PARAM_CHECKING_ENABLE
-
-#endif /* S12AD_CONFIG_H */
diff --git a/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_sci_rx_config.h b/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_sci_rx_config.h
deleted file mode 100644
index d2dd3363..00000000
--- a/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_sci_rx_config.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer 
-*
-* Copyright (C) 2013-2022 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name     : r_sci_rx_config.h
-* Description   : Configures the SCI driver
-************************************************************************************************************************
-* History : DD.MM.YYYY Version Description
-*           25.09.2013 1.00    Initial Release
-*           17.04.2014 1.20    Added comments for new RX110 support.
-*           02.07.2014 1.30    Fixed bug that caused Group12 rx errors to only be enabled for channel 2.
-*           25.11.2014 1.40    Added comments for RX113 support
-*           30.09.2015 1.70    Added comments for RX23T support
-*           01.10.2016 1.80    Added support for RX65N (comments and TX/RX FIFO THRESHOLD options)
-*           19.12.2016 1.90    Added comments for RX24U support
-*           07.03.2017 2.00    Added comments for RX130-512KB support
-*           28.09.2018 2.10    Added comments for RX66T support
-*           01.02.2019 2.20    Added comments for RX72T, RX65N-64pin support
-*                              Added support received data match function for RX65N
-*           28.06.2019 3.10    Added comments for RX23W support
-*           15.08.2019 3.20    Added support received data match function for RX72M (SCI0- SCI11)
-*                              Added support FIFO mode for RX72M (SCI7 - SCI11)
-*           25.11.2019 3.30    Added support RX13T.
-*                              Removed support for Generation 1 devices.
-*           30.12.2019 3.40    Added support RX66N, RX72N.
-*           31.03.2020 3.50    Added support RX23E-A.
-*           25.08.2020 3.60    Added feature using DTC/DMAC in SCI transfer.
-*                              Merged IrDA functionality to SCI FIT.
-*           31.03.2021 3.80    Added support for RX671.
-*                              Added support circular buffer in mode asynchronous.
-*           15.04.2021 3.90    Added support for RX140.
-*           31.03.2022 4.40    Added support for RX660.
-***********************************************************************************************************************/
-#ifndef SCI_CONFIG_H
-#define SCI_CONFIG_H
-
-#include "platform.h"
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-
-/* SPECIFY WHETHER TO INCLUDE CODE FOR API PARAMETER CHECKING */
-/* Setting to BSP_CFG_PARAM_CHECKING_ENABLE utilizes the system default setting */
-/* Setting to 1 includes parameter checking; 0 compiles out parameter checking */
-#define SCI_CFG_PARAM_CHECKING_ENABLE   (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-/* SPECIFY WHETHER TO INCLUDE CODE FOR DIFFERENT SCI MODES */
-/* Setting an equate to 1 includes code specific to that mode. */
-#define SCI_CFG_ASYNC_INCLUDED  (1)
-#define SCI_CFG_SYNC_INCLUDED   (0)
-#define SCI_CFG_SSPI_INCLUDED   (0)
-#define SCI_CFG_IRDA_INCLUDED   (0)
-
-/* Use circular buffer in mode asynchronous */
-/* 1=Use , 0=Unused */
-/* When SCI_CFG_USE_CIRCULAR is 1, please set BSP_CFG_RUN_IN_USER_MODE = 0  and BYTEQ_CFG_PROTECT_QUEUE = 1*/
-#define SCI_CFG_USE_CIRCULAR_BUFFER (0)
-
-/* SPECIFY BYTE VALUE TO TRANSMIT WHILE CLOCKING IN DATA IN SSPI MODES */
-#define SCI_CFG_DUMMY_TX_BYTE   (0xFF)
-
-/* SPECIFY CHANNELS TO INCLUDE SOFTWARE SUPPORT FOR 1=included, 0=not */
-/*
- * NOTE: If using ASYNC mode, adjust BYTEQ_CFG_MAX_CTRL_BLKS in r_byteq_config.h
- * to provide 2 queues per channel (static mode only).
- * * = port connector RSKRX11x
- * u = channel used by the USB-UART port (G1CUSB0)
- * a = this channel is used only for RX130-512KB
- * n = this channel is not available for RX65N-64pin.
- * s = this channel is not available in simple SPI mode.
- * i = this channel is available in IrDA interface.
- * RX MCU supported channels
- *
- * CH#  110 111 113 130 140 230  231  23T 24T 24U 64M 71M 65N 66T 72T 23W 72M 13T 72N 66N 23E-A 671 660
- * ---  --- --- --- --- --- --- ----- --- --- --- --- --- --- --- --- --- --- --- --- --- ----- --- ---
- * CH0           X   Xa      X    X                X   X   Xn              X       X   X          X   X
- * CH1   X   X*  X*  Xu   X  X    X    Xu  Xu  Xu  X   X   Xs  X   X   X   X   X   X   X    Xu    X   X
- * CH2           X                                 X   X   Xu              X       X   X          X   X
- * CH3                                             X   X   Xs              X       X   X          X   X
- * CH4                                             X   X   Xn              X       X   X          X   X
- * CH5   X   X   Xi  X    X  Xi   Xu,i X   X   X   X   X   X   X   X   Xi  X   X   X   X    X     X   X
- * CH6           X   X    X  X    X        X   X   X   X   Xn  X   X       Xu      X   X    X     X   X
- * CH7                                             Xu  Xu  Xn              X       X   X          X   X
- * CH8           X   Xa   X  X    X            X           X   X   X   Xu  X       X   X          X   X
- * CH9           X   Xa   X  X    X            X           Xs  X   X       X       X   X          X   X
- * CH10                                                    X               X       X   X          X   X
- * CH11                                        X           Xs  X   X       X       X   X          X   X
- * CH12  X   X   X   X    X  X    X                X   X   Xs  X   X   X   X   X   X   X    X     X   X
-*/
-                                   
-#define SCI_CFG_CH0_INCLUDED    (0)
-#define SCI_CFG_CH1_INCLUDED    (0)
-#define SCI_CFG_CH2_INCLUDED    (0)
-#define SCI_CFG_CH3_INCLUDED    (0)
-#define SCI_CFG_CH4_INCLUDED    (0)
-#define SCI_CFG_CH5_INCLUDED    (1)
-#define SCI_CFG_CH6_INCLUDED    (1)
-#define SCI_CFG_CH7_INCLUDED    (0)
-#define SCI_CFG_CH8_INCLUDED    (0)
-#define SCI_CFG_CH9_INCLUDED    (0)
-#define SCI_CFG_CH10_INCLUDED   (0)
-#define SCI_CFG_CH11_INCLUDED   (0)
-#define SCI_CFG_CH12_INCLUDED   (0)
-
-/* SPECIFY ASYNC MODE TX QUEUE BUFFER SIZES (will not allocate if chan not enabled */
-#define SCI_CFG_CH0_TX_BUFSIZ   (80)
-#define SCI_CFG_CH1_TX_BUFSIZ   (80)
-#define SCI_CFG_CH2_TX_BUFSIZ   (80)
-#define SCI_CFG_CH3_TX_BUFSIZ   (80)
-#define SCI_CFG_CH4_TX_BUFSIZ   (80)
-#define SCI_CFG_CH5_TX_BUFSIZ   (80)
-#define SCI_CFG_CH6_TX_BUFSIZ   (2180)
-#define SCI_CFG_CH7_TX_BUFSIZ   (80)
-#define SCI_CFG_CH8_TX_BUFSIZ   (80)
-#define SCI_CFG_CH9_TX_BUFSIZ   (80)
-#define SCI_CFG_CH10_TX_BUFSIZ  (80)
-#define SCI_CFG_CH11_TX_BUFSIZ  (80)
-#define SCI_CFG_CH12_TX_BUFSIZ  (80)
-
-/* SPECIFY ASYNC MODE RX QUEUE BUFFER SIZES (will not allocate if chan not enabled */
-#define SCI_CFG_CH0_RX_BUFSIZ   (80)
-#define SCI_CFG_CH1_RX_BUFSIZ   (80)
-#define SCI_CFG_CH2_RX_BUFSIZ   (80)
-#define SCI_CFG_CH3_RX_BUFSIZ   (80)
-#define SCI_CFG_CH4_RX_BUFSIZ   (80)
-#define SCI_CFG_CH5_RX_BUFSIZ   (80)
-#define SCI_CFG_CH6_RX_BUFSIZ   (8192)
-#define SCI_CFG_CH7_RX_BUFSIZ   (80)
-#define SCI_CFG_CH8_RX_BUFSIZ   (80)
-#define SCI_CFG_CH9_RX_BUFSIZ   (80)
-#define SCI_CFG_CH10_RX_BUFSIZ  (80)
-#define SCI_CFG_CH11_RX_BUFSIZ  (80)
-#define SCI_CFG_CH12_RX_BUFSIZ  (80)
-
-/* 
-* ENABLE TRANSMIT END INTERRUPT (ASYNCHRONOUS)
-* This interrupt only occurs when the last bit of the last byte of data 
-* has been sent and the transmitter has become idle. The interrupt calls
-* the user's callback function specified in R_SCI_Open() and passes it an
-* SCI_EVT_TEI event. A typical use of this feature is to disable an external
-* transceiver to save power. It would then be up to the user's code to 
-* re-enable the transceiver before sending again. Not including this feature
-* reduces code space used by the interrupt. Note that this equate is only
-* for including the TEI code. The interrupt itself must be enabled using an
-* R_SCI_Control(hdl, SCI_CMD_EN_TEI, NULL) call.
-*/
-#define SCI_CFG_TEI_INCLUDED    (1)      /* 1=included, 0=not */
-
-/* 
-* SET GROUPBL0 (ERI, TEI) INTERRUPT PRIORITY; RX64M/RX71M/RX65N/RX72M/RX72N/RX66N/RX671/RX660 ONLY
-* SET GROUPBL1; RX65N ONLY
-* SET GROUPAL0 (ERI,TEI) INTERRUPT PRIORITY; RX65N, RX72M, RX72N, RX66N ONLY
-* This sets the priority level for receiver overrun, framing, and parity errors
-* as well as TEI interrupts for all SCI channels.
-*/
-#define SCI_CFG_ERI_TEI_PRIORITY (3)     /* (RX64M/RX71M/RX65N/RX72M/RX72N/RX66N/RX671/RX660 ONLY) 1 lowest, 15 highest */
-
-/* ENABLE TX/RX FIFO; (SCIi supported MCU ONLY) 1=included, 0=not */
-#define SCI_CFG_CH7_FIFO_INCLUDED   (0)
-#define SCI_CFG_CH8_FIFO_INCLUDED   (0)
-#define SCI_CFG_CH9_FIFO_INCLUDED   (0)
-#define SCI_CFG_CH10_FIFO_INCLUDED  (0)
-#define SCI_CFG_CH11_FIFO_INCLUDED  (0)
-
-/* SET TX FIFO THRESHOLD; (SCIi supported MCU ONLY) 0 lowest, 15 highest */
-/* TX FIFO THRESHOLD is invalid in Clock Synchronous Mode and Simple SPI Mode. */
-/* Set the same value for TX FIFO THRESHOLD and RX FIFO THRESHOLD in Clock Synchronous Mode and Simple SPI Mode. */
-#define SCI_CFG_CH7_TX_FIFO_THRESH (8)
-#define SCI_CFG_CH8_TX_FIFO_THRESH (8)
-#define SCI_CFG_CH9_TX_FIFO_THRESH (8)
-#define SCI_CFG_CH10_TX_FIFO_THRESH (8)
-#define SCI_CFG_CH11_TX_FIFO_THRESH (8)
-
-/* SET RX FIFO THRESHOLD; (SCIi supported MCU ONLY) 1 lowest, 15 highest */
-#define SCI_CFG_CH7_RX_FIFO_THRESH (8)
-#define SCI_CFG_CH8_RX_FIFO_THRESH (8)
-#define SCI_CFG_CH9_RX_FIFO_THRESH (8)
-#define SCI_CFG_CH10_RX_FIFO_THRESH (8)
-#define SCI_CFG_CH11_RX_FIFO_THRESH (8)
-
-/* ENABLE Received Data match function (SCIj and SCIi supported MCU RX65N/RX66T/RX72T/RX72M/RX72N/RX66N ONLY) 1=included, 0=not */
-/*((SCIk and SCIm supported MCU RX671/RX660 ONLY) 1=included, 0=not */
-#define SCI_CFG_CH0_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH1_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH2_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH3_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH4_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH5_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH6_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH7_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH8_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH9_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH10_DATA_MATCH_INCLUDED (0)
-#define SCI_CFG_CH11_DATA_MATCH_INCLUDED (0)
-
-/* 0=Disable, 1=DTC, 2=DMAC */
-#define SCI_CFG_CH0_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH1_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH2_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH3_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH4_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH5_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH6_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH7_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH8_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH9_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH10_TX_DTC_DMACA_ENABLE (0)
-#define SCI_CFG_CH11_TX_DTC_DMACA_ENABLE (0)
-#define SCI_CFG_CH12_TX_DTC_DMACA_ENABLE (0)
-
-#define SCI_CFG_CH0_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH1_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH2_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH3_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH4_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH5_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH6_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH7_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH8_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH9_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH10_RX_DTC_DMACA_ENABLE (0)
-#define SCI_CFG_CH11_RX_DTC_DMACA_ENABLE (0)
-#define SCI_CFG_CH12_RX_DTC_DMACA_ENABLE (0)
-
-/* 0~7 8 channels dmac, but maximum of SCI channel is 13 channel => cost 13*2 = 26 dmac channels in case all of sci channels run simultaneously */
-#define SCI_CFG_CH0_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH1_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH2_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH3_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH4_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH5_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH6_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH7_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH8_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH9_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH10_TX_DMACA_CH_NUM     (0)
-#define SCI_CFG_CH11_TX_DMACA_CH_NUM     (0)
-#define SCI_CFG_CH12_TX_DMACA_CH_NUM     (0)
-
-#define SCI_CFG_CH0_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH1_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH2_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH3_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH4_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH5_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH6_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH7_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH8_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH9_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH10_RX_DMACA_CH_NUM     (1)
-#define SCI_CFG_CH11_RX_DMACA_CH_NUM     (1)
-#define SCI_CFG_CH12_RX_DMACA_CH_NUM     (1)
-
-/* Set enable/ disable transmit signal transition timing adjust feature for each channel*/
-#define SCI_CFG_CH0_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH1_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH2_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH3_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH4_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH5_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH6_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH7_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH8_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH9_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH10_TX_SIGNAL_TRANSITION_TIMING_INCLUDED   (0)
-#define SCI_CFG_CH11_TX_SIGNAL_TRANSITION_TIMING_INCLUDED   (0)
-
-/* Set enable/ disable receive data sampling timing adjust feature for each channel*/
-#define SCI_CFG_CH0_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH1_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH2_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH3_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH4_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH5_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH6_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH7_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH8_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH9_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH10_RX_DATA_SAMPLING_TIMING_INCLUDED   (0)
-#define SCI_CFG_CH11_RX_DATA_SAMPLING_TIMING_INCLUDED   (0)
-
-/* SPECIFY IRDA CHANNELS TO INCLUDE SOFTWARE (SUPPORTED MCU RX113/RX23W/RX231/RX230 ONLY) 1=included, 0=not */
-#define SCI_CFG_CH5_IRDA_INCLUDED    (0)
-
-/* Set the non-active level of the TXD pin */
-/* 1=High , 0=Low */
-#define SCI_CFG_CH5_IRDA_IRTXD_INACTIVE_LEVEL (1)
-
-/* Set the non-active level of the RXD pin */
-/* 1=High , 0=Low */
-#define SCI_CFG_CH5_IRDA_IRRXD_INACTIVE_LEVEL (1)
-
-#endif /* SCI_CONFIG_H */
diff --git a/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_tsip_rx_config.h b/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_tsip_rx_config.h
deleted file mode 100644
index a8d7db11..00000000
--- a/Configuration/samples/common/ck-rx65n/cellular/src/smc_gen/r_config/r_tsip_rx_config.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* Generated configuration header file - do not edit */
-/**********************************************************************************************************************
- * DISCLAIMER
- * This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
- * other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
- * applicable laws, including copyright laws.
- * THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
- * THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
- * EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
- * SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO
- * THIS SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
- * this software. By using this software, you agree to the additional terms and conditions found by accessing the
- * following link:
- * http://www.renesas.com/disclaimer
- *
- * Copyright (C) 2015-2023 Renesas Electronics Corporation. All rights reserved.
- *********************************************************************************************************************/
-/**********************************************************************************************************************
- * File Name    : r_tsip_rx_config.h
- * Version      : 1.17
- * Description  : Configuration options for the r_tsip_rx module.
- *********************************************************************************************************************/
-/**********************************************************************************************************************
- * History : DD.MM.YYYY Version  Description
- *         : 27.06.2015 1.00     First Release
- *         : 15.05.2017 1.01     Add AES-CMAC
- *         : 30.09.2017 1.03     Add Init/Update/Final API and SHA, RSA
- *         : 28.02.2018 1.04     Change Init/Update/Final API for RX231, add TLS function and 
- *         :                     return values change FIT rules.
- *         : 30.04.2018 1.05     Add TDES, MD5 and RSAES-PKCS1-v1_5 API
- *         : 28.09.2018 1.06     Add RSA Key Generation, AES, TDES, RSA Key update features, RX66T support
- *         : 28.12.2018 1.07     Add RX72T support
- *         : 30.09.2019 1.08     Added support for GCC and IAR compiler, ECC API, RX23W and RX72M
- *         : 31.03.2020 1.09     Added support for AES-CCM, HMAC key generation, ECDH, Key wrap API, RX66N and RX72N
- *         : 30.06.2020 1.10     Added support for ARC4, ECC(P-384) API
- *         : 30.09.2020 1.11     Added support for DH, ECDHE P-512r1 API, and generalization of KDF.
- *         :                     Added support for Key wrap API with TSIP-Lite.
- *         : 30.06.2021 1.12     Added support for RX23W chip version D
- *         : 31.08.2021 1.13     Added support for RX671
- *         : 22.10.2021 1.14     Added support for TLS1.3
- *         : 31.03.2022 1.15     Added support for TLS1.3(RX72M_RX72N_RX66N)
- *         : 15.09.2022 1.16     Added support for RSA 3k/4k and updated support for TLS1.3
- *         : 20.01.2023 1.17     Added support for TLS1.3 server
- *********************************************************************************************************************/
-
-/**********************************************************************************************************************
- Macro definitions
- *********************************************************************************************************************/
-
-#ifndef R_TSIP_RX_CONFIG_HEADER_FILE
-#define R_TSIP_RX_CONFIG_HEADER_FILE
-
-/* For AES operation. */
-#define TSIP_AES_128_ECB_ENCRYPT    (1)
-#define TSIP_AES_256_ECB_ENCRYPT    (1)
-#define TSIP_AES_128_ECB_DECRYPT    (1)
-#define TSIP_AES_256_ECB_DECRYPT    (1)
-#define TSIP_AES_128_CBC_ENCRYPT    (1)
-#define TSIP_AES_256_CBC_ENCRYPT    (1)
-#define TSIP_AES_128_CBC_DECRYPT    (1)
-#define TSIP_AES_256_CBC_DECRYPT    (1)
-#define TSIP_AES_128_CTR            (1)
-#define TSIP_AES_256_CTR            (1)
-#define TSIP_AES_128_GCM_ENCRYPT    (1)
-#define TSIP_AES_256_GCM_ENCRYPT    (1)
-#define TSIP_AES_128_GCM_DECRYPT    (1)
-#define TSIP_AES_256_GCM_DECRYPT    (1)
-#define TSIP_AES_128_CMAC           (1)
-#define TSIP_AES_256_CMAC           (1)
-#define TSIP_AES_128_CCM_ENCRYPT    (1)
-#define TSIP_AES_256_CCM_ENCRYPT    (1)
-#define TSIP_AES_128_CCM_DECRYPT    (1)
-#define TSIP_AES_256_CCM_DECRYPT    (1)
-#define TSIP_AES_128_KEY_WRAP       (1)
-#define TSIP_AES_256_KEY_WRAP       (1)
-
-/* For TDES operation. */
-#define TSIP_TDES_ECB_ENCRYPT   (1)
-#define TSIP_TDES_ECB_DECRYPT   (1)
-#define TSIP_TDES_CBC_ENCRYPT   (1)
-#define TSIP_TDES_CBC_DECRYPT   (1)
-
-/* For ARC4 operation. */
-#define TSIP_ARC4_ENCRYPT   (1)
-#define TSIP_ARC4_DECRYPT   (1)
-
-/* For HASH operation. */
-#define TSIP_SHA_1      (1)
-#define TSIP_SHA_256    (1)
-#define TSIP_MD5        (1)
-
-/* For HMAC operation. */
-#define TSIP_SHA_1_HMAC     (1)
-#define TSIP_SHA_256_HMAC   (1)
-
-/* For RSA operation. */
-#define TSIP_RSAES_1024         (1)
-#define TSIP_RSAES_2048         (1)
-#define TSIP_RSAES_3072         (1)
-#define TSIP_RSAES_4096         (1)
-#define TSIP_RSASSA_1024        (1)
-#define TSIP_RSASSA_2048        (1)
-#define TSIP_RSASSA_3072        (1)
-#define TSIP_RSASSA_4096        (1)
-    /* 5*(key_length/2) is recommended by NIST FIPS186-4, 5120 is for key_length = 2048. *2 means the margin. */
-#define TSIP_RSA_RETRY_COUNT_FOR_RSA_KEY_GENERATION (5120*2)
-
-/* For ECC operation. */
-#define TSIP_ECDSA_P192            (1)
-#define TSIP_ECDSA_P224            (1)
-#define TSIP_ECDSA_P256            (1)
-#define TSIP_ECDSA_P384            (1)
-#define TSIP_ECDH_P256             (1)
-#define TSIP_USER_SHA_384_ENABLED  (0)
-#define TSIP_USER_SHA_384_FUNCTION (user_sha384_function)
-
-/* For TLS. */
-#define TSIP_TLS    (1)
-
-/* Firmware update. */
-#define TSIP_SECURE_BOOT        (0)
-#define TSIP_FIRMWARE_UPDATE    (1)
-
-/* For multi threading */
-#define TSIP_MULTI_THREADING                    (0)
-#define TSIP_MULTI_THREADING_LOCK_FUNCTION      (user_lock_function)
-#define TSIP_MULTI_THREADING_UNLOCK_FUNCTION    (user_unlock_function)
-
-/* Key update. */
-#if defined BSP_MCU_RX231 || defined BSP_MCU_RX23W || defined BSP_MCU_RX66T || defined BSP_MCU_RX72T
-#define TSIP_INSTALL_KEY_RING_INDEX (0) /* 0-15 */
-#else
-#define TSIP_INSTALL_KEY_RING_INDEX (1) /* 0-15 */
-#endif  /* defined BSP_MCU_RX231 || defined BSP_MCU_RX23W || defined BSP_MCU_RX66T || defined BSP_MCU_RX72T */
-
-#endif /* R_TSIP_RX_CONFIG_HEADER_FILE */
diff --git a/Configuration/samples/common/ck-rx65n/ether/CK-RX65N_ether_scfg.ftl b/Configuration/samples/common/ck-rx65n/ether/CK-RX65N_ether_scfg.ftl
deleted file mode 100644
index 3fba3ee3..00000000
--- a/Configuration/samples/common/ck-rx65n/ether/CK-RX65N_ether_scfg.ftl
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<smc>
-    <general version="2.0.0.0">
-        <configuration active="true" id="${configurationTypeReleaseID}">
-            <property id="com.renesas.smc.service.project.buildArtefactType" values="com.renesas.smc.service.project.buildArtefactType.exe"/>
-            <toolchain id="${toolChainID}">
-                <option id="com.renesas.smc.toolchain.option.buildArtefactType" key="com.renesas.smc.toolchain.option.buildArtefactType.exe"/>
-                <option id="com.renesas.smc.toolchain.option.rtos" key="com.renesas.smc.toolchain.option.rtos.freertoslts">
-                    <item id="com.renesas.smc.toolchain.option.rtos.freertoslts" value="${packageVersion}"/>
-                </option>
-            </toolchain>
-        </configuration>
-        <platform id="${targetDevice}"/>
-    </general>
-    <tool id="SWComponent" version="1.0.0.0">
-        <configuration inuse="true" name="r_bsp">
-            <component display="r_bsp" id="r_bsp7.20" version="7.20">
-                <gridItem id="BSP_CFG_HEAP_BYTES" selectedIndex="0x1000"/>
-                <gridItem id="BSP_CFG_SCI_UART_TERMINAL_ENABLE" selectedIndex="1"/>
-                <gridItem id="BSP_CFG_SCI_UART_TERMINAL_CHANNEL" selectedIndex="5"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_s12ad_rx">
-            <component detailDescription="ADC Driver" display="r_s12ad_rx" id="r_s12ad_rx5.00" version="5.00">
-                <gridItem id="AN000" selectedIndex="1"/>
-                <gridItem id="ADTRG0#" selectedIndex="1"/>
-                <gridItem id="S12AD0" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_flash_rx">
-            <component display="r_flash_rx" id="r_flash_rx5.00" version="5.00">
-                <gridItem id="FLASH_CFG_PARAM_CHECKING_ENABLE" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_CODE_FLASH_ENABLE" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_DATA_FLASH_BGO" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_CODE_FLASH_BGO" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_CODE_FLASH_RUN_FROM_ROM" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_ether_rx">
-            <component display="r_ether_rx" id="r_ether_rx1.23" version="1.23">
-                <gridItem id="ET0_TX_CLK" selectedIndex="1"/>
-                <gridItem id="ET0_RX_CLK" selectedIndex="1"/>
-                <gridItem id="ET0_TX_EN" selectedIndex="1"/>
-                <gridItem id="ET0_ETXD3" selectedIndex="1"/>
-                <gridItem id="ET0_ETXD2" selectedIndex="1"/>
-                <gridItem id="ET0_ETXD1" selectedIndex="1"/>
-                <gridItem id="ET0_ETXD0" selectedIndex="1"/>
-                <gridItem id="ET0_RX_DV" selectedIndex="1"/>
-                <gridItem id="ET0_ERXD3" selectedIndex="1"/>
-                <gridItem id="ET0_ERXD2" selectedIndex="1"/>
-                <gridItem id="ET0_ERXD1" selectedIndex="1"/>
-                <gridItem id="ET0_ERXD0" selectedIndex="1"/>
-                <gridItem id="ET0_RX_ER" selectedIndex="1"/>
-                <gridItem id="ET0_CRS" selectedIndex="1"/>
-                <gridItem id="ET0_COL" selectedIndex="1"/>
-                <gridItem id="ET0_MDC" selectedIndex="1"/>
-                <gridItem id="ET0_MDIO" selectedIndex="1"/>
-                <gridItem id="ET0_LINKSTA" selectedIndex="1"/>
-                <gridItem id="ETHERC0_MII" selectedIndex="1"/>
-                <gridItem id="REF50CK0" selectedIndex="1"/>
-                <gridItem id="RMII0_TXD_EN" selectedIndex="1"/>
-                <gridItem id="RMII0_TXD1" selectedIndex="1"/>
-                <gridItem id="RMII0_TXD0" selectedIndex="1"/>
-                <gridItem id="RMII0_RXD1" selectedIndex="1"/>
-                <gridItem id="RMII0_RXD0" selectedIndex="1"/>
-                <gridItem id="RMII0_RX_ER" selectedIndex="1"/>
-                <gridItem id="RMII0_CRS_DV" selectedIndex="1"/>
-                <gridItem id="ET0_MDC" selectedIndex="1"/>
-                <gridItem id="ET0_MDIO" selectedIndex="1"/>
-                <gridItem id="ET0_LINKSTA" selectedIndex="1"/>
-                <gridItem id="ETHERC0_RMII" selectedIndex="1"/>
-                <gridItem id="ETHER_CFG_MODE_SEL" selectedIndex="1"/>
-                <gridItem id="ETHER_CFG_CH0_PHY_ADDRESS" selectedIndex="5"/>
-                <gridItem id="ETHER_CFG_EMAC_RX_DESCRIPTORS" selectedIndex="6"/>
-                <gridItem id="ETHER_CFG_EMAC_TX_DESCRIPTORS" selectedIndex="3"/>
-                <gridItem id="ETHER_CFG_CH0_PHY_ACCESS" selectedIndex="0"/>
-                <gridItem id="ETHER_CFG_LINK_PRESENT" selectedIndex="1"/>
-                <gridItem id="ETHER_CFG_USE_PHY_ICS1894_32" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_sci_rx">
-            <component detailDescription="Multi-Channel Multi-Mode SCI Driver." display="r_sci_rx" id="r_sci_rx4.40" version="4.40">
-                <gridItem id="SCI1" selectedIndex="0"/>
-                <gridItem id="RXD5/SMISO5/SSCL5" selectedIndex="1"/>
-                <gridItem id="TXD5/SMOSI5/SSDA5" selectedIndex="1"/>
-                <gridItem id="SCI5" selectedIndex="1"/>
-                <gridItem id="SCI_CFG_CH1_INCLUDED" selectedIndex="0"/>
-                <gridItem id="SCI_CFG_CH5_INCLUDED" selectedIndex="1"/>
-                <gridItem id="SCI_CFG_TEI_INCLUDED" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_byteq">
-            <component display="r_byteq" id="r_byteq2.00" version="2.00">
-                <gridItem id="BYTEQ_CFG_PARAM_CHECKING_ENABLE" selectedIndex="0"/>
-                <gridItem id="BYTEQ_CFG_USE_HEAP_FOR_CTRL_BLKS" selectedIndex="0"/>
-                <gridItem id="BYTEQ_CFG_MAX_CTRL_BLKS" selectedIndex="32"/>
-                <gridItem id="BYTEQ_CFG_PROTECT_QUEUE" selectedIndex="0"/>
-                <gridItem id="BYTEQ_CFG_CRITICAL_SECTION" selectedIndex="0"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_tsip_rx">
-            <component display="r_tsip_rx" id="r_tsip_rx1.17.l" version="1.17.l"/>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration enable="true" exclude="false" inuse="true" name="FreeRTOS_Kernel">
-            <component display="FreeRTOS Kernel" id="FreeRTOS_Kernel${packageVersion}" version="${packageVersion}">
-                <gridItem id="configMINIMAL_STACK_SIZE" selectedIndex="768"/>
-                <gridItem id="configUSE_TICK_HOOK" selectedIndex="1"/>
-                <gridItem id="configUSE_IDLE_HOOK" selectedIndex="1"/>
-                <gridItem id="configUSE_MALLOC_FAILED_HOOK" selectedIndex="1"/>
-                <gridItem id="configCHECK_FOR_STACK_OVERFLOW" selectedIndex="2"/>
-                <gridItem id="configCOMMAND_INT_MAX_OUTPUT_SIZE" selectedIndex="850"/>
-                <gridItem id="configIP_ADDR0" selectedIndex="192"/>
-                <gridItem id="configIP_ADDR1" selectedIndex="168"/>
-                <gridItem id="configIP_ADDR2" selectedIndex="11"/>
-                <gridItem id="configIP_ADDR3" selectedIndex="12"/>
-            </component>
-            <source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
-        </configuration>
-        <configuration enable="true" exclude="false" inuse="true" name="LittleFS">
-            <component display="LittleFS" id="LittleFS${packageVersion}" version="${packageVersion}">
-                <gridItem id="RM_LITTLEFS_FLASH_DATA_START" selectedIndex="FLASH_DF_BLOCK_0_MACRO"/>
-            </component>
-            <source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
-        </configuration>
-        <configuration enable="true" exclude="false" inuse="true" name="FreeRTOS Object">
-            <allocatable id="OBJECT" name="OBJECT" type="">
-                <allocatable id="TASK" name="TASK" type="">
-                    <allocatable id="TASKOBJECTLINK1" name="TASK" type="" readonly="true">
-                        <option defaultValue="1" id="Initialize" value="0"/>
-                        <option defaultValue="task_[X]" id="TaskCode" value="main_task"/>
-                        <option defaultValue="task_[X]" id="TaskName" value="MAIN_TASK"/>
-                        <option defaultValue="512" id="StackSize" value="512"/>
-                        <option defaultValue="NULL" id="TaskHandler" value="NULL"/>
-                        <option defaultValue="NULL" id="Parameter" value="NULL"/>
-                        <option defaultValue="1" id="Priority" value="1"/>
-                    </allocatable>
-                    <option defaultValue="0" id="LinkNum" value="1"/>
-                </allocatable>
-                <allocatable id="QUEUE" name="QUEUE" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="SEMAPHORE" name="SEMAPHORE" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="SWTIMER" name="SWTIMER" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="EVENTGROUP" name="EVENTGROUP" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="STREAMBUFFER" name="STREAMBUFFER" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="MESSAGEBUFFER" name="MESSAGEBUFFER" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-            </allocatable>
-            <component description="" detailDescription="" display="FreeRTOS Object" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.freertos.object" version="1.0.120"/>
-            <source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
-        </configuration>
-    </tool>
-    <tool id="System">
-        <section id="ocd">
-            <option enabled="true" id="debugIF" selection="fine">
-                <item enabled="true" id="unused"/>
-                <item enabled="true" id="fine"/>
-                <item enabled="true" id="jtag"/>
-                <item enabled="true" id="jtagTrace"/>
-            </option>
-        </section>
-    </tool>
-</smc>
diff --git a/Configuration/samples/common/ck-rx65n/ether/README.md b/Configuration/samples/common/ck-rx65n/ether/README.md
deleted file mode 100644
index 313af689..00000000
--- a/Configuration/samples/common/ck-rx65n/ether/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
----------------
-1. Usage Notes
----------------
-  
-1.1. Please take note that the sample project is verified with C project.  
-If you create new project with C++ option, please confirm its behaviour by yourself.  
-For example, if you create project with C++ option and CC-RX compiler, you will need to add abort() function manually.  
-  
-1.2. This sample project requires a "DUAL" device setting.  
-If using e2studio_2024-01 and earlier, and "non-DUAL" target board (e.g: CK-RX65N) is selected in the PG wizard, please change to "DUAL" device following the steps below:  
-###
-        1. In the Smart Configurator window, select the Board tab to open the Device selection window.
-        2. Click the ... button next to Board: to open the Change Device window.
-        3. In the Change Device window, change the value of the Target Device: item to R5F565NEHxFB_DUAL.
-           (You can click the ... button to the right of the text entry field to choose from a list of candidates.
-            Leave the Target Board: setting of Custom unchanged.)
-        4. After changing the device, click the Next > button.
-           On the information window that appears, click the Next > button again without making changes.
-        5. Finally, a window appears asking you to confirm the change. Click the Finish button.
-           (If a window asking you to confirm a change of target board appears, click the Yes button.)
-  
-1.3 If using e2studio_2024-04 and later, and Bank Mode is configured as "Single Bank" in the PG wizard, please change to "Dual Bank" following the steps below:  
-###
-        1. In the Smart Configurator window, select the Board tab to open the Device configuration window.
-        2. Change the value of the Bank Mode: item to "Dual Bank".
-        3. Click "Generate Code" to apply the changes.
-  
-1.4. After device/bank mode is changed, compiler setting is reset, please update the linker settings following the steps below:  
-###
-      - Under [Project] > [C/C++ Project Settings]:
-      - For CC-RX,
-        1. Go to Linker > Section, click Import...
-        2. Select "linker_section_sample.esi" under src folder of current project.
-  
-1.5. Please make sure to configure Smart Configurator 'Code generation behavior' to 'Update configuration files'.  
-You can do so in e2studio Windows > Preferences > Renesas > Smart Configurator > Component.  
-This is necessary because the FWUP module uses custom wrapper code for this application, this Smart Configurator setting ensures that wrapper code is not overwritten.
-  
-1.6. Issue with added sections when generating code.  
-After generating code by Smart Configurator, sections (C_FIRMWARE_UPDATE_CONTROL_BLOCK and C_FIRMWARE_UPDATE_CONTROL_BLOCK_MIRROR) are added at address 0x00100000 due to the TSIP module (v1.17.l and above).  
-They are empty sections and will not use any additional memory.
\ No newline at end of file
diff --git a/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_bsp_config.h b/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_bsp_config.h
deleted file mode 100644
index 24a08cfa..00000000
--- a/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_bsp_config.h
+++ /dev/null
@@ -1,743 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer
-*
-* Copyright (C) 2017 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name    : r_bsp_config_reference.h
-* Device(s)    : RX65N
-* Description  : The file r_bsp_config.h is used to configure your BSP. r_bsp_config.h should be included
-*                somewhere in your package so that the r_bsp code has access to it. This file (r_bsp_config_reference.h)
-*                is just a reference file that the user can use to make their own r_bsp_config.h file.
-************************************************************************************************************************
-* History : DD.MM.YYYY Version   Description
-*         : 15.05.2017 1.00      First Release
-*         : 01.12.2017 1.01      Added the following macro definition.
-*                                - BSP_CFG_EBMAPCR_1ST_PRIORITY
-*                                - BSP_CFG_EBMAPCR_2ND_PRIORITY
-*                                - BSP_CFG_EBMAPCR_3RD_PRIORITY
-*                                - BSP_CFG_EBMAPCR_4TH_PRIORITY
-*                                - BSP_CFG_EBMAPCR_5TH_PRIORITY
-*         : 01.07.2018 1.02      Added the following macro definition.
-*                                - BSP_CFG_CONFIGURATOR_SELECT
-*                                Add RTOS support. FreeRTOS. Define a timer for RTOS.
-*         : 27.07.2018 1.03      Modified the comment of PLL clock source.
-*                                Added the following macro definition for ID code protection.
-*                                 - BSP_CFG_ID_CODE_LONG_1
-*                                 - BSP_CFG_ID_CODE_LONG_2
-*                                 - BSP_CFG_ID_CODE_LONG_3
-*                                 - BSP_CFG_ID_CODE_LONG_4
-*                                Added the following macro definition.
-*                                 - BSP_CFG_FIT_IPL_MAX
-*         : 31.10.2018 1.04      Added support for RX651 with 64 pin package.
-*         : 28.02.2019 2.00      Added support for GNUC and ICCRX.
-*                                Fixed coding style.
-*         : 26.07.2019 2.01      Modified comment.
-*         : 08.10.2019 2.02      Added the following macro definition.
-*                                - BSP_CFG_SWINT_UNIT1_ENABLE
-*                                - BSP_CFG_SWINT_UNIT2_ENABLE
-*                                - BSP_CFG_SWINT_TASK_BUFFER_NUMBER
-*                                - BSP_CFG_SWINT_IPR_INITIAL_VALUE
-*                                Modified comment for added support of Renesas RTOS (RI600V4 or RI600PX).
-*                                Added the following macro definition.
-*                                - BSP_CFG_RENESAS_RTOS_USED
-*         : 31.07.2020 2.03      Modified comment.
-*         : 29.01.2021 2.04      Added the following macro definition.
-*                                - BSP_CFG_SCI_UART_TERMINAL_ENABLE
-*                                - BSP_CFG_SCI_UART_TERMINAL_CHANNEL
-*                                - BSP_CFG_SCI_UART_TERMINAL_BITRATE
-*                                - BSP_CFG_SCI_UART_TERMINAL_INTERRUPT_PRIORITY
-*         : 26.02.2021 2.05      Added a comment for Azure RTOS to BSP_CFG_RTOS_USED.
-*         : 30.11.2021 3.00      Added the following macro definitions.
-*                                - BSP_CFG_MAIN_CLOCK_OSCILLATE_ENABLE
-*                                - BSP_CFG_SUB_CLOCK_OSCILLATE_ENABLE
-*                                - BSP_CFG_HOCO_OSCILLATE_ENABLE
-*                                - BSP_CFG_LOCO_OSCILLATE_ENABLE
-*                                - BSP_CFG_IWDT_CLOCK_OSCILLATE_ENABLE
-*                                - BSP_CFG_CONFIGURATOR_VERSION
-*                                - BSP_CFG_CPLUSPLUS
-*                                - BSP_CFG_SERIAL_PROGRAMMER_CONECT_ENABLE
-*                                Changed initial value of the following macro definitions.
-*                                - BSP_CFG_MCU_PART_GROUP
-*                                - BSP_CFG_MCU_PART_SERIES
-*         : 11.02.2022 3.01      Changed initial value of the following macro definitions.
-*                                - BSP_CFG_SWINT_UNIT1_ENABLE
-*                                - BSP_CFG_SWINT_UNIT2_ENABLE
-***********************************************************************************************************************/
-#ifndef R_BSP_CONFIG_REF_HEADER_FILE
-#define R_BSP_CONFIG_REF_HEADER_FILE
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-
-/* NOTE:
-   The default settings are the same as when using RSKRX65N-2MB.
-   Change to the settings for the user board.
-*/
-
-/* Start up select
-   0 = Enable BSP startup program.
-   1 = Disable BSP startup program. (e.g. Using user startup program.)
-   NOTE: This setting is available only when using CCRX. */
-#define BSP_CFG_STARTUP_DISABLE (0)
-
-/* Enter the product part number for your MCU. This information will be used to obtain information about your MCU such 
-   as package and memory size.
-   To help parse this information, the part number will be defined using multiple macros.
-   R 5 F 56 5N E D D FP
-   | | | |  |  | | | |  Macro Name                             Description
-   | | | |  |  | | | |__BSP_CFG_MCU_PART_PACKAGE             = Package type, number of pins, and pin pitch
-   | | | |  |  | | |____not used                             = Products with wide temperature range
-   | | | |  |  | |______BSP_CFG_MCU_PART_ENCRYPTION_INCLUDED = Encryption module included/not included
-   | | | |  |  |________BSP_CFG_MCU_PART_MEMORY_SIZE         = ROM, RAM, and Data Flash Capacity
-   | | | |  |___________BSP_CFG_MCU_PART_GROUP               = Group name
-   | | | |______________BSP_CFG_MCU_PART_SERIES              = Series name
-   | | |________________BSP_CFG_MCU_PART_MEMORY_TYPE         = Type of memory (Flash, ROMless)
-   | |__________________not used                             = Renesas MCU
-   |____________________not used                             = Renesas semiconductor product.
-*/
-
-/* Package type. Set the macro definition based on values below:
-   Character(s) = Value for macro = Package Type/Number of Pins/Pin Pitch
-   FC           = 0x0             = LFQFP/176/0.50
-   BG           = 0x1             = LFBGA/176/0.80
-   LC           = 0x2             = TFLGA/177/0.50
-   FB           = 0x3             = LFQFP/144/0.50
-   LK           = 0x4             = TFLGA/145/0.50
-   FP           = 0x5             = LFQFP/100/0.50
-   FM           = 0x8             = LFQFP/64/0.50
-   LJ           = 0xA             = TFLGA/100/0.65
-   BP           = 0xC             = TFBGA/64/0.50
-*/
-#define BSP_CFG_MCU_PART_PACKAGE        (0x3) /* Generated value. Do not edit this manually */
-
-/* Whether Encryption and SDHI/SDSI are included or not.
-   Character(s) = Value for macro = Description
-   A            = false           = Encryption module not included, SDHI/SDSI module not included
-   B            = false           = Encryption module not included, SDHI/SDSI module included
-   D            = false           = Encryption module not included, SDHI/SDSI module included, dual-bank structure
-   E            = true            = Encryption module included, SDHI/SDSI module not included
-   F            = true            = Encryption module included, SDHI/SDSI module included
-   H            = true            = Encryption module included, SDHI/SDSI module included, dual-bank structure
-*/
-#define BSP_CFG_MCU_PART_ENCRYPTION_INCLUDED   (true) /* Generated value. Do not edit this manually */
-
-/* ROM, RAM, and Data Flash Capacity.
-   Character(s) = Value for macro = ROM Size/Ram Size/Data Flash Size
-   4            = 0x4             = 512KB/256KB/Not equipped
-   7            = 0x7             = 768KB/256KB/Not equipped
-   9            = 0x9             = 1MB/256KB/Not equipped
-   C            = 0xC             = 1.5MB/640KB/32KB
-   E            = 0xE             = 2MB/640KB/32KB
-   NOTE: When the RAM capacity is 640KB, the RAM areas are not contiguous.
-*/
-#define BSP_CFG_MCU_PART_MEMORY_SIZE    (0xE) /* Generated value. Do not edit this manually */
-
-/* Group name.
-   Character(s) = Description
-   5N/51        = RX65N Group/RX651 Group
-*/
-#define BSP_CFG_MCU_PART_GROUP          "RX65N" /* Generated value. Do not edit this manually */
-
-/* Series name.
-   Character(s) = Description
-   56           = RX600 Series
-*/
-#define BSP_CFG_MCU_PART_SERIES         "RX600" /* Generated value. Do not edit this manually */
-
-/* Memory type.
-   Character(s) = Value for macro = Description
-   F            = 0x0             = Flash memory version
-*/
-#define BSP_CFG_MCU_PART_MEMORY_TYPE    (0x0) /* Generated value. Do not edit this manually */
-
-/* Whether to use 1 stack or 2. RX MCUs have the ability to use 2 stacks: an interrupt stack and a user stack.
- * When using 2 stacks the user stack will be used during normal user code. When an interrupt occurs the CPU
- * will automatically shift to using the interrupt stack. Having 2 stacks can make it easier to figure out how
- * much stack space to allocate since the user does not have to worry about always having enough room on the
- * user stack for if-and-when an interrupt occurs. Some users will not want 2 stacks though because it is not
- * needed in all applications and can lead to wasted RAM (i.e. space in between stacks that is not used).
- * If only 1 stack is used then the interrupt stack is the one that will be used. If 1 stack is chosen then
- * the user may want to remove the 'SU' section from the linker sections to remove any linker warnings.
- *
- * 0 = Use 1 stack. Disable user stack. User stack size set below will be ignored.
- * 1 = Use 2 stacks. User stack and interrupt stack will both be used.
- * NOTE: This setting is available only when using CCRX and GNUC.
- *       This is invalid when using Renesas RTOS with CCRX.
- */
-#define BSP_CFG_USER_STACK_ENABLE       (1)
-
-/* If only 1 stack is chosen using BSP_CFG_USER_STACK_ENABLE then no RAM will be allocated for the user stack. */
-#if BSP_CFG_USER_STACK_ENABLE == 1
-/* User Stack size in bytes.
- * NOTE: This setting is available only when using CCRX and GNUC.
- *       This is invalid when using Renesas RTOS with CCRX. */
-#define BSP_CFG_USTACK_BYTES            (0x1000)
-#endif
-
-/* Interrupt Stack size in bytes.
-   NOTE: This setting is available only when using CCRX and GNUC. */
-#define BSP_CFG_ISTACK_BYTES            (0x400)
-
-/* Heap size in bytes.
-   To disable the heap you must follow these steps:
-   1) Set this macro (BSP_CFG_HEAP_BYTES) to 0.
-   2) Set the macro BSP_CFG_IO_LIB_ENABLE to 0.
-   3) Disable stdio from being built into the project library. This is done by going into the Renesas RX Toolchain 
-      settings and choosing the Standard Library section. After that choose 'Contents' in e2 studio.
-      This will present a list of modules that can be included. Uncheck the box for stdio.h.
-   NOTE: This setting is available only when using CCRX and GNUC. */
-#define BSP_CFG_HEAP_BYTES              (0x1000)
-
-/* Initializes C input & output library functions.
-   0 = Disable I/O library initialization in resetprg.c. If you are not using stdio then use this value.
-   1 = Enable I/O library initialization in resetprg.c. This is default and needed if you are using stdio.
-   NOTE: This setting is available only when using CCRX. */
-#define BSP_CFG_IO_LIB_ENABLE           (1)
-
-/* If desired the user may redirect the stdio charget() and/or charput() functions to their own respective functions
-   by enabling below and providing and replacing the my_sw_... function names with the names of their own functions. */
-#define BSP_CFG_USER_CHARGET_ENABLED    (0)
-#define BSP_CFG_USER_CHARGET_FUNCTION     my_sw_charget_function
-
-#define BSP_CFG_USER_CHARPUT_ENABLED    (0)
-#define BSP_CFG_USER_CHARPUT_FUNCTION     my_sw_charput_function
-
-/* After reset MCU will operate in Supervisor mode. To switch to User mode, set this macro to '1'. For more information
-   on the differences between these 2 modes see the CPU >> Processor Mode section of your MCU's hardware manual.
-   0 = Stay in Supervisor mode.
-   1 = Switch to User mode.
-   NOTE: This is invalid when using Renesas RTOS with CCRX.
-*/
-#define BSP_CFG_RUN_IN_USER_MODE        (0)
-
-/* Set your desired ID code. NOTE, leave at the default (all 0xFF's) if you do not wish to use an ID code. If you set 
-   this value and program it into the MCU then you will need to remember the ID code because the debugger will ask for 
-   it when trying to connect. Note that the E1/E20 will ignore the ID code when programming the MCU during debugging.
-   If you set this value and then forget it then you can clear the ID code by connecting up in serial boot mode using 
-   FDT. The ID Code is 16 bytes long. The macro below define the ID Code in 4-byte sections. */
-/* Lowest 4-byte section, address 0xFE7F5D50. From MSB to LSB: ID code 4, ID code 3, ID code 2, ID code 1/Control Code.
- */
-#define BSP_CFG_ID_CODE_LONG_1          (0xFFFFFFFF)
-/* 2nd ID Code section, address 0xFE7F5D54. From MSB to LSB: ID code 8, ID code 7, ID code 6, ID code 5. */
-#define BSP_CFG_ID_CODE_LONG_2          (0xFFFFFFFF)
-/* 3rd ID Code section, address 0xFE7F5D58. From MSB to LSB: ID code 12, ID code 11, ID code 10, ID code 9. */
-#define BSP_CFG_ID_CODE_LONG_3          (0xFFFFFFFF)
-/* 4th ID Code section, address 0xFE7F5D5C. From MSB to LSB: ID code 16, ID code 15, ID code 14, ID code 13. */
-#define BSP_CFG_ID_CODE_LONG_4          (0xFFFFFFFF)
-
-/* Select whether to enables or disables the connection of serial programmer.
-   0 = Connection of a serial programmer is prohibited after a reset.
-   1 = Connection of a serial programmer is permitted after a reset. (default)
-*/
-#define BSP_CFG_SERIAL_PROGRAMMER_CONECT_ENABLE   (1)
-
-/* Select whether to oscillate the Main Clock Oscillator.
-   0 = Stop Oscillating the Main Clock.
-   1 = Enable oscillating the Main Clock. (default)
-*/
-#define BSP_CFG_MAIN_CLOCK_OSCILLATE_ENABLE    (1) /* Generated value. Do not edit this manually */
-
-/* Select whether to oscillate the Sub Clock Oscillator.
-   0 = Stop Oscillating the Sub Clock. (default)
-   1 = Enable Oscillating the Sub Clock.
-*/
-#define BSP_CFG_SUB_CLOCK_OSCILLATE_ENABLE     (1) /* Generated value. Do not edit this manually */
-
-/* Select whether to oscillate the High Speed On-Chip Oscillator (HOCO).
-   0 = Stop Oscillating the HOCO. (default)
-   1 = Enable Oscillating the HOCO.
-*/
-#define BSP_CFG_HOCO_OSCILLATE_ENABLE          (0) /* Generated value. Do not edit this manually */
-
-/* Select whether to oscillate the Low Speed On-Chip Oscillator (LOCO).
-   0 = Stop Oscillating the LOCO. (default)
-   1 = Enable Oscillating the LOCO.
-*/
-#define BSP_CFG_LOCO_OSCILLATE_ENABLE          (0) /* Generated value. Do not edit this manually */
-
-/* Select whether to oscillate the IWDT-Dedicated On-Chip Oscillator (IWDT).
-   0 = Stop Oscillating the IWDT Clock. (default)
-   1 = Enable Oscillating the IWDT Clock.
-*/
-#define BSP_CFG_IWDT_CLOCK_OSCILLATE_ENABLE    (0) /* Generated value. Do not edit this manually */
-
-/* Clock source select (CKSEL).
-   0 = Low Speed On-Chip Oscillator  (LOCO)
-   1 = High Speed On-Chip Oscillator (HOCO)
-   2 = Main Clock Oscillator
-   3 = Sub-Clock Oscillator
-   4 = PLL Circuit
-*/
-#define BSP_CFG_CLOCK_SOURCE            (4) /* Generated value. Do not edit this manually */
-
-/* Main clock Oscillator Switching (MOSEL).
-   0 = Resonator
-   1 = External clock input
-*/
-#define BSP_CFG_MAIN_CLOCK_SOURCE       (0) /* Generated value. Do not edit this manually */
-
-/* The sub-clock oscillation control for using the RTC.
-   When '1' is selected, the registers related to RTC are initialized and the sub-clock oscillator is operated.
-   0 = The RTC is not to be used.
-   1 = The RTC is to be used.
-*/
-#define BSP_CFG_RTC_ENABLE              (0) /* Generated value. Do not edit this manually */
-
-/* Sub-Clock Oscillator Drive Capacity Control (RTCDV).
-   0 = Drive capacity for standard CL. (default)
-   1 = Drive capacity for low CL.
-*/
-#define BSP_CFG_SOSC_DRV_CAP            (0) /* Generated value. Do not edit this manually */
-
-/* Clock configuration options.
-   The input clock frequency is specified and then the system clocks are set by specifying the multipliers used. The
-   multiplier settings are used to set the clock registers in resetprg.c. If a 24MHz clock is used and the
-   ICLK is 120MHz, PCLKA is 120MHz, PCLKB is 60MHz, PCLKC is 60MHz, PCLKD is 60MHz, FCLK is 60MHz, USB Clock is 48MHz,
-   and BCLK is 120MHz then the settings would be:
-
-   BSP_CFG_XTAL_HZ  = 24000000
-   BSP_CFG_PLL_DIV  = 1        (no division)
-   BSP_CFG_PLL_MUL  = 10.0     (24MHz x 10.0 = 240MHz)
-   BSP_CFG_ICK_DIV  = 2      : System Clock (ICLK)        = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_ICK_DIV)  = 120MHz
-   BSP_CFG_PCKA_DIV = 2      : Peripheral Clock A (PCLKA) = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_PCKA_DIV) = 120MHz
-   BSP_CFG_PCKB_DIV = 4      : Peripheral Clock B (PCLKB) = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_PCKB_DIV) = 60MHz
-   BSP_CFG_PCKC_DIV = 4      : Peripheral Clock C (PCLKC) = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_PCKC_DIV) = 60MHz
-   BSP_CFG_PCKD_DIV = 4      : Peripheral Clock D (PCLKD) = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_PCKD_DIV) = 60MHz
-   BSP_CFG_FCK_DIV  = 4      : Flash IF Clock (FCLK)      = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_FCK_DIV)  = 60MHz
-   BSP_CFG_BCK_DIV  = 2      : External Bus Clock (BCK)   = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_BCK_DIV)  = 120MHz
-   BSP_CFG_UCK_DIV  = 5      : USB Clock (UCLK)           = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_UCK_DIV)  = 48MHz
-*/
-
-/* Input clock frequency in Hz (XTAL or EXTAL). */
-#define BSP_CFG_XTAL_HZ                 (24000000) /* Generated value. Do not edit this manually */
-
-/* The HOCO can operate at several different frequencies. Choose which one using the macro below.
-   Available frequency settings:
-   0 = 16MHz (default)
-   1 = 18MHz
-   2 = 20MHz
-*/
-#define BSP_CFG_HOCO_FREQUENCY          (0) /* Generated value. Do not edit this manually */
-
-/* PLL clock source (PLLSRCSEL). Choose which clock source to input to the PLL circuit.
-   Available clock sources:
-   0 = Main clock (default)
-   1 = HOCO
-*/
-#define BSP_CFG_PLL_SRC                 (0) /* Generated value. Do not edit this manually */
-
-/* PLL Input Frequency Division Ratio Select (PLIDIV).
-   Available divisors = /1 (no division), /2, /3
-*/
-#define BSP_CFG_PLL_DIV                 (1) /* Generated value. Do not edit this manually */
-
-/* PLL Frequency Multiplication Factor Select (STC).
-   Available multipliers = x10.0 to x30.0 in 0.5 increments (e.g. 10.0, 10.5, 11.0, 11.5, ..., 29.0, 29.5, 30.0)
-*/
-#define BSP_CFG_PLL_MUL                 (10.0) /* Generated value. Do not edit this manually */
-
-/* System Clock Divider (ICK).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_ICK_DIV                 (2) /* Generated value. Do not edit this manually */
-
-/* Peripheral Module Clock A Divider (PCKA).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_PCKA_DIV                (2) /* Generated value. Do not edit this manually */
-
-/* Peripheral Module Clock B Divider (PCKB).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_PCKB_DIV                (4) /* Generated value. Do not edit this manually */
-
-/* Peripheral Module Clock C Divider (PCKC).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_PCKC_DIV                (4) /* Generated value. Do not edit this manually */
-
-/* Peripheral Module Clock D Divider (PCKD).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_PCKD_DIV                (4) /* Generated value. Do not edit this manually */
-
-/* External Bus Clock Divider (BCLK).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_BCK_DIV                 (2) /* Generated value. Do not edit this manually */
-
-/* Flash IF Clock Divider (FCK).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_FCK_DIV                 (4) /* Generated value. Do not edit this manually */
-
-/* USB Clock Divider Select.
-   Available divisors = /2, /3, /4, /5
-*/
-#define BSP_CFG_UCK_DIV                 (5) /* Generated value. Do not edit this manually */
-
-/* Configure BCLK output pin (only effective when external bus enabled)
-   Values 0=no output, 1 = BCK frequency, 2= BCK/2 frequency
-*/
-#define BSP_CFG_BCLK_OUTPUT             (0) /* Generated value. Do not edit this manually */
-
-/* Configure SDCLK output pin (only effective when external bus enabled)
-   Values 0=no output, 1 = BCK frequency
-*/
-#define BSP_CFG_SDCLK_OUTPUT            (0) /* Generated value. Do not edit this manually */
-
-/* Main Clock Oscillator Wait Time (MOSCWTCR).
-   The value of MOSCWTCR register required for correspondence with the waiting time required to secure stable 
-   oscillation by the main clock oscillator is obtained by using the maximum frequency for fLOCO in the formula below.
-
-   BSP_CFG_MOSC_WAIT_TIME > (tMAINOSC * (fLOCO_max) + 16)/32
-   (tMAINOSC: main clock oscillation stabilization time; fLOCO_max: maximum frequency for fLOCO)
-
-   If tMAINOSC is 9.98 ms and fLOCO_max is 264 kHz (the period is 1/3.78 us), the formula gives 
-   BSP_CFG_MOSC_WAIT_TIME > (9.98 ms * (264 kHZ) + 16)/32 = 82.83, so set the BSP_CFG_MOSC_WAIT_TIME to 83(53h).
-
-   NOTE: The waiting time is not required when an external clock signal is input for the main clock oscillator.
-         Set the BSP_CFG_MOSC_WAIT_TIME to 00h.
-*/
-#define BSP_CFG_MOSC_WAIT_TIME          (0x53) /* Generated value. Do not edit this manually */
-
-/* Sub-Clock Oscillator Wait Time (SOSCWTCR).
-   The value of SOSCWTCR register required for correspondence with the expected time to secure settling of oscillation
-   by the sub-clock oscillator is obtained by using the maximum frequency for fLOCO in the formula below.
-
-   BSP_CFG_SOSC_WAIT_TIME > (tSUBOSC * (fLOCO_max) + 16)/16384
-   (tSUBOSC: sub-clock oscillation stabilization time; fLOCO_max: maximum frequency for fLOCO)
-
-   If tSUBOSC is 2 s and fLOCO is 264 kHz (the period is 1/3.78 us), the formula gives
-    BSP_CFG_SOSC_WAIT_TIME > (2 s * (264 kHz) +16)/16384 = 32.22, so set the  BSP_CFG_SOSC_WAIT_TIME bits to 33(21h).
-*/
-#define BSP_CFG_SOSC_WAIT_TIME          (0x21) /* Generated value. Do not edit this manually */
-
-/* ROM Cache Enable Register (ROMCE).
-   0 = ROM cache operation disabled.
-   1 = ROM cache operation enabled.
-*/
-#define BSP_CFG_ROM_CACHE_ENABLE        (0)
-
-/* Configure WDT and IWDT settings.
-   OFS0 - Option Function Select Register 0
-       b31:b29 Reserved When reading, these bits return the value written by the user. The write value should be 1.
-       b28     WDTRSTIRQS - WDT Reset Interrupt Request - What to do on underflow (0=take interrupt, 1=reset MCU)
-       b27:b26 WDTRPSS   - WDT Window Start Position Select - (0=25%, 1=50%, 2=75%, 3=100%,don't use)
-       b25:b24 WDTRPES   - WDT Window End Position Select - (0=75%, 1=50%, 2=25%, 3=0%,don't use)
-       b23:b20 WDTCKS    - WDT Clock Frequency Division Ratio - (1=PCLKB/4, 4=PCLKB/64, 0xF=PCLKB/128, 6=PCLKB/256,
-                                                                 7=PCLKB/2048, 8=PCLKB/8192)
-       b19:b18 WDTTOPS   - WDT Timeout Period Select (0=1024 cycles, 1=4096, 2=8192, 3=16384)
-       b17     WDTSTRT   - WDT Start Mode Select - (0=auto-start after reset, 1=halt after reset)
-       b16:b15 Reserved (set to 1)
-       b14     IWDTSLCSTP - IWDT Sleep Mode Count Stop Control - (0=can't stop count, 1=stop w/some low power modes)
-       b13     Reserved (set to 1)
-       b12     IWDTRSTIRQS - IWDT Reset Interrupt Request - What to do on underflow (0=take interrupt, 1=reset MCU)
-       b11:b10 IWDTRPSS - IWDT Window Start Position Select - (0=25%, 1=50%, 2=75%, 3=100%,don't use)
-       b9:b8   IWDTRPES - IWDT Window End Position Select - (0=75%, 1=50%, 2=25%, 3=0%,don't use)
-       b7:b4   IWDTCKS - IWDT Clock Frequency Division Ratio - (0=none, 2=/16, 3 = /32, 4=/64, 0xF=/128, 5=/256)
-       b3:b2   IWDTTOPS - IWDT Timeout Period Select - (0=1024 cycles, 1=4096, 2=8192, 3=16384)
-       b1      IWDTSTRT - IWDT Start Mode Select - (0=auto-start after reset, 1=halt after reset)
-       b0      Reserved (set to 1)
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_OFS0_REG_VALUE  (0xFFFFFFFF) /* Generated value. Do not edit this manually */
-
-/* Configure whether voltage detection 0 circuit and HOCO are enabled after reset.
-   OFS1 - Option Function Select Register 1
-       b31:b9 Reserved (set to 1)
-       b8     HOCOEN - Enable/disable HOCO oscillation after a reset (0=enable, 1=disable)
-       b7:b3  Reserved When reading, these bits return the value written by the user. The write value should be 1.
-       b2     LVDAS - Voltage Detection 0 circuit start (1=monitoring disabled)
-       b1:b0  VDSEL - Voltage Detection 0 level select (1=2.94v, 2=2.87v, 3=2.80v)
-       NOTE: If HOCO oscillation is enabled by OFS1.HOCOEN, HOCO frequency is 16MHz.
-             BSP_CFG_HOCO_FREQUENCY should be default value.
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_OFS1_REG_VALUE  (0xFFFFFFFF) /* Generated value. Do not edit this manually */
-
-/* Trusted memory is facility to prevent the reading of blocks 8 and 9 and blocks 46 and 47 (in dual mode) in 
-   the code flash memory by third party software. This feature is disabled by default.
-   TMEF - TM Enable Flag Register
-       b31     Reserved (set to 1)
-       b30:b28 TMEFDB - Dual-Bank TM Enable - 000: The TM function in the address range from FFEE 0000h to 
-                                                   FFEE FFFFh is enabled in dual mode.
-                                            - 111: The TM function in the address range from FFEE 0000h to 
-                                                   FFEE FFFFh is disabled in dual mode.
-       b27     Reserved (set to 1)
-       b26:b24 TMEF   - TM Enable - 000: TM function is enabled.
-                                  - 111: TM function is disabled.
-       b23:b0  Reserved (set to 1)
-       NOTE: If the dual bank function has not been incorporated in a device,
-             TMEFDB bits [b30:b26] are reserved area.
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_TRUSTED_MODE_FUNCTION  (0xFFFFFFFF)
-
-/* Configure FAW register is used to set the write protection flag and boot area select flag 
-   for setting the flash access window startaddress and flash access window end address.
-   FAW - Flash Access Window Setting Register
-       b31      BTFLG - Boot Area Select Flag - 0: FFFF C000h to FFFF DFFFh are used as the boot area
-                                              - 1: FFFF E000h to FFFF FFFFh are used as the boot area
-       b30:b28  Reserved - When reading, these bits return the value written by the user.The write value should be 1.
-       b27:b16  FAWE - Flash Access Window End Address - Flash access window end address
-       b15      FSPR - Access Window Protection Flag - 0: With protection (P/E disabled)
-                                                     - 1: Without protection (P/E enabled)
-       b14:b12  Reserved - When reading, these bits return the value written by the user.The write value should be 1.
-       b11:b0   FAWS - Flash Access Window Start Address - Flash access window start address 
-       NOTE: Once 0 is written to this bit, the bit can never be restored to 1.
-             Therefore, the access window and the BTFLG bit never be set again or the TM function 
-             never be disabled once it has been enabled.
-             Exercise extra caution when handling the FSPR bit.
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_FAW_REG_VALUE  (0xFFFFFFFF)
-
-/* The ROM code protection register is a function to prohibit reading from or programming to the flash memory
-   when the flash programmer is used during off-board programming.
-   ROMCODE - ROM Code Protection Register
-       b31:b0  ROM Code - 0000 0000h: ROM code protection enabled (ROM code protection 1).
-                          0000 0001h: ROM code protection enabled (ROM code protection 2).
-                          Other than above: ROM code protection disabled.
-       Note: The ROMCODE register should be set in 32-bit units.
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_ROMCODE_REG_VALUE  (0xFFFFFFFF)
-
-/* Select the bank mode of dual-bank function of the code flash memory.
-   0 = Dual mode.
-   1 = Linear mode. (default)
-   NOTE: If the dual bank function has been incorporated in a device, select the bank mode in this macro.
-         Default setting of the bank mode is linear mode.
-         If the dual bank function has not been incorporated in a device, this macro should be 1.
-*/
-#define BSP_CFG_CODE_FLASH_BANK_MODE    (0)
-
-/* Select the startup bank of the program when dual bank function is in dual mode.
-   0 = The address range of bank 1 from FFE00000h to FFEFFFFFh and bank 0 from FFF00000h to FFFFFFFFh. (default)
-   1 = The address range of bank 1 from FFF00000h to FFFFFFFFh and bank 0 from FFE00000h to FFEFFFFFh.
-   NOTE: If the dual bank function has been incorporated in a device, select the start bank in this macro.
-         Default setting of the start bank is bank0.
-         If the dual bank function has not been incorporated in a device, this macro should be 0.
-*/
-#define BSP_CFG_CODE_FLASH_START_BANK   (0)
-
-/* This macro lets other modules no if a RTOS is being used.
-   0 = RTOS is not used.
-   1 = FreeRTOS is used.
-   2 = embOS is used.(This is not available.)
-   3 = MicroC_OS is used.(This is not available.)
-   4 = Renesas ITRON OS (RI600V4 or RI600PX) is used.
-   5 = Azure RTOS is used.(This is not available.)
-*/
-#define BSP_CFG_RTOS_USED               (1)
-
-/* This macro is used to select which Renesas ITRON OS.
-   0 = RI600V4 is used.
-   1 = RI600PX is used.
-*/
-#define BSP_CFG_RENESAS_RTOS_USED       (0)
-
-/* This macro is used to select which CMT channel used for system timer of RTOS.
- * The setting of this macro is only valid if the macro BSP_CFG_RTOS_USED is set to a value other than 0. */
-#if BSP_CFG_RTOS_USED != 0
-/* Setting value.
- * 0      = CMT channel 0 used for system timer of RTOS (recommended to be used for RTOS).
- * 1      = CMT channel 1 used for system timer of RTOS.
- * 2      = CMT channel 2 used for system timer of RTOS.
- * 3      = CMT channel 3 used for system timer of RTOS.
- * Others = Invalid.
- * NOTE: This is invalid when using Renesas RTOS with CCRX.
- */
-#define BSP_CFG_RTOS_SYSTEM_TIMER       (0)
-#endif
-
-/* By default modules will use global locks found in mcu_locks.c. If the user is using a RTOS and would rather use its
-   locking mechanisms then they can change this macro.
-   NOTE: If '1' is chosen for this macro then the user must also change the next macro 'BSP_CFG_USER_LOCKING_TYPE'.
-   0 = Use default locking (non-RTOS)
-   1 = Use user defined locking mechanism.
-*/
-#define BSP_CFG_USER_LOCKING_ENABLED    (0)
-
-/* If the user decides to use their own locking mechanism with FIT modules then they will need to redefine the typedef
-   that is used for the locks. If the user is using a RTOS then they would likely redefine the typedef to be 
-   a semaphore/mutex type of their RTOS. Use the macro below to set the type that will be used for the locks.
-   NOTE: If BSP_CFG_USER_LOCKING_ENABLED == 0 then this typedef is ignored.
-   NOTE: Do not surround the type with parentheses '(' ')'.
-*/
-#define BSP_CFG_USER_LOCKING_TYPE       bsp_lock_t
-
-/* If the user decides to use their own locking mechanism with FIT modules then they will need to define the functions
-   that will handle the locking and unlocking. These functions should be defined below.
-   If BSP_CFG_USER_LOCKING_ENABLED is != 0:
-   R_BSP_HardwareLock(mcu_lock_t hw_index) will call BSP_CFG_USER_LOCKING_HW_LOCK_FUNCTION(mcu_lock_t hw_index)
-   R_BSP_HardwareUnlock(mcu_lock_t hw_index) will call BSP_CFG_USER_LOCKING_HW_UNLOCK_FUNCTION(mcu_lock_t hw_index)
-       NOTE:With these functions the index into the array holding the global hardware locks is passed as the parameter.
-   R_BSP_SoftwareLock(BSP_CFG_USER_LOCKING_TYPE * plock) will call 
-   BSP_CFG_USER_LOCKING_SW_LOCK_FUNCTION(BSP_CFG_USER_LOCKING_TYPE * plock)
-   R_BSP_SoftwareUnlock(BSP_CFG_USER_LOCKING_TYPE * plock) will call 
-   BSP_CFG_USER_LOCKING_SW_UNLOCK_FUNCTION(BSP_CFG_USER_LOCKING_TYPE * plock)
-       NOTE:With these functions the actual address of the lock to use is passed as the parameter.
-   NOTE: These functions must return a boolean. If lock was obtained or released successfully then return true. Else, 
-         return false.
-   NOTE: If BSP_CFG_USER_LOCKING_ENABLED == 0 then this typedef is ignored.
-   NOTE: Do not surround the type with parentheses '(' ')'.
-*/
-#define BSP_CFG_USER_LOCKING_HW_LOCK_FUNCTION      my_hw_locking_function
-#define BSP_CFG_USER_LOCKING_HW_UNLOCK_FUNCTION    my_hw_unlocking_function
-#define BSP_CFG_USER_LOCKING_SW_LOCK_FUNCTION      my_sw_locking_function
-#define BSP_CFG_USER_LOCKING_SW_UNLOCK_FUNCTION    my_sw_unlocking_function
-
-/* If the user would like to determine if a warm start reset has occurred, then they may enable one or more of the
-   following callback definitions AND provide a call back function name for the respective callback
-   function (to be defined by the user). Setting BSP_CFG_USER_WARM_START_CALLBACK_PRE_INITC_ENABLED = 1 will result
-   in a callback to the user defined my_sw_warmstart_prec_function just prior to the initialization of the C
-   runtime environment by resetprg.
-   Setting BSP_CFG_USER_WARM_START_CALLBACK_POST_INITC_ENABLED = 1 will result in a callback to the user defined
-   my_sw_warmstart_postc_function just after the initialization of the C runtime environment by resetprg.
-*/
-#define BSP_CFG_USER_WARM_START_CALLBACK_PRE_INITC_ENABLED    (0)
-#define BSP_CFG_USER_WARM_START_PRE_C_FUNCTION     my_sw_warmstart_prec_function
-
-#define BSP_CFG_USER_WARM_START_CALLBACK_POST_INITC_ENABLED    (0)
-#define BSP_CFG_USER_WARM_START_POST_C_FUNCTION    my_sw_warmstart_postc_function
-
-/* By default FIT modules will check input parameters to be valid. This is helpful during development but some users
-   will want to disable this for production code. The reason for this would be to save execution time and code space.
-   This macro is a global setting for enabling or disabling parameter checking. Each FIT module will also have its
-   own local macro for this same purpose. By default the local macros will take the global value from here though
-   they can be overridden. Therefore, the local setting has priority over this global setting. Disabling parameter
-   checking should only used when inputs are known to be good and the increase in speed or decrease in code space is 
-   needed.
-   0 = Global setting for parameter checking is disabled.
-   1 = Global setting for parameter checking is enabled (Default).
-*/
-#define BSP_CFG_PARAM_CHECKING_ENABLE               (1)
-
-/* The extended bus master has five transfer sources: EDMAC, GLCDC-GRA1 (GLCDC graphics 1 data read), GLCDCGRA2 (GLCDC
-   graphics 2 data read), DRW2D-TX (DRW2D texture data read), and DRW2D-FB (DRW2D frame buffer data read write and
-   display list data read).
-   The default priority order in bsp is below
-   GLCDC-GRA1 > GLCDC-GRA2 > DRW2D-TX > DRW2D-FB > EDMAC.
-   Priority can be changed with this macro.
-
-   Extended Bus Master Priority setting
-   0 = GLCDC graphics 1 data read
-   1 = DRW2D texture data read
-   2 = DRW2D frame buffer data read write and display list data read
-   3 = GLCDC graphics 2 data read
-   4 = EDMAC
-
-   Note : This macro is only available for products with at least 1.5 Mbytes of code flash memory.
-          Settings other than above are prohibited.
-          Duplicate priority settings can not be made.
-*/
-#define BSP_CFG_EBMAPCR_1ST_PRIORITY                (0) /* Extended Bus Master 1st Priority Selection */
-#define BSP_CFG_EBMAPCR_2ND_PRIORITY                (3) /* Extended Bus Master 2nd Priority Selection */
-#define BSP_CFG_EBMAPCR_3RD_PRIORITY                (1) /* Extended Bus Master 3rd Priority Selection */
-#define BSP_CFG_EBMAPCR_4TH_PRIORITY                (2) /* Extended Bus Master 4th Priority Selection */
-#define BSP_CFG_EBMAPCR_5TH_PRIORITY                (4) /* Extended Bus Master 5th Priority Selection */
-
-/* This macro is used to define the voltage that is supplied to the MCU (Vcc). This macro is defined in millivolts. This
-   macro does not actually change anything on the MCU. Some FIT modules need this information so it is defined here. */
-#define BSP_CFG_MCU_VCC_MV                          (3300) /* Generated value. Do not edit this manually */
-
-/* Allow initialization of auto-generated peripheral initialization code by Smart Configurator tool.
-   When not using the Smart Configurator, set the value of BSP_CFG_CONFIGURATOR_SELECT to 0.
-   0 = Disabled (default)
-   1 = Smart Configurator initialization code used
-*/
-#define BSP_CFG_CONFIGURATOR_SELECT                 (1) /* Generated value. Do not edit this manually */
-
-/* Version number of Smart Configurator.
-   This macro definition is updated by Smart Configurator.
-*/
-#define BSP_CFG_CONFIGURATOR_VERSION                (2160) /* Generated value. Do not edit this manually */
-
-/* For some BSP functions, it is necessary to ensure that, while these functions are executing, interrupts from other 
-   FIT modules do not occur. By controlling the IPL, these functions disable interrupts that are at or below the 
-   specified interrupt priority level.
-   This macro sets the IPL. Range is 0x0 - 0xF.
-   Please set this macro more than IPR for other FIT module interrupts.
-   The default value is 0xF (maximum value).
-   Don't change if there is no special processing with higher priority than all fit modules.
-*/
-#define BSP_CFG_FIT_IPL_MAX                         (0xF)
-
-/* Software Interrupt (SWINT).
-   0 = Software interrupt is not used.
-   1 = Software interrupt is used.
-   NOTE: When this macro is set to 1, the software interrupt is initialized in bsp startup routine. 
-*/
-#define BSP_CFG_SWINT_UNIT1_ENABLE    (0)
-#define BSP_CFG_SWINT_UNIT2_ENABLE    (0)
-
-/* Software Interrupt Task Buffer Number.
-   For software interrupt, this value is number of buffering user tasks.
-   So user can increase this value if user system would have many software interrupt tasks
-   and user system has enough buffer. This value requires 9 byte per task.
-   NOTE: This setting is common to all units. It can not be set individually. 
-         The maximum value is 254.
-*/
-#define BSP_CFG_SWINT_TASK_BUFFER_NUMBER     (8)
-
-/* Initial value of the software interrupt priority.
-   For software interrupt, this value is interrupt priority. Range is 0x0 - 0xF.
-   NOTE: This setting is common to all units. It can not be set individually. 
-         Please be careful that this setting is the initial value of the interrupt priority register(IPR).
-         It is possible to dynamically change the IPR.
-*/
-#define BSP_CFG_SWINT_IPR_INITIAL_VALUE     (0x1)
-
-/* This macro is used for serial terminal on the board selected by smart configurator.
-   0 = SCI UART Terminal is disabled.
-   1 = SCI UART Terminal is enabled.
-*/
-#define BSP_CFG_SCI_UART_TERMINAL_ENABLE         (1)
-
-/* This macro is channel number for serial terminal.
-*/
-#define BSP_CFG_SCI_UART_TERMINAL_CHANNEL        (5)
-
-/* This macro is bit-rate for serial terminal.
-*/
-#define BSP_CFG_SCI_UART_TERMINAL_BITRATE        (115200)
-
-/* This macro is interrupt priority for serial terminal.
-   0(low) - 15(high)
-*/
-#define BSP_CFG_SCI_UART_TERMINAL_INTERRUPT_PRIORITY   (15)
-
-/* This macro is used for C++ project and updated by Smart Configurator.
-   0 = This project is a C project.(Not a C++ project).
-   1 = This project is a C++ project.
-*/
-#define BSP_CFG_CPLUSPLUS             (0) /* Generated value. Do not edit this manually */
-
-#endif /* R_BSP_CONFIG_REF_HEADER_FILE */
-
diff --git a/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_bsp_interrupt_config.h b/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_bsp_interrupt_config.h
deleted file mode 100644
index 39237823..00000000
--- a/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_bsp_interrupt_config.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer 
-*
-* Copyright (C) 2016 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name    : r_bsp_interrupt_config.h
-* Description  : This module maps Interrupt A & B interrupts. More information on how this is done is given below.
-***********************************************************************************************************************/
-/**********************************************************************************************************************
-* History : DD.MM.YYYY Version   Description
-*         : 01.10.2016 1.00      First Release
-*         : 15.05.2017 2.00      Changed the name of the following macro definition, because there was a mistake
-*                                in the name of macro definition.
-*                                - From XXX_TPU0_TGI0V to XXX_TPU0_TCI0V.
-*                                - From XXX_TPU1_TGI1V to XXX_TPU1_TCI1V.
-*                                - From XXX_TPU1_TGI1U to XXX_TPU1_TCI1U.
-*                                - From XXX_TPU2_TGI2V to XXX_TPU2_TCI2V.
-*                                - From XXX_TPU2_TGI2U to XXX_TPU2_TCI2U.
-*                                - From XXX_TPU3_TGI3V to XXX_TPU3_TCI3V.
-*                                - From XXX_TPU4_TGI4V to XXX_TPU4_TCI4V.
-*                                - From XXX_TPU4_TGI4U to XXX_TPU4_TCI4U.
-*                                - From XXX_TPU5_TGI5V to XXX_TPU5_TCI5V.
-*                                - From XXX_TPU5_TGI5U to XXX_TPU5_TCI5U.
-*                                - From XXX_MTU0_TGIV0 to XXX_MTU0_TCIV0.
-*                                - From XXX_MTU1_TGIV1 to XXX_MTU1_TCIV1.
-*                                - From XXX_MTU1_TGIU1 to XXX_MTU1_TCIU1.
-*                                - From XXX_MTU2_TGIV2 to XXX_MTU2_TCIV2.
-*                                - From XXX_MTU2_TGIU2 to XXX_MTU2_TCIU2.
-*                                - From XXX_MTU3_TGIV3 to XXX_MTU3_TCIV3.
-*                                - From XXX_MTU4_TGIV4 to XXX_MTU4_TCIV4.
-*                                - From XXX_MTU6_TGIV6 to XXX_MTU6_TCIV6.
-*                                - From XXX_MTU7_TGIV7 to XXX_MTU7_TCIV7.
-*                                - From XXX_MTU8_TGIV8 to XXX_MTU8_TCIV8.
-*                                Added select processing of the following software configurable interrupt source.
-*                                - TSIP_PROC_BUSY
-*                                - TSIP_ROMOK
-*                                - TSIP_LONG_PLG
-*                                - TSIP_TEST_BUSY
-*                                - TSIP_WRRDY0
-*                                - TSIP_WRRDY1
-*                                - TSIP_WRRDY4
-*                                - TSIP_RDRDY0
-*                                - TSIP_RDRDY1
-*                                - TSIP_INTEGRATE_WRRDY
-*                                - TSIP_INTEGRATE_RDRDY
-***********************************************************************************************************************/
-#ifndef R_BSP_INTERRUPT_CONFIG_REF_HEADER_FILE
-#define R_BSP_INTERRUPT_CONFIG_REF_HEADER_FILE
-
-/***********************************************************************************************************************
-Macro definitions
-***********************************************************************************************************************/
-
-/* If you wish to use one of the interrupt below then set the appropriate configuration macro to the vector number you
- * wish to use for that interrupt. For example, if you want to use the RTC carry interrupt (CUP) at vector 176 then you
- * would do the following:
- *
- * #define BSP_MAPPED_INT_CFG_B_VECT_RTC_CUP                                 176
- */
-
-/* Interrupt B Sources.
- * -Valid vector numbers are 128-207.
- * -There are more vector slots for B sources than actual B sources. By default all B sources are mapped.
- * -If using the 'TPU1, TGI1A' interrupt it must be vector 144 or 145. It is set to 144 by default.
- * -If a peripheral interrupt is going to be used to wake up the MCU from All-Module Clock Stop Mode then it must be
- *  in a vector between 146 to 157. Peripheral interrupts that can do this are TMR interrupts and the 'USB0, USBI0'
- *  interrupt. By default the TMR interrupts are chosen since there are 12 of them and there are 12 slots.
- */
-#define BSP_MAPPED_INT_CFG_B_VECT_CMT2_CMI2                               128
-#define BSP_MAPPED_INT_CFG_B_VECT_CMT3_CMI3                               129
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR0_CMIA0                              146
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR0_CMIB0                              147
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR0_OVI0                               148
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR1_CMIA1                              149
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR1_CMIB1                              150
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR1_OVI1                               151
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR2_CMIA2                              152
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR2_CMIB2                              153
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR2_OVI2                               154
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR3_CMIA3                              155
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR3_CMIB3                              156
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR3_OVI3                               157
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TGI0A                              130
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TGI0B                              131
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TGI0C                              132
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TGI0D                              133
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TCI0V                              134
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU1_TGI1A                              144
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU1_TGI1B                              135
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU1_TCI1V                              136
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU1_TCI1U                              137
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU2_TGI2A                              138
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU2_TGI2B                              139
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU2_TCI2V                              140
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU2_TCI2U                              141
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TGI3A                              142
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TGI3B                              143
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TGI3C                              145
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TGI3D                              158
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TCI3V                              159
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU4_TGI4A                              160
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU4_TGI4B                              161
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU4_TCI4V                              162
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU4_TCI4U                              163
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU5_TGI5A                              164
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU5_TGI5B                              165
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU5_TCI5V                              166
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU5_TCI5U                              167
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW0_IC0I0                             168
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW0_IC1I0                             169
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW0_OC0I0                             170
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW0_OC1I0                             171
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW1_IC0I1                             172
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW1_IC1I1                             173
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW1_OC0I1                             174
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW1_OC1I1                             175
-#define BSP_MAPPED_INT_CFG_B_VECT_RTC_CUP                                 176
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN0_RXF0                               177
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN0_TXF0                               178
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN0_RXM0                               179
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN0_TXM0                               180
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN1_RXF1                               181
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN1_TXF1                               182
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN1_RXM1                               183
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN1_TXM1                               184
-#define BSP_MAPPED_INT_CFG_B_VECT_USB0_USBI0                              185
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC0_S12ADI0                         186
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC0_S12GBADI0                       187
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC0_S12GCADI0                       188
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC1_S12ADI1                         189
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC1_S12GBADI1                       190
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC1_S12GCADI1                       191
-#define BSP_MAPPED_INT_CFG_B_VECT_RNG_RNGEND                              192
-#define BSP_MAPPED_INT_CFG_B_VECT_ELC_ELSR18I                             193
-#define BSP_MAPPED_INT_CFG_B_VECT_ELC_ELSR19I                             194
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_PROC_BUSY                          195
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_ROMOK                              196
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_LONG_PLG                           197
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_TEST_BUSY                          198
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_WRRDY0                             199
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_WRRDY1                             200
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_WRRDY4                             201
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_RDRDY0                             202
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_RDRDY1                             203
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_INTEGRATE_WRRDY                    204
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_INTEGRATE_RDRDY                    205
-
-/* Interrupt A Sources.
- * -Valid vector numbers are 208-255.
- * -There are more A sources than A vector slots. By default none of the GPT interrupts are mapped.
- * -If using the 'MTU1, TGI1A' interrupt it must be vector 208 or 209. It is set to 208 by default.
- */
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIA0                              209
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIB0                              210
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIC0                              211
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGID0                              212
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TCIV0                              213
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIE0                              214
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIF0                              215
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU1_TGIA1                              208
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU1_TGIB1                              216
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU1_TCIV1                              217
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU1_TCIU1                              218
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU2_TGIA2                              219
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU2_TGIB2                              220
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU2_TCIV2                              221
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU2_TCIU2                              222
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TGIA3                              223
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TGIB3                              224
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TGIC3                              225
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TGID3                              226
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TCIV3                              227
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TGIA4                              228
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TGIB4                              229
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TGIC4                              230
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TGID4                              231
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TCIV4                              232
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU5_TGIU5                              233
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU5_TGIV5                              234
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU5_TGIW5                              235
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TGIA6                              236
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TGIB6                              237
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TGIC6                              238
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TGID6                              239
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TCIV6                              240
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TGIA7                              241
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TGIB7                              242
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TGIC7                              243
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TGID7                              244
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TCIV7                              245
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TGIA8                              246
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TGIB8                              247
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TGIC8                              248
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TGID8                              249
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TCIV8                              250
-#define BSP_MAPPED_INT_CFG_A_VECT_AES_AESRDY                              251
-#define BSP_MAPPED_INT_CFG_A_VECT_AES_AESEND                              252
-
-#endif /* R_BSP_INTERRUPT_CONFIG_REF_HEADER_FILE */
-
diff --git a/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_byteq_config.h b/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_byteq_config.h
deleted file mode 100644
index 7c0e15a9..00000000
--- a/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_byteq_config.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer 
-*
-* Copyright (C) 2013 Renesas Electronics Corporation. All rights reserved.    
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name     : r_byteq_config.h
-* Description   : Configures the byte queue memory allocation
-************************************************************************************************************************
-* History : DD.MM.YYYY Version Description  
-*         : 24.07.2013 1.00     Initial Release
-*         : 11.21.2014 1.20     Removed dependency to BSP
-*         : 30.09.2015 1.50     Added dependency to BSP
-*         : 01.06.2018 1.70     Changed the default value of the following macro definition.
-*                                - BYTEQ_CFG_MAX_CTRL_BLKS - Changed the default value from 4 to 32.
-*         : 31.03.2021 1.90     Updated for queue protection.
-*         : 29.10.2021 2.00     Updated for critical section protection.
-***********************************************************************************************************************/
-#ifndef BYTEQ_CONFIG_H
-#define BYTEQ_CONFIG_H
-
-/***********************************************************************************************************************
-Includes   <System Includes> , "Project Includes"
-***********************************************************************************************************************/
-#include "platform.h"
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-
-/* SPECIFY WHETHER TO INCLUDE CODE FOR API PARAMETER CHECKING
-   Available settings:
-   BSP_CFG_PARAM_CHECKING_ENABLE:
-       Utilizes the system default setting
-   1:
-       Includes parameter checking
-   0:
-       Compiles out parameter checking
-*/
-#define BYTEQ_CFG_PARAM_CHECKING_ENABLE     (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-/* SPECIFY IF SHOULD USE MALLOC() TO ALLOCATE MEMORY FOR QUEUE CONTROL BLOCKS */
-#define BYTEQ_CFG_USE_HEAP_FOR_CTRL_BLKS    (0)
-
-/* SPECIFY NUMBER OF STATIC QUEUE CONTROL BLOCKS TO SUPPORT */
-/* valid only when BYTEQ_USE_HEAP_FOR_CTRL_BLKS is set to 0 */
-#define BYTEQ_CFG_MAX_CTRL_BLKS             (32)
-
-/* Selects to use disable interrupt to protect queue. */
-#define BYTEQ_CFG_PROTECT_QUEUE             (0)
-
-/* Selects to use disable interrupt to protect critical section. */
-#define BYTEQ_CFG_CRITICAL_SECTION          (0)
-
-#endif /* BYTEQ_CONFIG_H */
diff --git a/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_ether_rx_config.h b/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_ether_rx_config.h
deleted file mode 100644
index 18a21a62..00000000
--- a/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_ether_rx_config.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
- * DISCLAIMER
- * This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
- * other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
- * applicable laws, including copyright laws.
- * THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
- * THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
- * EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
- * SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS
- * SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
- * this software. By using this software, you agree to the additional terms and conditions found by accessing the
- * following link:
- * http://www.renesas.com/disclaimer
- *
- * Copyright (C) 2016 Renesas Electronics Corporation. All rights reserved.
- ***********************************************************************************************************************/
-/***********************************************************************************************************************
- * File Name    : r_ether_rx_config.h
- * Version      : 1.22
- * Description  : Ethernet module device driver
- ***********************************************************************************************************************/
-/**********************************************************************************************************************
- * History : DD.MM.YYYY Version  Description
- *         : 22.07.2014 1.00     First Release
- *         : 31.03.2016 1.01     Added changes for RX63N.
- *         : 01.10.2016 1.02     Added changes for RX65N.
- *         : 01.10.2017 1.03     Added changes for RX65N-2MB.
- *         : 08.01.2018 1.04     Changed comment.
- *         : 30.07.2019 1.17     Added changes for RX72M.
- *         : 22.11.2019 1.20     Added changes for RX72N.
- *         : 20.11.2021 1.22     Added config macro.
- ***********************************************************************************************************************/
-
-/* Guards against multiple inclusion */
-#ifndef R_ETHER_RX_CONFIG_H
-    #define R_ETHER_RX_CONFIG_H
-
-/***********************************************************************************************************************
- Macro definitions
- ***********************************************************************************************************************/
-
-/* Ethernet interface select.
- 0 = MII  (Media Independent Interface)
- 1 = RMII (Reduced Media Independent Interface)
- */
-    #define ETHER_CFG_MODE_SEL                          (1)
-
-/* PHY-LSI address setting for ETHER0/1.
- Please set the value 31 ETHER_CFG_CH0_PHY_ADDRESS when use default setting of the RSK+RX63N.
- Please set the value 30 ETHER_CFG_CH0_PHY_ADDRESS when use default setting of the RSK+RX65N/RSK+RX65N_2MB.
- Please set the value 0 ETHER_CFG_CH0_PHY_ADDRESS and value 1 ETHER_CFG_CH1_PHY_ADDRESS when use default
- setting of the RSK+RX64M/RSK+RX71M.
- Please set the value 1 ETHER_CFG_CH0_PHY_ADDRESS and value 2 ETHER_CFG_CH1_PHY_ADDRESS when use default
- setting of the RSK+RX72M.
- Please set the value 1 ETHER_CFG_CH1_PHY_ADDRESS when use default setting of the RSK+RX72N.
- */
-/* Please define the PHY-LSI address in the range of 0-31. */
-    #define ETHER_CFG_CH0_PHY_ADDRESS                   (5)
-    #define ETHER_CFG_CH1_PHY_ADDRESS                   (1)
-
-/* The number of Rx descriptors. */
-    #define ETHER_CFG_EMAC_RX_DESCRIPTORS               (6)
-
-/* The number of Tx descriptors. */
-    #define ETHER_CFG_EMAC_TX_DESCRIPTORS               (3)
-
-/* Please define the size of the sending and receiving buffer in the value where one frame can surely be stored 
- because the driver is single-frame/single-buffer processing.  */
-    #define ETHER_CFG_BUFSIZE                           (1536)  /* Must be 32-byte aligned */
-
-/* EINT interrupt priority level. This definition is not used when EINT interrupt is assigned to Group interrupt. */
-/* Please define the interruption level within the range of 1-15. */
-    #define ETHER_CFG_EINT_INT_PRIORITY                 (2)
-
-/* Group AL1 interrupt priority level. This definition is not used when EINT interrupt is assigned to Peripheral 
- interrupt. */
-/* Please define the interruption level within the range of 1-15. */
-    #define ETHER_CFG_AL1_INT_PRIORTY                   (2)
-
-/* The register bus of PHY0/1 for ETHER0/1 select
- 0 = The access of the register of PHY uses ETHER0.
- 1 = The access of the register of PHY uses ETHER1.
-
- Please set the value 0 ETHER_CFG_CH0_PHY_ACCESS when use default setting of the RSK+RX63N.
- Please set the value 0 ETHER_CFG_CH0_PHY_ACCESS when use default setting of the RSK+RX65N/RSK+RX65N_2MB.
- Please set the value 1 ETHER_CFG_CH0_PHY_ACCESS and ETHER_CFG_CH1_PHY_ACCESS when use default
- setting of the RSK+RX64M/RSK+RX71M.
- Please set the value 0 ETHER_CFG_CH0_PHY_ACCESS and ETHER_CFG_CH1_PHY_ACCESS when use default setting of the RSK+RX72M.
- Please set the value 1 ETHER_CFG_CH1_PHY_ACCESS when use default setting of the RSK+RX72N.
- */
-    #define ETHER_CFG_CH0_PHY_ACCESS                    (0)
-    #define ETHER_CFG_CH1_PHY_ACCESS                    (1)
-
-/* Define the access timing of MII/RMII register */
-    #define ETHER_CFG_PHY_MII_WAIT                      (8)     /* Please define the value of 1 or more */
-
-/* Define the waiting time for reset completion of PHY-LSI */
-    #define ETHER_CFG_PHY_DELAY_RESET                   (0x00020000L)
-
-/**
- * Link status read from LMON bit of ETHERC PSR register.  The state is hardware dependent.
- */
-    #define ETHER_CFG_LINK_PRESENT                      (1)
-
-/*  Use LINKSTA signal for detect link status changes
- 0 = unused  (use PHY-LSI status register)
- 1 = use     (use LINKSTA signal)
- */
-    #define ETHER_CFG_USE_LINKSTA                       (1)     /* This setting is reflected in all channels */
-
-/* Definition of whether or not to use KSZ8041NL of the Micrel Inc.
- 0 = unused
- 1 = use
- */
-    #define ETHER_CFG_USE_PHY_KSZ8041NL                 (0)
-
-/* Definition of whether or not to use ICS1894_32 of the Renesas Electronics Corporation.
- 0 = unused
- 1 = use
- */
-    #define ETHER_CFG_USE_PHY_ICS1894_32                (1)
-
-/* Definition of whether or not to use non blocking of PHY Management Station Operation
- 0 = unused
- 1 = use
-*/
-    #define ETHER_CFG_NON_BLOCKING                      (0)
-
-/* Define the clock of the PHY Management Station */
-    #define ETHER_CFG_PMGI_CLOCK                        (2500000)
-
-/* PHY Management Station Preamble Control
- 0 = Disable
- 1 = Enable
- */
-    #define ETHER_CFG_PMGI_ENABLE_PREAMBLE              (0)
-
-/* Define the Hold Time Adjustment of the PHY Management Station */
-    #define ETHER_CFG_PMGI_HOLD_TIME                    (0)
-
-/* Define the Capture Time Adjustment of the PHY Management Station */
-    #define ETHER_CFG_PMGI_CAPTURE_TIME                 (0)
-
-/* PMGI interrupt priority level. This definition is not used when PMGI interrupt is assigned to Peripheral
- interrupt. */
-    #define ETHER_CFG_PMGI_INT_PRIORTY                  (2)
-/***********************************************************************************************************************
- Typedef definitions
- ***********************************************************************************************************************/
-
-/***********************************************************************************************************************
- Exported global variables
- ***********************************************************************************************************************/
-
-/***********************************************************************************************************************
- Exported global functions (to be accessed by other files)
- ***********************************************************************************************************************/
-
-#endif /* R_ETHER_RX_CONFIG_H */
diff --git a/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_flash_rx_config.h b/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_flash_rx_config.h
deleted file mode 100644
index ef1be384..00000000
--- a/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_flash_rx_config.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
- * DISCLAIMER
- * This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
- * other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
- * applicable laws, including copyright laws.
- * THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
- * THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
- * EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
- * SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS
- * SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
- * this software. By using this software, you agree to the additional terms and conditions found by accessing the
- * following link:
- * http://www.renesas.com/disclaimer
- *
- * Copyright (C) 2014-2019 Renesas Electronics Corporation. All rights reserved.
- ***********************************************************************************************************************/
-/***********************************************************************************************************************
- * File Name    : r_flash_rx_config_reference.h
- * Description  : Configures the FLASH API module for RX200 and RX600 Series MCU's.
- ***********************************************************************************************************************/
-/***********************************************************************************************************************
-* History : DD.MM.YYYY Version Description
-*           12.04.2014 1.00    First Release
-*           22.12.2014 1.10    Added flash type usage comments.
-*           25.06.2015 1.20    Added FLASH_CFG_CODE_FLASH_RUN_FROM_ROM.
-*         : 12.10.2016 2.00    Modified for BSPless operation (added FLASH_CFG_USE_FIT_BSP).
-*         : 19.04.2019 4.00    Removed BSPless operation (FLASH_CFG_USE_FIT_BSP).
-*                              Removed flash type 2 only operation (FLASH_CFG_FLASH_READY_IPL).
-*                              Removed flash type 2 only operation (FLASH_CFG_IGNORE_LOCK_BITS).
-*         : 19.07.2019 4.20    Modified comments (FLASH_CFG_CODE_FLASH_ENABLE, FLASH_CFG_CODE_FLASH_RUN_FROM_ROM).
-*         : 09.09.2019 4.30    Modified comments (FLASH_CFG_CODE_FLASH_ENABLE, FLASH_CFG_CODE_FLASH_RUN_FROM_ROM).
-***********************************************************************************************************************/
-#ifndef FLASH_CONFIG_HEADER_FILE
-#define FLASH_CONFIG_HEADER_FILE
-
-/***********************************************************************************************************************
- Configuration Options
- ***********************************************************************************************************************/
-/* SPECIFY WHETHER TO INCLUDE CODE FOR API PARAMETER CHECKING
- * Setting to BSP_CFG_PARAM_CHECKING_ENABLE utilizes the system default setting
- * Setting to 1 includes parameter checking; 0 compiles out parameter checking
- */
-#define FLASH_CFG_PARAM_CHECKING_ENABLE     (1)
-
-
-/******************************************************************************
- ENABLE CODE FLASH PROGRAMMING
-******************************************************************************/
-/* If you are only using data flash, set this to 0.
- * Setting to 1 includes code to program the ROM area. When programming ROM,
- * code must be executed from RAM, except under certain restrictions for flash
- * type 3 (see section 2.16 in App Note). See section 2.15 in the App Note for
- * details on how to set up code and the linker to execute code from RAM.
- */
-#define FLASH_CFG_CODE_FLASH_ENABLE (1)
-
-
-/******************************************************************************
- ENABLE BGO/NON-BLOCKING DATA FLASH OPERATIONS
-******************************************************************************/
-/* Setting this to 0 forces data flash API function to block until completed.
- * Setting to 1 places the module in BGO (background operations) mode. In BGO 
- * mode, data flash operations return immediately after the operation has been 
- * started. Notification of the operation completion is done via the callback 
- * function. 
- */
-#define FLASH_CFG_DATA_FLASH_BGO   (1)
-
-
-/******************************************************************************
- ENABLE BGO/NON-BLOCKING CODE FLASH (ROM) OPERATIONS
-******************************************************************************/
-/* Setting this to 0 forces ROM API function to block until completed.
- * Setting to 1 places the module in BGO (background operations) mode. In BGO 
- * mode, ROM operations return immediately after the operation has been started.
- * Notification of the operation completion is done via the callback function. 
- * When reprogramming ROM, THE RELOCATABLE VECTOR TABLE AND CORRESPONDING
- * INTERRUPT ROUTINES MUST BE IN RAM.  
- * See sections 2.17 Usage Notes in the App Note.
- */
-#define FLASH_CFG_CODE_FLASH_BGO   (1)
-
-
-/******************************************************************************
- ENABLE CODE FLASH SELF-PROGRAMMING
-******************************************************************************/
-/* Set this to 0 when programming code flash while executing in RAM.
- * Set this to 1 when programming code flash while executing from another
- * segment in ROM (possible only with RX64M, RX71M, RX65N-2, RX72M groups).
- * See section 2.16 in the App Note.
- */
-#define FLASH_CFG_CODE_FLASH_RUN_FROM_ROM   (1)
-
-
-#endif /* FLASH_CONFIG_HEADER_FILE */
diff --git a/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_s12ad_rx_config.h b/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_s12ad_rx_config.h
deleted file mode 100644
index 3b94f537..00000000
--- a/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_s12ad_rx_config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer 
-*
-* Copyright (C) 2013 Renesas Electronics Corporation. All rights reserved.    
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name     : r_s12ad_rx_config.h
-* Description   : Configures the 12-bit A/D driver
-************************************************************************************************************************
-* History : DD.MM.YYYY Version Description
-*           22.07.2013 1.00    Initial Release.
-*           21.04.2014 1.20    Updated for RX210 advanced features; RX110/63x support.
-*           05.04.2019 4.00    Deleted the macro definition of ADC_CFG_PGA_GAIN.
-***********************************************************************************************************************/
-#ifndef S12AD_CONFIG_H
-#define S12AD_CONFIG_H
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-
-/*
- * SPECIFY WHETHER TO INCLUDE CODE FOR API PARAMETER CHECKING
- * Setting to BSP_CFG_PARAM_CHECKING_ENABLE utilizes the system default setting.
- * Setting to 1 includes parameter checking; 0 compiles out parameter checking.
- */
-#define ADC_CFG_PARAM_CHECKING_ENABLE   BSP_CFG_PARAM_CHECKING_ENABLE
-
-#endif /* S12AD_CONFIG_H */
diff --git a/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_sci_rx_config.h b/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_sci_rx_config.h
deleted file mode 100644
index 233903cf..00000000
--- a/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_sci_rx_config.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer 
-*
-* Copyright (C) 2013-2022 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name     : r_sci_rx_config.h
-* Description   : Configures the SCI driver
-************************************************************************************************************************
-* History : DD.MM.YYYY Version Description
-*           25.09.2013 1.00    Initial Release
-*           17.04.2014 1.20    Added comments for new RX110 support.
-*           02.07.2014 1.30    Fixed bug that caused Group12 rx errors to only be enabled for channel 2.
-*           25.11.2014 1.40    Added comments for RX113 support
-*           30.09.2015 1.70    Added comments for RX23T support
-*           01.10.2016 1.80    Added support for RX65N (comments and TX/RX FIFO THRESHOLD options)
-*           19.12.2016 1.90    Added comments for RX24U support
-*           07.03.2017 2.00    Added comments for RX130-512KB support
-*           28.09.2018 2.10    Added comments for RX66T support
-*           01.02.2019 2.20    Added comments for RX72T, RX65N-64pin support
-*                              Added support received data match function for RX65N
-*           28.06.2019 3.10    Added comments for RX23W support
-*           15.08.2019 3.20    Added support received data match function for RX72M (SCI0- SCI11)
-*                              Added support FIFO mode for RX72M (SCI7 - SCI11)
-*           25.11.2019 3.30    Added support RX13T.
-*                              Removed support for Generation 1 devices.
-*           30.12.2019 3.40    Added support RX66N, RX72N.
-*           31.03.2020 3.50    Added support RX23E-A.
-*           25.08.2020 3.60    Added feature using DTC/DMAC in SCI transfer.
-*                              Merged IrDA functionality to SCI FIT.
-*           31.03.2021 3.80    Added support for RX671.
-*                              Added support circular buffer in mode asynchronous.
-*           15.04.2021 3.90    Added support for RX140.
-*           31.03.2022 4.40    Added support for RX660.
-***********************************************************************************************************************/
-#ifndef SCI_CONFIG_H
-#define SCI_CONFIG_H
-
-#include "platform.h"
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-
-/* SPECIFY WHETHER TO INCLUDE CODE FOR API PARAMETER CHECKING */
-/* Setting to BSP_CFG_PARAM_CHECKING_ENABLE utilizes the system default setting */
-/* Setting to 1 includes parameter checking; 0 compiles out parameter checking */
-#define SCI_CFG_PARAM_CHECKING_ENABLE   (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-/* SPECIFY WHETHER TO INCLUDE CODE FOR DIFFERENT SCI MODES */
-/* Setting an equate to 1 includes code specific to that mode. */
-#define SCI_CFG_ASYNC_INCLUDED  (1)
-#define SCI_CFG_SYNC_INCLUDED   (0)
-#define SCI_CFG_SSPI_INCLUDED   (0)
-#define SCI_CFG_IRDA_INCLUDED   (0)
-
-/* Use circular buffer in mode asynchronous */
-/* 1=Use , 0=Unused */
-/* When SCI_CFG_USE_CIRCULAR is 1, please set BSP_CFG_RUN_IN_USER_MODE = 0  and BYTEQ_CFG_PROTECT_QUEUE = 1*/
-#define SCI_CFG_USE_CIRCULAR_BUFFER (0)
-
-/* SPECIFY BYTE VALUE TO TRANSMIT WHILE CLOCKING IN DATA IN SSPI MODES */
-#define SCI_CFG_DUMMY_TX_BYTE   (0xFF)
-
-/* SPECIFY CHANNELS TO INCLUDE SOFTWARE SUPPORT FOR 1=included, 0=not */
-/*
- * NOTE: If using ASYNC mode, adjust BYTEQ_CFG_MAX_CTRL_BLKS in r_byteq_config.h
- * to provide 2 queues per channel (static mode only).
- * * = port connector RSKRX11x
- * u = channel used by the USB-UART port (G1CUSB0)
- * a = this channel is used only for RX130-512KB
- * n = this channel is not available for RX65N-64pin.
- * s = this channel is not available in simple SPI mode.
- * i = this channel is available in IrDA interface.
- * RX MCU supported channels
- *
- * CH#  110 111 113 130 140 230  231  23T 24T 24U 64M 71M 65N 66T 72T 23W 72M 13T 72N 66N 23E-A 671 660
- * ---  --- --- --- --- --- --- ----- --- --- --- --- --- --- --- --- --- --- --- --- --- ----- --- ---
- * CH0           X   Xa      X    X                X   X   Xn              X       X   X          X   X
- * CH1   X   X*  X*  Xu   X  X    X    Xu  Xu  Xu  X   X   Xs  X   X   X   X   X   X   X    Xu    X   X
- * CH2           X                                 X   X   Xu              X       X   X          X   X
- * CH3                                             X   X   Xs              X       X   X          X   X
- * CH4                                             X   X   Xn              X       X   X          X   X
- * CH5   X   X   Xi  X    X  Xi   Xu,i X   X   X   X   X   X   X   X   Xi  X   X   X   X    X     X   X
- * CH6           X   X    X  X    X        X   X   X   X   Xn  X   X       Xu      X   X    X     X   X
- * CH7                                             Xu  Xu  Xn              X       X   X          X   X
- * CH8           X   Xa   X  X    X            X           X   X   X   Xu  X       X   X          X   X
- * CH9           X   Xa   X  X    X            X           Xs  X   X       X       X   X          X   X
- * CH10                                                    X               X       X   X          X   X
- * CH11                                        X           Xs  X   X       X       X   X          X   X
- * CH12  X   X   X   X    X  X    X                X   X   Xs  X   X   X   X   X   X   X    X     X   X
-*/
-                                   
-#define SCI_CFG_CH0_INCLUDED    (0)
-#define SCI_CFG_CH1_INCLUDED    (0)
-#define SCI_CFG_CH2_INCLUDED    (0)
-#define SCI_CFG_CH3_INCLUDED    (0)
-#define SCI_CFG_CH4_INCLUDED    (0)
-#define SCI_CFG_CH5_INCLUDED    (1)
-#define SCI_CFG_CH6_INCLUDED    (0)
-#define SCI_CFG_CH7_INCLUDED    (0)
-#define SCI_CFG_CH8_INCLUDED    (0)
-#define SCI_CFG_CH9_INCLUDED    (0)
-#define SCI_CFG_CH10_INCLUDED   (0)
-#define SCI_CFG_CH11_INCLUDED   (0)
-#define SCI_CFG_CH12_INCLUDED   (0)
-
-/* SPECIFY ASYNC MODE TX QUEUE BUFFER SIZES (will not allocate if chan not enabled */
-#define SCI_CFG_CH0_TX_BUFSIZ   (80)
-#define SCI_CFG_CH1_TX_BUFSIZ   (80)
-#define SCI_CFG_CH2_TX_BUFSIZ   (80)
-#define SCI_CFG_CH3_TX_BUFSIZ   (80)
-#define SCI_CFG_CH4_TX_BUFSIZ   (80)
-#define SCI_CFG_CH5_TX_BUFSIZ   (80)
-#define SCI_CFG_CH6_TX_BUFSIZ   (80)
-#define SCI_CFG_CH7_TX_BUFSIZ   (80)
-#define SCI_CFG_CH8_TX_BUFSIZ   (80)
-#define SCI_CFG_CH9_TX_BUFSIZ   (80)
-#define SCI_CFG_CH10_TX_BUFSIZ  (80)
-#define SCI_CFG_CH11_TX_BUFSIZ  (80)
-#define SCI_CFG_CH12_TX_BUFSIZ  (80)
-
-/* SPECIFY ASYNC MODE RX QUEUE BUFFER SIZES (will not allocate if chan not enabled */
-#define SCI_CFG_CH0_RX_BUFSIZ   (80)
-#define SCI_CFG_CH1_RX_BUFSIZ   (80)
-#define SCI_CFG_CH2_RX_BUFSIZ   (80)
-#define SCI_CFG_CH3_RX_BUFSIZ   (80)
-#define SCI_CFG_CH4_RX_BUFSIZ   (80)
-#define SCI_CFG_CH5_RX_BUFSIZ   (80)
-#define SCI_CFG_CH6_RX_BUFSIZ   (80)
-#define SCI_CFG_CH7_RX_BUFSIZ   (80)
-#define SCI_CFG_CH8_RX_BUFSIZ   (80)
-#define SCI_CFG_CH9_RX_BUFSIZ   (80)
-#define SCI_CFG_CH10_RX_BUFSIZ  (80)
-#define SCI_CFG_CH11_RX_BUFSIZ  (80)
-#define SCI_CFG_CH12_RX_BUFSIZ  (80)
-
-/* 
-* ENABLE TRANSMIT END INTERRUPT (ASYNCHRONOUS)
-* This interrupt only occurs when the last bit of the last byte of data 
-* has been sent and the transmitter has become idle. The interrupt calls
-* the user's callback function specified in R_SCI_Open() and passes it an
-* SCI_EVT_TEI event. A typical use of this feature is to disable an external
-* transceiver to save power. It would then be up to the user's code to 
-* re-enable the transceiver before sending again. Not including this feature
-* reduces code space used by the interrupt. Note that this equate is only
-* for including the TEI code. The interrupt itself must be enabled using an
-* R_SCI_Control(hdl, SCI_CMD_EN_TEI, NULL) call.
-*/
-#define SCI_CFG_TEI_INCLUDED    (1)      /* 1=included, 0=not */
-
-/* 
-* SET GROUPBL0 (ERI, TEI) INTERRUPT PRIORITY; RX64M/RX71M/RX65N/RX72M/RX72N/RX66N/RX671/RX660 ONLY
-* SET GROUPBL1; RX65N ONLY
-* SET GROUPAL0 (ERI,TEI) INTERRUPT PRIORITY; RX65N, RX72M, RX72N, RX66N ONLY
-* This sets the priority level for receiver overrun, framing, and parity errors
-* as well as TEI interrupts for all SCI channels.
-*/
-#define SCI_CFG_ERI_TEI_PRIORITY (3)     /* (RX64M/RX71M/RX65N/RX72M/RX72N/RX66N/RX671/RX660 ONLY) 1 lowest, 15 highest */
-
-/* ENABLE TX/RX FIFO; (SCIi supported MCU ONLY) 1=included, 0=not */
-#define SCI_CFG_CH7_FIFO_INCLUDED   (0)
-#define SCI_CFG_CH8_FIFO_INCLUDED   (0)
-#define SCI_CFG_CH9_FIFO_INCLUDED   (0)
-#define SCI_CFG_CH10_FIFO_INCLUDED  (0)
-#define SCI_CFG_CH11_FIFO_INCLUDED  (0)
-
-/* SET TX FIFO THRESHOLD; (SCIi supported MCU ONLY) 0 lowest, 15 highest */
-/* TX FIFO THRESHOLD is invalid in Clock Synchronous Mode and Simple SPI Mode. */
-/* Set the same value for TX FIFO THRESHOLD and RX FIFO THRESHOLD in Clock Synchronous Mode and Simple SPI Mode. */
-#define SCI_CFG_CH7_TX_FIFO_THRESH (8)
-#define SCI_CFG_CH8_TX_FIFO_THRESH (8)
-#define SCI_CFG_CH9_TX_FIFO_THRESH (8)
-#define SCI_CFG_CH10_TX_FIFO_THRESH (8)
-#define SCI_CFG_CH11_TX_FIFO_THRESH (8)
-
-/* SET RX FIFO THRESHOLD; (SCIi supported MCU ONLY) 1 lowest, 15 highest */
-#define SCI_CFG_CH7_RX_FIFO_THRESH (8)
-#define SCI_CFG_CH8_RX_FIFO_THRESH (8)
-#define SCI_CFG_CH9_RX_FIFO_THRESH (8)
-#define SCI_CFG_CH10_RX_FIFO_THRESH (8)
-#define SCI_CFG_CH11_RX_FIFO_THRESH (8)
-
-/* ENABLE Received Data match function (SCIj and SCIi supported MCU RX65N/RX66T/RX72T/RX72M/RX72N/RX66N ONLY) 1=included, 0=not */
-/*((SCIk and SCIm supported MCU RX671/RX660 ONLY) 1=included, 0=not */
-#define SCI_CFG_CH0_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH1_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH2_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH3_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH4_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH5_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH6_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH7_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH8_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH9_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH10_DATA_MATCH_INCLUDED (0)
-#define SCI_CFG_CH11_DATA_MATCH_INCLUDED (0)
-
-/* 0=Disable, 1=DTC, 2=DMAC */
-#define SCI_CFG_CH0_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH1_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH2_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH3_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH4_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH5_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH6_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH7_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH8_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH9_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH10_TX_DTC_DMACA_ENABLE (0)
-#define SCI_CFG_CH11_TX_DTC_DMACA_ENABLE (0)
-#define SCI_CFG_CH12_TX_DTC_DMACA_ENABLE (0)
-
-#define SCI_CFG_CH0_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH1_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH2_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH3_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH4_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH5_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH6_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH7_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH8_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH9_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH10_RX_DTC_DMACA_ENABLE (0)
-#define SCI_CFG_CH11_RX_DTC_DMACA_ENABLE (0)
-#define SCI_CFG_CH12_RX_DTC_DMACA_ENABLE (0)
-
-/* 0~7 8 channels dmac, but maximum of SCI channel is 13 channel => cost 13*2 = 26 dmac channels in case all of sci channels run simultaneously */
-#define SCI_CFG_CH0_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH1_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH2_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH3_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH4_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH5_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH6_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH7_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH8_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH9_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH10_TX_DMACA_CH_NUM     (0)
-#define SCI_CFG_CH11_TX_DMACA_CH_NUM     (0)
-#define SCI_CFG_CH12_TX_DMACA_CH_NUM     (0)
-
-#define SCI_CFG_CH0_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH1_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH2_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH3_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH4_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH5_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH6_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH7_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH8_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH9_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH10_RX_DMACA_CH_NUM     (1)
-#define SCI_CFG_CH11_RX_DMACA_CH_NUM     (1)
-#define SCI_CFG_CH12_RX_DMACA_CH_NUM     (1)
-
-/* Set enable/ disable transmit signal transition timing adjust feature for each channel*/
-#define SCI_CFG_CH0_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH1_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH2_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH3_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH4_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH5_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH6_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH7_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH8_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH9_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH10_TX_SIGNAL_TRANSITION_TIMING_INCLUDED   (0)
-#define SCI_CFG_CH11_TX_SIGNAL_TRANSITION_TIMING_INCLUDED   (0)
-
-/* Set enable/ disable receive data sampling timing adjust feature for each channel*/
-#define SCI_CFG_CH0_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH1_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH2_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH3_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH4_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH5_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH6_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH7_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH8_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH9_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH10_RX_DATA_SAMPLING_TIMING_INCLUDED   (0)
-#define SCI_CFG_CH11_RX_DATA_SAMPLING_TIMING_INCLUDED   (0)
-
-/* SPECIFY IRDA CHANNELS TO INCLUDE SOFTWARE (SUPPORTED MCU RX113/RX23W/RX231/RX230 ONLY) 1=included, 0=not */
-#define SCI_CFG_CH5_IRDA_INCLUDED    (0)
-
-/* Set the non-active level of the TXD pin */
-/* 1=High , 0=Low */
-#define SCI_CFG_CH5_IRDA_IRTXD_INACTIVE_LEVEL (1)
-
-/* Set the non-active level of the RXD pin */
-/* 1=High , 0=Low */
-#define SCI_CFG_CH5_IRDA_IRRXD_INACTIVE_LEVEL (1)
-
-#endif /* SCI_CONFIG_H */
diff --git a/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_tsip_rx_config.h b/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_tsip_rx_config.h
deleted file mode 100644
index a8d7db11..00000000
--- a/Configuration/samples/common/ck-rx65n/ether/src/smc_gen/r_config/r_tsip_rx_config.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* Generated configuration header file - do not edit */
-/**********************************************************************************************************************
- * DISCLAIMER
- * This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
- * other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
- * applicable laws, including copyright laws.
- * THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
- * THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
- * EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
- * SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO
- * THIS SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
- * this software. By using this software, you agree to the additional terms and conditions found by accessing the
- * following link:
- * http://www.renesas.com/disclaimer
- *
- * Copyright (C) 2015-2023 Renesas Electronics Corporation. All rights reserved.
- *********************************************************************************************************************/
-/**********************************************************************************************************************
- * File Name    : r_tsip_rx_config.h
- * Version      : 1.17
- * Description  : Configuration options for the r_tsip_rx module.
- *********************************************************************************************************************/
-/**********************************************************************************************************************
- * History : DD.MM.YYYY Version  Description
- *         : 27.06.2015 1.00     First Release
- *         : 15.05.2017 1.01     Add AES-CMAC
- *         : 30.09.2017 1.03     Add Init/Update/Final API and SHA, RSA
- *         : 28.02.2018 1.04     Change Init/Update/Final API for RX231, add TLS function and 
- *         :                     return values change FIT rules.
- *         : 30.04.2018 1.05     Add TDES, MD5 and RSAES-PKCS1-v1_5 API
- *         : 28.09.2018 1.06     Add RSA Key Generation, AES, TDES, RSA Key update features, RX66T support
- *         : 28.12.2018 1.07     Add RX72T support
- *         : 30.09.2019 1.08     Added support for GCC and IAR compiler, ECC API, RX23W and RX72M
- *         : 31.03.2020 1.09     Added support for AES-CCM, HMAC key generation, ECDH, Key wrap API, RX66N and RX72N
- *         : 30.06.2020 1.10     Added support for ARC4, ECC(P-384) API
- *         : 30.09.2020 1.11     Added support for DH, ECDHE P-512r1 API, and generalization of KDF.
- *         :                     Added support for Key wrap API with TSIP-Lite.
- *         : 30.06.2021 1.12     Added support for RX23W chip version D
- *         : 31.08.2021 1.13     Added support for RX671
- *         : 22.10.2021 1.14     Added support for TLS1.3
- *         : 31.03.2022 1.15     Added support for TLS1.3(RX72M_RX72N_RX66N)
- *         : 15.09.2022 1.16     Added support for RSA 3k/4k and updated support for TLS1.3
- *         : 20.01.2023 1.17     Added support for TLS1.3 server
- *********************************************************************************************************************/
-
-/**********************************************************************************************************************
- Macro definitions
- *********************************************************************************************************************/
-
-#ifndef R_TSIP_RX_CONFIG_HEADER_FILE
-#define R_TSIP_RX_CONFIG_HEADER_FILE
-
-/* For AES operation. */
-#define TSIP_AES_128_ECB_ENCRYPT    (1)
-#define TSIP_AES_256_ECB_ENCRYPT    (1)
-#define TSIP_AES_128_ECB_DECRYPT    (1)
-#define TSIP_AES_256_ECB_DECRYPT    (1)
-#define TSIP_AES_128_CBC_ENCRYPT    (1)
-#define TSIP_AES_256_CBC_ENCRYPT    (1)
-#define TSIP_AES_128_CBC_DECRYPT    (1)
-#define TSIP_AES_256_CBC_DECRYPT    (1)
-#define TSIP_AES_128_CTR            (1)
-#define TSIP_AES_256_CTR            (1)
-#define TSIP_AES_128_GCM_ENCRYPT    (1)
-#define TSIP_AES_256_GCM_ENCRYPT    (1)
-#define TSIP_AES_128_GCM_DECRYPT    (1)
-#define TSIP_AES_256_GCM_DECRYPT    (1)
-#define TSIP_AES_128_CMAC           (1)
-#define TSIP_AES_256_CMAC           (1)
-#define TSIP_AES_128_CCM_ENCRYPT    (1)
-#define TSIP_AES_256_CCM_ENCRYPT    (1)
-#define TSIP_AES_128_CCM_DECRYPT    (1)
-#define TSIP_AES_256_CCM_DECRYPT    (1)
-#define TSIP_AES_128_KEY_WRAP       (1)
-#define TSIP_AES_256_KEY_WRAP       (1)
-
-/* For TDES operation. */
-#define TSIP_TDES_ECB_ENCRYPT   (1)
-#define TSIP_TDES_ECB_DECRYPT   (1)
-#define TSIP_TDES_CBC_ENCRYPT   (1)
-#define TSIP_TDES_CBC_DECRYPT   (1)
-
-/* For ARC4 operation. */
-#define TSIP_ARC4_ENCRYPT   (1)
-#define TSIP_ARC4_DECRYPT   (1)
-
-/* For HASH operation. */
-#define TSIP_SHA_1      (1)
-#define TSIP_SHA_256    (1)
-#define TSIP_MD5        (1)
-
-/* For HMAC operation. */
-#define TSIP_SHA_1_HMAC     (1)
-#define TSIP_SHA_256_HMAC   (1)
-
-/* For RSA operation. */
-#define TSIP_RSAES_1024         (1)
-#define TSIP_RSAES_2048         (1)
-#define TSIP_RSAES_3072         (1)
-#define TSIP_RSAES_4096         (1)
-#define TSIP_RSASSA_1024        (1)
-#define TSIP_RSASSA_2048        (1)
-#define TSIP_RSASSA_3072        (1)
-#define TSIP_RSASSA_4096        (1)
-    /* 5*(key_length/2) is recommended by NIST FIPS186-4, 5120 is for key_length = 2048. *2 means the margin. */
-#define TSIP_RSA_RETRY_COUNT_FOR_RSA_KEY_GENERATION (5120*2)
-
-/* For ECC operation. */
-#define TSIP_ECDSA_P192            (1)
-#define TSIP_ECDSA_P224            (1)
-#define TSIP_ECDSA_P256            (1)
-#define TSIP_ECDSA_P384            (1)
-#define TSIP_ECDH_P256             (1)
-#define TSIP_USER_SHA_384_ENABLED  (0)
-#define TSIP_USER_SHA_384_FUNCTION (user_sha384_function)
-
-/* For TLS. */
-#define TSIP_TLS    (1)
-
-/* Firmware update. */
-#define TSIP_SECURE_BOOT        (0)
-#define TSIP_FIRMWARE_UPDATE    (1)
-
-/* For multi threading */
-#define TSIP_MULTI_THREADING                    (0)
-#define TSIP_MULTI_THREADING_LOCK_FUNCTION      (user_lock_function)
-#define TSIP_MULTI_THREADING_UNLOCK_FUNCTION    (user_unlock_function)
-
-/* Key update. */
-#if defined BSP_MCU_RX231 || defined BSP_MCU_RX23W || defined BSP_MCU_RX66T || defined BSP_MCU_RX72T
-#define TSIP_INSTALL_KEY_RING_INDEX (0) /* 0-15 */
-#else
-#define TSIP_INSTALL_KEY_RING_INDEX (1) /* 0-15 */
-#endif  /* defined BSP_MCU_RX231 || defined BSP_MCU_RX23W || defined BSP_MCU_RX66T || defined BSP_MCU_RX72T */
-
-#endif /* R_TSIP_RX_CONFIG_HEADER_FILE */
diff --git a/Configuration/samples/common/ck-rx65n/wifi/CK-RX65N_wifi_scfg.ftl b/Configuration/samples/common/ck-rx65n/wifi/CK-RX65N_wifi_scfg.ftl
deleted file mode 100644
index cd855332..00000000
--- a/Configuration/samples/common/ck-rx65n/wifi/CK-RX65N_wifi_scfg.ftl
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<smc>
-    <general version="2.0.0.0">
-        <configuration active="true" id="${configurationTypeReleaseID}">
-            <property id="com.renesas.smc.service.project.buildArtefactType" values="com.renesas.smc.service.project.buildArtefactType.exe"/>
-            <toolchain id="${toolChainID}">
-                <option id="com.renesas.smc.toolchain.option.buildArtefactType" key="com.renesas.smc.toolchain.option.buildArtefactType.exe"/>
-                <option id="com.renesas.smc.toolchain.option.rtos" key="com.renesas.smc.toolchain.option.rtos.freertoslts">
-                    <item id="com.renesas.smc.toolchain.option.rtos.freertoslts" value="${packageVersion}"/>
-                </option>
-            </toolchain>
-        </configuration>
-        <platform id="${targetDevice}"/>
-    </general>
-    <tool id="SWComponent" version="1.0.0.0">
-        <configuration inuse="true" name="r_bsp">
-            <component display="r_bsp" id="r_bsp7.20" version="7.20">
-                <gridItem id="BSP_CFG_HEAP_BYTES" selectedIndex="0x1000"/>
-                <gridItem id="BSP_CFG_SCI_UART_TERMINAL_ENABLE" selectedIndex="1"/>
-                <gridItem id="BSP_CFG_SCI_UART_TERMINAL_CHANNEL" selectedIndex="5"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_s12ad_rx">
-            <component detailDescription="ADC Driver" display="r_s12ad_rx" id="r_s12ad_rx5.00" version="5.00">
-                <gridItem id="AN115" selectedIndex="1"/>
-                <gridItem id="AN117" selectedIndex="1"/>
-                <gridItem id="ADTRG0#" selectedIndex="1"/>
-                <gridItem id="S12AD1" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_flash_rx">
-            <component display="r_flash_rx" id="r_flash_rx5.00" version="5.00">
-                <gridItem id="FLASH_CFG_PARAM_CHECKING_ENABLE" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_CODE_FLASH_ENABLE" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_DATA_FLASH_BGO" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_CODE_FLASH_BGO" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_CODE_FLASH_RUN_FROM_ROM" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_irq_rx">
-            <component display="r_irq_rx" id="r_irq_rx4.00" version="4.00">
-                <gridItem id="IRQ1" selectedIndex="1"/>
-                <gridItem id="IRQ2" selectedIndex="1"/>
-                <gridItem id="IRQ7" selectedIndex="1"/>
-                <gridItem id="IRQ13" selectedIndex="1"/>
-                <gridItem id="IRQ14" selectedIndex="1"/>
-                <gridItem id="IRQ15" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_wifi_da16xxx">
-            <component display="r_wifi_da16xxx" id="r_wifi_da16xxx1.10" version="1.10">
-                <gridItem id="WIFI_CFG_DA16600_SUPPORT" selectedIndex="1"/>
-                <gridItem id="WIFI_CFG_SCI_CHANNEL" selectedIndex="6"/>
-                <gridItem id="WIFI_CFG_CTS_SW_CTRL" selectedIndex="1"/>
-                <gridItem id="WIFI_CFG_CTS_PORT" selectedIndex="18"/>
-                <gridItem id="WIFI_CFG_RTS_PORT" selectedIndex="18"/>
-                <gridItem id="WIFI_CFG_PFS_SET_VALUE" selectedIndex="0x0AU"/>
-                <gridItem id="WIFI_CFG_RESET_PORT" selectedIndex="5"/>
-                <gridItem id="WIFI_CFG_RESET_PIN" selectedIndex="5"/>
-                <gridItem id="WIFI_CFG_CREATABLE_SOCKETS" selectedIndex="4"/>
-                <gridItem id="WIFI_CFG_AT_CMD_TX_BUFFER_SIZE" selectedIndex="1500"/>
-                <gridItem id="WIFI_CFG_SNTP_ENABLE" selectedIndex="1"/>
-                <gridItem id="WIFI_CFG_USE_FREERTOS_LOGGING" selectedIndex="1"/>
-                <gridItem id="WIFI_CFG_DEBUG_LOG" selectedIndex="4"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_sci_rx">
-            <component detailDescription="Multi-Channel Multi-Mode SCI Driver." display="r_sci_rx" id="r_sci_rx4.40" version="4.40">
-                <gridItem id="RXD5/SMISO5/SSCL5" selectedIndex="1"/>
-                <gridItem id="TXD5/SMOSI5/SSDA5" selectedIndex="1"/>
-                <gridItem id="SCI5" selectedIndex="1"/>
-                <gridItem id="RXD6/SMISO6/SSCL6" selectedIndex="1"/>
-                <gridItem id="TXD6/SMOSI6/SSDA6" selectedIndex="1"/>
-                <gridItem id="CTS6#/RTS6#/SS6#" selectedIndex="1"/>
-                <gridItem id="SCI6" selectedIndex="1"/>
-                <gridItem id="SCI_CFG_CH1_INCLUDED" selectedIndex="0"/>
-                <gridItem id="SCI_CFG_CH5_INCLUDED" selectedIndex="1"/>
-                <gridItem id="SCI_CFG_CH6_INCLUDED" selectedIndex="1"/>
-                <gridItem id="SCI_CFG_CH6_TX_BUFSIZ" selectedIndex="2180"/>
-                <gridItem id="SCI_CFG_CH6_RX_BUFSIZ" selectedIndex="8192"/>
-                <gridItem id="SCI_CFG_TEI_INCLUDED" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_byteq">
-            <component display="r_byteq" id="r_byteq2.00" version="2.00">
-                <gridItem id="BYTEQ_CFG_PARAM_CHECKING_ENABLE" selectedIndex="0"/>
-                <gridItem id="BYTEQ_CFG_USE_HEAP_FOR_CTRL_BLKS" selectedIndex="0"/>
-                <gridItem id="BYTEQ_CFG_MAX_CTRL_BLKS" selectedIndex="32"/>
-                <gridItem id="BYTEQ_CFG_PROTECT_QUEUE" selectedIndex="0"/>
-                <gridItem id="BYTEQ_CFG_CRITICAL_SECTION" selectedIndex="0"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_tsip_rx">
-            <component display="r_tsip_rx" id="r_tsip_rx1.17.l" version="1.17.l"/>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration enable="true" exclude="false" inuse="true" name="FreeRTOS_Kernel">
-            <component display="FreeRTOS Kernel" id="FreeRTOS_Kernel${packageVersion}" version="${packageVersion}">
-                <gridItem id="configMINIMAL_STACK_SIZE" selectedIndex="768"/>
-                <gridItem id="configUSE_TICK_HOOK" selectedIndex="1"/>
-                <gridItem id="configUSE_IDLE_HOOK" selectedIndex="1"/>
-                <gridItem id="configUSE_MALLOC_FAILED_HOOK" selectedIndex="1"/>
-                <gridItem id="configCHECK_FOR_STACK_OVERFLOW" selectedIndex="2"/>
-                <gridItem id="configCOMMAND_INT_MAX_OUTPUT_SIZE" selectedIndex="850"/>
-                <gridItem id="configIP_ADDR0" selectedIndex="192"/>
-                <gridItem id="configIP_ADDR1" selectedIndex="168"/>
-                <gridItem id="configIP_ADDR2" selectedIndex="11"/>
-                <gridItem id="configIP_ADDR3" selectedIndex="12"/>
-            </component>
-            <source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
-        </configuration>
-        <configuration enable="true" exclude="false" inuse="true" name="LittleFS">
-            <component display="LittleFS" id="LittleFS${packageVersion}" version="${packageVersion}">
-                <gridItem id="RM_LITTLEFS_FLASH_DATA_START" selectedIndex="FLASH_DF_BLOCK_0_MACRO"/>
-            </component>
-            <source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
-        </configuration>
-        <configuration enable="true" exclude="false" inuse="true" name="FreeRTOS Object">
-            <allocatable id="OBJECT" name="OBJECT" type="">
-                <allocatable id="TASK" name="TASK" type="">
-                    <allocatable id="TASKOBJECTLINK1" name="TASK" type="" readonly="true">
-                        <option defaultValue="1" id="Initialize" value="0"/>
-                        <option defaultValue="task_[X]" id="TaskCode" value="main_task"/>
-                        <option defaultValue="task_[X]" id="TaskName" value="MAIN_TASK"/>
-                        <option defaultValue="512" id="StackSize" value="512"/>
-                        <option defaultValue="NULL" id="TaskHandler" value="NULL"/>
-                        <option defaultValue="NULL" id="Parameter" value="NULL"/>
-                        <option defaultValue="1" id="Priority" value="1"/>
-                    </allocatable>
-                    <option defaultValue="0" id="LinkNum" value="1"/>
-                </allocatable>
-                <allocatable id="QUEUE" name="QUEUE" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="SEMAPHORE" name="SEMAPHORE" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="SWTIMER" name="SWTIMER" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="EVENTGROUP" name="EVENTGROUP" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="STREAMBUFFER" name="STREAMBUFFER" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="MESSAGEBUFFER" name="MESSAGEBUFFER" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-            </allocatable>
-            <component description="" detailDescription="" display="FreeRTOS Object" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.freertos.object" version="1.0.120"/>
-            <source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
-        </configuration>
-    </tool>
-    <tool id="System">
-        <section id="ocd">
-            <option enabled="true" id="debugIF" selection="fine">
-                <item enabled="true" id="unused"/>
-                <item enabled="true" id="fine"/>
-                <item enabled="true" id="jtag"/>
-                <item enabled="true" id="jtagTrace"/>
-            </option>
-        </section>
-    </tool>
-</smc>
diff --git a/Configuration/samples/common/ck-rx65n/wifi/README.md b/Configuration/samples/common/ck-rx65n/wifi/README.md
deleted file mode 100644
index 4e0eeb46..00000000
--- a/Configuration/samples/common/ck-rx65n/wifi/README.md
+++ /dev/null
@@ -1,44 +0,0 @@
----------------
-1. Usage Notes
----------------
-  
-1.1. Please make sure SCI6 is configured to use CTS#6, instead of RTS6#.  
-This is required by the DA16600 Wi-Fi PMOD module.  
-  
-1.2. Please take note that the sample project is verified with C project.  
-If you create new project with C++ option, please confirm its behaviour by yourself.  
-For example, if you create project with C++ option and CC-RX compiler, you will need to add abort() function manually.  
-  
-1.3. This sample project requires a "DUAL" device setting.  
-If using e2studio_2024-01 and earlier, and "non-DUAL" target board (e.g: CK-RX65N) is selected in the PG wizard, please change to "DUAL" device following the steps below:  
-###
-        1. In the Smart Configurator window, select the Board tab to open the Device selection window.
-        2. Click the ... button next to Board: to open the Change Device window.
-        3. In the Change Device window, change the value of the Target Device: item to R5F565NEHxFB_DUAL.
-            (You can click the ... button to the right of the text entry field to choose from a list of candidates.
-            Leave the Target Board: setting of Custom unchanged.)
-        4. After changing the device, click the Next > button.
-            On the information window that appears, click the Next > button again without making changes.
-        5. Finally, a window appears asking you to confirm the change. Click the Finish button.
-            (If a window asking you to confirm a change of target board appears, click the Yes button.)
-  
-1.4 If using e2studio_2024-04 and later, and Bank Mode is configured as "Single Bank" in the PG wizard, please change to "Dual Bank" following the steps below:  
-###
-        1. In the Smart Configurator window, select the Board tab to open the Device configuration window.
-        2. Change the value of the Bank Mode: item to "Dual Bank".
-        3. Click "Generate Code" to apply the changes.
-  
-1.5. After device/bank mode is changed, compiler setting is reset, please update the linker settings following the steps below:  
-###
-      - Under [Project] > [C/C++ Project Settings]:
-      - For CC-RX,
-        1. Go to Linker > Section, click Import...
-        2. Select "linker_section_sample.esi" under src folder of current project.
-  
-1.6. Please make sure to configure Smart Configurator 'Code generation behavior' to 'Update configuration files'.  
-You can do so in e2studio Windows > Preferences > Renesas > Smart Configurator > Component.  
-This is necessary because the FWUP module uses custom wrapper code for this application, this Smart Configurator setting ensures that wrapper code is not overwritten.  
-  
-1.7. Issue with added sections when generating code.  
-After generating code by Smart Configurator, sections (C_FIRMWARE_UPDATE_CONTROL_BLOCK and C_FIRMWARE_UPDATE_CONTROL_BLOCK_MIRROR) are added at address 0x00100000 due to the TSIP module (v1.17.l and above).  
-They are empty sections and will not use any additional memory.
\ No newline at end of file
diff --git a/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_bsp_config.h b/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_bsp_config.h
deleted file mode 100644
index 9e38ff28..00000000
--- a/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_bsp_config.h
+++ /dev/null
@@ -1,743 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer
-*
-* Copyright (C) 2017 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name    : r_bsp_config_reference.h
-* Device(s)    : RX65N
-* Description  : The file r_bsp_config.h is used to configure your BSP. r_bsp_config.h should be included
-*                somewhere in your package so that the r_bsp code has access to it. This file (r_bsp_config_reference.h)
-*                is just a reference file that the user can use to make their own r_bsp_config.h file.
-************************************************************************************************************************
-* History : DD.MM.YYYY Version   Description
-*         : 15.05.2017 1.00      First Release
-*         : 01.12.2017 1.01      Added the following macro definition.
-*                                - BSP_CFG_EBMAPCR_1ST_PRIORITY
-*                                - BSP_CFG_EBMAPCR_2ND_PRIORITY
-*                                - BSP_CFG_EBMAPCR_3RD_PRIORITY
-*                                - BSP_CFG_EBMAPCR_4TH_PRIORITY
-*                                - BSP_CFG_EBMAPCR_5TH_PRIORITY
-*         : 01.07.2018 1.02      Added the following macro definition.
-*                                - BSP_CFG_CONFIGURATOR_SELECT
-*                                Add RTOS support. FreeRTOS. Define a timer for RTOS.
-*         : 27.07.2018 1.03      Modified the comment of PLL clock source.
-*                                Added the following macro definition for ID code protection.
-*                                 - BSP_CFG_ID_CODE_LONG_1
-*                                 - BSP_CFG_ID_CODE_LONG_2
-*                                 - BSP_CFG_ID_CODE_LONG_3
-*                                 - BSP_CFG_ID_CODE_LONG_4
-*                                Added the following macro definition.
-*                                 - BSP_CFG_FIT_IPL_MAX
-*         : 31.10.2018 1.04      Added support for RX651 with 64 pin package.
-*         : 28.02.2019 2.00      Added support for GNUC and ICCRX.
-*                                Fixed coding style.
-*         : 26.07.2019 2.01      Modified comment.
-*         : 08.10.2019 2.02      Added the following macro definition.
-*                                - BSP_CFG_SWINT_UNIT1_ENABLE
-*                                - BSP_CFG_SWINT_UNIT2_ENABLE
-*                                - BSP_CFG_SWINT_TASK_BUFFER_NUMBER
-*                                - BSP_CFG_SWINT_IPR_INITIAL_VALUE
-*                                Modified comment for added support of Renesas RTOS (RI600V4 or RI600PX).
-*                                Added the following macro definition.
-*                                - BSP_CFG_RENESAS_RTOS_USED
-*         : 31.07.2020 2.03      Modified comment.
-*         : 29.01.2021 2.04      Added the following macro definition.
-*                                - BSP_CFG_SCI_UART_TERMINAL_ENABLE
-*                                - BSP_CFG_SCI_UART_TERMINAL_CHANNEL
-*                                - BSP_CFG_SCI_UART_TERMINAL_BITRATE
-*                                - BSP_CFG_SCI_UART_TERMINAL_INTERRUPT_PRIORITY
-*         : 26.02.2021 2.05      Added a comment for Azure RTOS to BSP_CFG_RTOS_USED.
-*         : 30.11.2021 3.00      Added the following macro definitions.
-*                                - BSP_CFG_MAIN_CLOCK_OSCILLATE_ENABLE
-*                                - BSP_CFG_SUB_CLOCK_OSCILLATE_ENABLE
-*                                - BSP_CFG_HOCO_OSCILLATE_ENABLE
-*                                - BSP_CFG_LOCO_OSCILLATE_ENABLE
-*                                - BSP_CFG_IWDT_CLOCK_OSCILLATE_ENABLE
-*                                - BSP_CFG_CONFIGURATOR_VERSION
-*                                - BSP_CFG_CPLUSPLUS
-*                                - BSP_CFG_SERIAL_PROGRAMMER_CONECT_ENABLE
-*                                Changed initial value of the following macro definitions.
-*                                - BSP_CFG_MCU_PART_GROUP
-*                                - BSP_CFG_MCU_PART_SERIES
-*         : 11.02.2022 3.01      Changed initial value of the following macro definitions.
-*                                - BSP_CFG_SWINT_UNIT1_ENABLE
-*                                - BSP_CFG_SWINT_UNIT2_ENABLE
-***********************************************************************************************************************/
-#ifndef R_BSP_CONFIG_REF_HEADER_FILE
-#define R_BSP_CONFIG_REF_HEADER_FILE
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-
-/* NOTE:
-   The default settings are the same as when using RSKRX65N-2MB.
-   Change to the settings for the user board.
-*/
-
-/* Start up select
-   0 = Enable BSP startup program.
-   1 = Disable BSP startup program. (e.g. Using user startup program.)
-   NOTE: This setting is available only when using CCRX. */
-#define BSP_CFG_STARTUP_DISABLE (0)
-
-/* Enter the product part number for your MCU. This information will be used to obtain information about your MCU such 
-   as package and memory size.
-   To help parse this information, the part number will be defined using multiple macros.
-   R 5 F 56 5N E D D FP
-   | | | |  |  | | | |  Macro Name                             Description
-   | | | |  |  | | | |__BSP_CFG_MCU_PART_PACKAGE             = Package type, number of pins, and pin pitch
-   | | | |  |  | | |____not used                             = Products with wide temperature range
-   | | | |  |  | |______BSP_CFG_MCU_PART_ENCRYPTION_INCLUDED = Encryption module included/not included
-   | | | |  |  |________BSP_CFG_MCU_PART_MEMORY_SIZE         = ROM, RAM, and Data Flash Capacity
-   | | | |  |___________BSP_CFG_MCU_PART_GROUP               = Group name
-   | | | |______________BSP_CFG_MCU_PART_SERIES              = Series name
-   | | |________________BSP_CFG_MCU_PART_MEMORY_TYPE         = Type of memory (Flash, ROMless)
-   | |__________________not used                             = Renesas MCU
-   |____________________not used                             = Renesas semiconductor product.
-*/
-
-/* Package type. Set the macro definition based on values below:
-   Character(s) = Value for macro = Package Type/Number of Pins/Pin Pitch
-   FC           = 0x0             = LFQFP/176/0.50
-   BG           = 0x1             = LFBGA/176/0.80
-   LC           = 0x2             = TFLGA/177/0.50
-   FB           = 0x3             = LFQFP/144/0.50
-   LK           = 0x4             = TFLGA/145/0.50
-   FP           = 0x5             = LFQFP/100/0.50
-   FM           = 0x8             = LFQFP/64/0.50
-   LJ           = 0xA             = TFLGA/100/0.65
-   BP           = 0xC             = TFBGA/64/0.50
-*/
-#define BSP_CFG_MCU_PART_PACKAGE        (0x3) /* Generated value. Do not edit this manually */
-
-/* Whether Encryption and SDHI/SDSI are included or not.
-   Character(s) = Value for macro = Description
-   A            = false           = Encryption module not included, SDHI/SDSI module not included
-   B            = false           = Encryption module not included, SDHI/SDSI module included
-   D            = false           = Encryption module not included, SDHI/SDSI module included, dual-bank structure
-   E            = true            = Encryption module included, SDHI/SDSI module not included
-   F            = true            = Encryption module included, SDHI/SDSI module included
-   H            = true            = Encryption module included, SDHI/SDSI module included, dual-bank structure
-*/
-#define BSP_CFG_MCU_PART_ENCRYPTION_INCLUDED   (true) /* Generated value. Do not edit this manually */
-
-/* ROM, RAM, and Data Flash Capacity.
-   Character(s) = Value for macro = ROM Size/Ram Size/Data Flash Size
-   4            = 0x4             = 512KB/256KB/Not equipped
-   7            = 0x7             = 768KB/256KB/Not equipped
-   9            = 0x9             = 1MB/256KB/Not equipped
-   C            = 0xC             = 1.5MB/640KB/32KB
-   E            = 0xE             = 2MB/640KB/32KB
-   NOTE: When the RAM capacity is 640KB, the RAM areas are not contiguous.
-*/
-#define BSP_CFG_MCU_PART_MEMORY_SIZE    (0xE) /* Generated value. Do not edit this manually */
-
-/* Group name.
-   Character(s) = Description
-   5N/51        = RX65N Group/RX651 Group
-*/
-#define BSP_CFG_MCU_PART_GROUP          "RX65N" /* Generated value. Do not edit this manually */
-
-/* Series name.
-   Character(s) = Description
-   56           = RX600 Series
-*/
-#define BSP_CFG_MCU_PART_SERIES         "RX600" /* Generated value. Do not edit this manually */
-
-/* Memory type.
-   Character(s) = Value for macro = Description
-   F            = 0x0             = Flash memory version
-*/
-#define BSP_CFG_MCU_PART_MEMORY_TYPE    (0x0) /* Generated value. Do not edit this manually */
-
-/* Whether to use 1 stack or 2. RX MCUs have the ability to use 2 stacks: an interrupt stack and a user stack.
- * When using 2 stacks the user stack will be used during normal user code. When an interrupt occurs the CPU
- * will automatically shift to using the interrupt stack. Having 2 stacks can make it easier to figure out how
- * much stack space to allocate since the user does not have to worry about always having enough room on the
- * user stack for if-and-when an interrupt occurs. Some users will not want 2 stacks though because it is not
- * needed in all applications and can lead to wasted RAM (i.e. space in between stacks that is not used).
- * If only 1 stack is used then the interrupt stack is the one that will be used. If 1 stack is chosen then
- * the user may want to remove the 'SU' section from the linker sections to remove any linker warnings.
- *
- * 0 = Use 1 stack. Disable user stack. User stack size set below will be ignored.
- * 1 = Use 2 stacks. User stack and interrupt stack will both be used.
- * NOTE: This setting is available only when using CCRX and GNUC.
- *       This is invalid when using Renesas RTOS with CCRX.
- */
-#define BSP_CFG_USER_STACK_ENABLE       (1)
-
-/* If only 1 stack is chosen using BSP_CFG_USER_STACK_ENABLE then no RAM will be allocated for the user stack. */
-#if BSP_CFG_USER_STACK_ENABLE == 1
-/* User Stack size in bytes.
- * NOTE: This setting is available only when using CCRX and GNUC.
- *       This is invalid when using Renesas RTOS with CCRX. */
-#define BSP_CFG_USTACK_BYTES            (0x1000)
-#endif
-
-/* Interrupt Stack size in bytes.
-   NOTE: This setting is available only when using CCRX and GNUC. */
-#define BSP_CFG_ISTACK_BYTES            (0x400)
-
-/* Heap size in bytes.
-   To disable the heap you must follow these steps:
-   1) Set this macro (BSP_CFG_HEAP_BYTES) to 0.
-   2) Set the macro BSP_CFG_IO_LIB_ENABLE to 0.
-   3) Disable stdio from being built into the project library. This is done by going into the Renesas RX Toolchain 
-      settings and choosing the Standard Library section. After that choose 'Contents' in e2 studio.
-      This will present a list of modules that can be included. Uncheck the box for stdio.h.
-   NOTE: This setting is available only when using CCRX and GNUC. */
-#define BSP_CFG_HEAP_BYTES              (0x1000)
-
-/* Initializes C input & output library functions.
-   0 = Disable I/O library initialization in resetprg.c. If you are not using stdio then use this value.
-   1 = Enable I/O library initialization in resetprg.c. This is default and needed if you are using stdio.
-   NOTE: This setting is available only when using CCRX. */
-#define BSP_CFG_IO_LIB_ENABLE           (1)
-
-/* If desired the user may redirect the stdio charget() and/or charput() functions to their own respective functions
-   by enabling below and providing and replacing the my_sw_... function names with the names of their own functions. */
-#define BSP_CFG_USER_CHARGET_ENABLED    (0)
-#define BSP_CFG_USER_CHARGET_FUNCTION     my_sw_charget_function
-
-#define BSP_CFG_USER_CHARPUT_ENABLED    (0)
-#define BSP_CFG_USER_CHARPUT_FUNCTION     my_sw_charput_function
-
-/* After reset MCU will operate in Supervisor mode. To switch to User mode, set this macro to '1'. For more information
-   on the differences between these 2 modes see the CPU >> Processor Mode section of your MCU's hardware manual.
-   0 = Stay in Supervisor mode.
-   1 = Switch to User mode.
-   NOTE: This is invalid when using Renesas RTOS with CCRX.
-*/
-#define BSP_CFG_RUN_IN_USER_MODE        (0)
-
-/* Set your desired ID code. NOTE, leave at the default (all 0xFF's) if you do not wish to use an ID code. If you set 
-   this value and program it into the MCU then you will need to remember the ID code because the debugger will ask for 
-   it when trying to connect. Note that the E1/E20 will ignore the ID code when programming the MCU during debugging.
-   If you set this value and then forget it then you can clear the ID code by connecting up in serial boot mode using 
-   FDT. The ID Code is 16 bytes long. The macro below define the ID Code in 4-byte sections. */
-/* Lowest 4-byte section, address 0xFE7F5D50. From MSB to LSB: ID code 4, ID code 3, ID code 2, ID code 1/Control Code.
- */
-#define BSP_CFG_ID_CODE_LONG_1          (0xFFFFFFFF)
-/* 2nd ID Code section, address 0xFE7F5D54. From MSB to LSB: ID code 8, ID code 7, ID code 6, ID code 5. */
-#define BSP_CFG_ID_CODE_LONG_2          (0xFFFFFFFF)
-/* 3rd ID Code section, address 0xFE7F5D58. From MSB to LSB: ID code 12, ID code 11, ID code 10, ID code 9. */
-#define BSP_CFG_ID_CODE_LONG_3          (0xFFFFFFFF)
-/* 4th ID Code section, address 0xFE7F5D5C. From MSB to LSB: ID code 16, ID code 15, ID code 14, ID code 13. */
-#define BSP_CFG_ID_CODE_LONG_4          (0xFFFFFFFF)
-
-/* Select whether to enables or disables the connection of serial programmer.
-   0 = Connection of a serial programmer is prohibited after a reset.
-   1 = Connection of a serial programmer is permitted after a reset. (default)
-*/
-#define BSP_CFG_SERIAL_PROGRAMMER_CONECT_ENABLE   (1)
-
-/* Select whether to oscillate the Main Clock Oscillator.
-   0 = Stop Oscillating the Main Clock.
-   1 = Enable oscillating the Main Clock. (default)
-*/
-#define BSP_CFG_MAIN_CLOCK_OSCILLATE_ENABLE    (1) /* Generated value. Do not edit this manually */
-
-/* Select whether to oscillate the Sub Clock Oscillator.
-   0 = Stop Oscillating the Sub Clock. (default)
-   1 = Enable Oscillating the Sub Clock.
-*/
-#define BSP_CFG_SUB_CLOCK_OSCILLATE_ENABLE     (1) /* Generated value. Do not edit this manually */
-
-/* Select whether to oscillate the High Speed On-Chip Oscillator (HOCO).
-   0 = Stop Oscillating the HOCO. (default)
-   1 = Enable Oscillating the HOCO.
-*/
-#define BSP_CFG_HOCO_OSCILLATE_ENABLE          (0) /* Generated value. Do not edit this manually */
-
-/* Select whether to oscillate the Low Speed On-Chip Oscillator (LOCO).
-   0 = Stop Oscillating the LOCO. (default)
-   1 = Enable Oscillating the LOCO.
-*/
-#define BSP_CFG_LOCO_OSCILLATE_ENABLE          (0) /* Generated value. Do not edit this manually */
-
-/* Select whether to oscillate the IWDT-Dedicated On-Chip Oscillator (IWDT).
-   0 = Stop Oscillating the IWDT Clock. (default)
-   1 = Enable Oscillating the IWDT Clock.
-*/
-#define BSP_CFG_IWDT_CLOCK_OSCILLATE_ENABLE    (0) /* Generated value. Do not edit this manually */
-
-/* Clock source select (CKSEL).
-   0 = Low Speed On-Chip Oscillator  (LOCO)
-   1 = High Speed On-Chip Oscillator (HOCO)
-   2 = Main Clock Oscillator
-   3 = Sub-Clock Oscillator
-   4 = PLL Circuit
-*/
-#define BSP_CFG_CLOCK_SOURCE            (4) /* Generated value. Do not edit this manually */
-
-/* Main clock Oscillator Switching (MOSEL).
-   0 = Resonator
-   1 = External clock input
-*/
-#define BSP_CFG_MAIN_CLOCK_SOURCE       (0) /* Generated value. Do not edit this manually */
-
-/* The sub-clock oscillation control for using the RTC.
-   When '1' is selected, the registers related to RTC are initialized and the sub-clock oscillator is operated.
-   0 = The RTC is not to be used.
-   1 = The RTC is to be used.
-*/
-#define BSP_CFG_RTC_ENABLE              (0) /* Generated value. Do not edit this manually */
-
-/* Sub-Clock Oscillator Drive Capacity Control (RTCDV).
-   0 = Drive capacity for standard CL. (default)
-   1 = Drive capacity for low CL.
-*/
-#define BSP_CFG_SOSC_DRV_CAP            (0) /* Generated value. Do not edit this manually */
-
-/* Clock configuration options.
-   The input clock frequency is specified and then the system clocks are set by specifying the multipliers used. The
-   multiplier settings are used to set the clock registers in resetprg.c. If a 24MHz clock is used and the
-   ICLK is 120MHz, PCLKA is 120MHz, PCLKB is 60MHz, PCLKC is 60MHz, PCLKD is 60MHz, FCLK is 60MHz, USB Clock is 48MHz,
-   and BCLK is 120MHz then the settings would be:
-
-   BSP_CFG_XTAL_HZ  = 24000000
-   BSP_CFG_PLL_DIV  = 1        (no division)
-   BSP_CFG_PLL_MUL  = 10.0     (24MHz x 10.0 = 240MHz)
-   BSP_CFG_ICK_DIV  = 2      : System Clock (ICLK)        = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_ICK_DIV)  = 120MHz
-   BSP_CFG_PCKA_DIV = 2      : Peripheral Clock A (PCLKA) = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_PCKA_DIV) = 120MHz
-   BSP_CFG_PCKB_DIV = 4      : Peripheral Clock B (PCLKB) = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_PCKB_DIV) = 60MHz
-   BSP_CFG_PCKC_DIV = 4      : Peripheral Clock C (PCLKC) = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_PCKC_DIV) = 60MHz
-   BSP_CFG_PCKD_DIV = 4      : Peripheral Clock D (PCLKD) = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_PCKD_DIV) = 60MHz
-   BSP_CFG_FCK_DIV  = 4      : Flash IF Clock (FCLK)      = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_FCK_DIV)  = 60MHz
-   BSP_CFG_BCK_DIV  = 2      : External Bus Clock (BCK)   = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_BCK_DIV)  = 120MHz
-   BSP_CFG_UCK_DIV  = 5      : USB Clock (UCLK)           = 
-                               (((BSP_CFG_XTAL_HZ/BSP_CFG_PLL_DIV) * BSP_CFG_PLL_MUL) / BSP_CFG_UCK_DIV)  = 48MHz
-*/
-
-/* Input clock frequency in Hz (XTAL or EXTAL). */
-#define BSP_CFG_XTAL_HZ                 (24000000) /* Generated value. Do not edit this manually */
-
-/* The HOCO can operate at several different frequencies. Choose which one using the macro below.
-   Available frequency settings:
-   0 = 16MHz (default)
-   1 = 18MHz
-   2 = 20MHz
-*/
-#define BSP_CFG_HOCO_FREQUENCY          (0) /* Generated value. Do not edit this manually */
-
-/* PLL clock source (PLLSRCSEL). Choose which clock source to input to the PLL circuit.
-   Available clock sources:
-   0 = Main clock (default)
-   1 = HOCO
-*/
-#define BSP_CFG_PLL_SRC                 (0) /* Generated value. Do not edit this manually */
-
-/* PLL Input Frequency Division Ratio Select (PLIDIV).
-   Available divisors = /1 (no division), /2, /3
-*/
-#define BSP_CFG_PLL_DIV                 (1) /* Generated value. Do not edit this manually */
-
-/* PLL Frequency Multiplication Factor Select (STC).
-   Available multipliers = x10.0 to x30.0 in 0.5 increments (e.g. 10.0, 10.5, 11.0, 11.5, ..., 29.0, 29.5, 30.0)
-*/
-#define BSP_CFG_PLL_MUL                 (10.0) /* Generated value. Do not edit this manually */
-
-/* System Clock Divider (ICK).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_ICK_DIV                 (2) /* Generated value. Do not edit this manually */
-
-/* Peripheral Module Clock A Divider (PCKA).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_PCKA_DIV                (2) /* Generated value. Do not edit this manually */
-
-/* Peripheral Module Clock B Divider (PCKB).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_PCKB_DIV                (4) /* Generated value. Do not edit this manually */
-
-/* Peripheral Module Clock C Divider (PCKC).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_PCKC_DIV                (4) /* Generated value. Do not edit this manually */
-
-/* Peripheral Module Clock D Divider (PCKD).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_PCKD_DIV                (4) /* Generated value. Do not edit this manually */
-
-/* External Bus Clock Divider (BCLK).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_BCK_DIV                 (2) /* Generated value. Do not edit this manually */
-
-/* Flash IF Clock Divider (FCK).
-   Available divisors = /1 (no division), /2, /4, /8, /16, /32, /64
-*/
-#define BSP_CFG_FCK_DIV                 (4) /* Generated value. Do not edit this manually */
-
-/* USB Clock Divider Select.
-   Available divisors = /2, /3, /4, /5
-*/
-#define BSP_CFG_UCK_DIV                 (5) /* Generated value. Do not edit this manually */
-
-/* Configure BCLK output pin (only effective when external bus enabled)
-   Values 0=no output, 1 = BCK frequency, 2= BCK/2 frequency
-*/
-#define BSP_CFG_BCLK_OUTPUT             (0) /* Generated value. Do not edit this manually */
-
-/* Configure SDCLK output pin (only effective when external bus enabled)
-   Values 0=no output, 1 = BCK frequency
-*/
-#define BSP_CFG_SDCLK_OUTPUT            (0) /* Generated value. Do not edit this manually */
-
-/* Main Clock Oscillator Wait Time (MOSCWTCR).
-   The value of MOSCWTCR register required for correspondence with the waiting time required to secure stable 
-   oscillation by the main clock oscillator is obtained by using the maximum frequency for fLOCO in the formula below.
-
-   BSP_CFG_MOSC_WAIT_TIME > (tMAINOSC * (fLOCO_max) + 16)/32
-   (tMAINOSC: main clock oscillation stabilization time; fLOCO_max: maximum frequency for fLOCO)
-
-   If tMAINOSC is 9.98 ms and fLOCO_max is 264 kHz (the period is 1/3.78 us), the formula gives 
-   BSP_CFG_MOSC_WAIT_TIME > (9.98 ms * (264 kHZ) + 16)/32 = 82.83, so set the BSP_CFG_MOSC_WAIT_TIME to 83(53h).
-
-   NOTE: The waiting time is not required when an external clock signal is input for the main clock oscillator.
-         Set the BSP_CFG_MOSC_WAIT_TIME to 00h.
-*/
-#define BSP_CFG_MOSC_WAIT_TIME          (0x53) /* Generated value. Do not edit this manually */
-
-/* Sub-Clock Oscillator Wait Time (SOSCWTCR).
-   The value of SOSCWTCR register required for correspondence with the expected time to secure settling of oscillation
-   by the sub-clock oscillator is obtained by using the maximum frequency for fLOCO in the formula below.
-
-   BSP_CFG_SOSC_WAIT_TIME > (tSUBOSC * (fLOCO_max) + 16)/16384
-   (tSUBOSC: sub-clock oscillation stabilization time; fLOCO_max: maximum frequency for fLOCO)
-
-   If tSUBOSC is 2 s and fLOCO is 264 kHz (the period is 1/3.78 us), the formula gives
-    BSP_CFG_SOSC_WAIT_TIME > (2 s * (264 kHz) +16)/16384 = 32.22, so set the  BSP_CFG_SOSC_WAIT_TIME bits to 33(21h).
-*/
-#define BSP_CFG_SOSC_WAIT_TIME          (0x21) /* Generated value. Do not edit this manually */
-
-/* ROM Cache Enable Register (ROMCE).
-   0 = ROM cache operation disabled.
-   1 = ROM cache operation enabled.
-*/
-#define BSP_CFG_ROM_CACHE_ENABLE        (0)
-
-/* Configure WDT and IWDT settings.
-   OFS0 - Option Function Select Register 0
-       b31:b29 Reserved When reading, these bits return the value written by the user. The write value should be 1.
-       b28     WDTRSTIRQS - WDT Reset Interrupt Request - What to do on underflow (0=take interrupt, 1=reset MCU)
-       b27:b26 WDTRPSS   - WDT Window Start Position Select - (0=25%, 1=50%, 2=75%, 3=100%,don't use)
-       b25:b24 WDTRPES   - WDT Window End Position Select - (0=75%, 1=50%, 2=25%, 3=0%,don't use)
-       b23:b20 WDTCKS    - WDT Clock Frequency Division Ratio - (1=PCLKB/4, 4=PCLKB/64, 0xF=PCLKB/128, 6=PCLKB/256,
-                                                                 7=PCLKB/2048, 8=PCLKB/8192)
-       b19:b18 WDTTOPS   - WDT Timeout Period Select (0=1024 cycles, 1=4096, 2=8192, 3=16384)
-       b17     WDTSTRT   - WDT Start Mode Select - (0=auto-start after reset, 1=halt after reset)
-       b16:b15 Reserved (set to 1)
-       b14     IWDTSLCSTP - IWDT Sleep Mode Count Stop Control - (0=can't stop count, 1=stop w/some low power modes)
-       b13     Reserved (set to 1)
-       b12     IWDTRSTIRQS - IWDT Reset Interrupt Request - What to do on underflow (0=take interrupt, 1=reset MCU)
-       b11:b10 IWDTRPSS - IWDT Window Start Position Select - (0=25%, 1=50%, 2=75%, 3=100%,don't use)
-       b9:b8   IWDTRPES - IWDT Window End Position Select - (0=75%, 1=50%, 2=25%, 3=0%,don't use)
-       b7:b4   IWDTCKS - IWDT Clock Frequency Division Ratio - (0=none, 2=/16, 3 = /32, 4=/64, 0xF=/128, 5=/256)
-       b3:b2   IWDTTOPS - IWDT Timeout Period Select - (0=1024 cycles, 1=4096, 2=8192, 3=16384)
-       b1      IWDTSTRT - IWDT Start Mode Select - (0=auto-start after reset, 1=halt after reset)
-       b0      Reserved (set to 1)
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_OFS0_REG_VALUE  (0xFFFFFFFF) /* Generated value. Do not edit this manually */
-
-/* Configure whether voltage detection 0 circuit and HOCO are enabled after reset.
-   OFS1 - Option Function Select Register 1
-       b31:b9 Reserved (set to 1)
-       b8     HOCOEN - Enable/disable HOCO oscillation after a reset (0=enable, 1=disable)
-       b7:b3  Reserved When reading, these bits return the value written by the user. The write value should be 1.
-       b2     LVDAS - Voltage Detection 0 circuit start (1=monitoring disabled)
-       b1:b0  VDSEL - Voltage Detection 0 level select (1=2.94v, 2=2.87v, 3=2.80v)
-       NOTE: If HOCO oscillation is enabled by OFS1.HOCOEN, HOCO frequency is 16MHz.
-             BSP_CFG_HOCO_FREQUENCY should be default value.
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_OFS1_REG_VALUE  (0xFFFFFFFF) /* Generated value. Do not edit this manually */
-
-/* Trusted memory is facility to prevent the reading of blocks 8 and 9 and blocks 46 and 47 (in dual mode) in 
-   the code flash memory by third party software. This feature is disabled by default.
-   TMEF - TM Enable Flag Register
-       b31     Reserved (set to 1)
-       b30:b28 TMEFDB - Dual-Bank TM Enable - 000: The TM function in the address range from FFEE 0000h to 
-                                                   FFEE FFFFh is enabled in dual mode.
-                                            - 111: The TM function in the address range from FFEE 0000h to 
-                                                   FFEE FFFFh is disabled in dual mode.
-       b27     Reserved (set to 1)
-       b26:b24 TMEF   - TM Enable - 000: TM function is enabled.
-                                  - 111: TM function is disabled.
-       b23:b0  Reserved (set to 1)
-       NOTE: If the dual bank function has not been incorporated in a device,
-             TMEFDB bits [b30:b26] are reserved area.
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_TRUSTED_MODE_FUNCTION  (0xFFFFFFFF)
-
-/* Configure FAW register is used to set the write protection flag and boot area select flag 
-   for setting the flash access window startaddress and flash access window end address.
-   FAW - Flash Access Window Setting Register
-       b31      BTFLG - Boot Area Select Flag - 0: FFFF C000h to FFFF DFFFh are used as the boot area
-                                              - 1: FFFF E000h to FFFF FFFFh are used as the boot area
-       b30:b28  Reserved - When reading, these bits return the value written by the user.The write value should be 1.
-       b27:b16  FAWE - Flash Access Window End Address - Flash access window end address
-       b15      FSPR - Access Window Protection Flag - 0: With protection (P/E disabled)
-                                                     - 1: Without protection (P/E enabled)
-       b14:b12  Reserved - When reading, these bits return the value written by the user.The write value should be 1.
-       b11:b0   FAWS - Flash Access Window Start Address - Flash access window start address 
-       NOTE: Once 0 is written to this bit, the bit can never be restored to 1.
-             Therefore, the access window and the BTFLG bit never be set again or the TM function 
-             never be disabled once it has been enabled.
-             Exercise extra caution when handling the FSPR bit.
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_FAW_REG_VALUE  (0xFFFFFFFF)
-
-/* The ROM code protection register is a function to prohibit reading from or programming to the flash memory
-   when the flash programmer is used during off-board programming.
-   ROMCODE - ROM Code Protection Register
-       b31:b0  ROM Code - 0000 0000h: ROM code protection enabled (ROM code protection 1).
-                          0000 0001h: ROM code protection enabled (ROM code protection 2).
-                          Other than above: ROM code protection disabled.
-       Note: The ROMCODE register should be set in 32-bit units.
-   Default value is 0xFFFFFFFF.
-*/
-#define BSP_CFG_ROMCODE_REG_VALUE  (0xFFFFFFFF)
-
-/* Select the bank mode of dual-bank function of the code flash memory.
-   0 = Dual mode.
-   1 = Linear mode. (default)
-   NOTE: If the dual bank function has been incorporated in a device, select the bank mode in this macro.
-         Default setting of the bank mode is linear mode.
-         If the dual bank function has not been incorporated in a device, this macro should be 1.
-*/
-#define BSP_CFG_CODE_FLASH_BANK_MODE    (0)
-
-/* Select the startup bank of the program when dual bank function is in dual mode.
-   0 = The address range of bank 1 from FFE00000h to FFEFFFFFh and bank 0 from FFF00000h to FFFFFFFFh. (default)
-   1 = The address range of bank 1 from FFF00000h to FFFFFFFFh and bank 0 from FFE00000h to FFEFFFFFh.
-   NOTE: If the dual bank function has been incorporated in a device, select the start bank in this macro.
-         Default setting of the start bank is bank0.
-         If the dual bank function has not been incorporated in a device, this macro should be 0.
-*/
-#define BSP_CFG_CODE_FLASH_START_BANK   (0)
-
-/* This macro lets other modules no if a RTOS is being used.
-   0 = RTOS is not used.
-   1 = FreeRTOS is used.
-   2 = embOS is used.(This is not available.)
-   3 = MicroC_OS is used.(This is not available.)
-   4 = Renesas ITRON OS (RI600V4 or RI600PX) is used.
-   5 = Azure RTOS is used.(This is not available.)
-*/
-#define BSP_CFG_RTOS_USED               (1)
-
-/* This macro is used to select which Renesas ITRON OS.
-   0 = RI600V4 is used.
-   1 = RI600PX is used.
-*/
-#define BSP_CFG_RENESAS_RTOS_USED       (0)
-
-/* This macro is used to select which CMT channel used for system timer of RTOS.
- * The setting of this macro is only valid if the macro BSP_CFG_RTOS_USED is set to a value other than 0. */
-#if BSP_CFG_RTOS_USED != 0
-/* Setting value.
- * 0      = CMT channel 0 used for system timer of RTOS (recommended to be used for RTOS).
- * 1      = CMT channel 1 used for system timer of RTOS.
- * 2      = CMT channel 2 used for system timer of RTOS.
- * 3      = CMT channel 3 used for system timer of RTOS.
- * Others = Invalid.
- * NOTE: This is invalid when using Renesas RTOS with CCRX.
- */
-#define BSP_CFG_RTOS_SYSTEM_TIMER       (0)
-#endif
-
-/* By default modules will use global locks found in mcu_locks.c. If the user is using a RTOS and would rather use its
-   locking mechanisms then they can change this macro.
-   NOTE: If '1' is chosen for this macro then the user must also change the next macro 'BSP_CFG_USER_LOCKING_TYPE'.
-   0 = Use default locking (non-RTOS)
-   1 = Use user defined locking mechanism.
-*/
-#define BSP_CFG_USER_LOCKING_ENABLED    (0)
-
-/* If the user decides to use their own locking mechanism with FIT modules then they will need to redefine the typedef
-   that is used for the locks. If the user is using a RTOS then they would likely redefine the typedef to be 
-   a semaphore/mutex type of their RTOS. Use the macro below to set the type that will be used for the locks.
-   NOTE: If BSP_CFG_USER_LOCKING_ENABLED == 0 then this typedef is ignored.
-   NOTE: Do not surround the type with parentheses '(' ')'.
-*/
-#define BSP_CFG_USER_LOCKING_TYPE       bsp_lock_t
-
-/* If the user decides to use their own locking mechanism with FIT modules then they will need to define the functions
-   that will handle the locking and unlocking. These functions should be defined below.
-   If BSP_CFG_USER_LOCKING_ENABLED is != 0:
-   R_BSP_HardwareLock(mcu_lock_t hw_index) will call BSP_CFG_USER_LOCKING_HW_LOCK_FUNCTION(mcu_lock_t hw_index)
-   R_BSP_HardwareUnlock(mcu_lock_t hw_index) will call BSP_CFG_USER_LOCKING_HW_UNLOCK_FUNCTION(mcu_lock_t hw_index)
-       NOTE:With these functions the index into the array holding the global hardware locks is passed as the parameter.
-   R_BSP_SoftwareLock(BSP_CFG_USER_LOCKING_TYPE * plock) will call 
-   BSP_CFG_USER_LOCKING_SW_LOCK_FUNCTION(BSP_CFG_USER_LOCKING_TYPE * plock)
-   R_BSP_SoftwareUnlock(BSP_CFG_USER_LOCKING_TYPE * plock) will call 
-   BSP_CFG_USER_LOCKING_SW_UNLOCK_FUNCTION(BSP_CFG_USER_LOCKING_TYPE * plock)
-       NOTE:With these functions the actual address of the lock to use is passed as the parameter.
-   NOTE: These functions must return a boolean. If lock was obtained or released successfully then return true. Else, 
-         return false.
-   NOTE: If BSP_CFG_USER_LOCKING_ENABLED == 0 then this typedef is ignored.
-   NOTE: Do not surround the type with parentheses '(' ')'.
-*/
-#define BSP_CFG_USER_LOCKING_HW_LOCK_FUNCTION      my_hw_locking_function
-#define BSP_CFG_USER_LOCKING_HW_UNLOCK_FUNCTION    my_hw_unlocking_function
-#define BSP_CFG_USER_LOCKING_SW_LOCK_FUNCTION      my_sw_locking_function
-#define BSP_CFG_USER_LOCKING_SW_UNLOCK_FUNCTION    my_sw_unlocking_function
-
-/* If the user would like to determine if a warm start reset has occurred, then they may enable one or more of the
-   following callback definitions AND provide a call back function name for the respective callback
-   function (to be defined by the user). Setting BSP_CFG_USER_WARM_START_CALLBACK_PRE_INITC_ENABLED = 1 will result
-   in a callback to the user defined my_sw_warmstart_prec_function just prior to the initialization of the C
-   runtime environment by resetprg.
-   Setting BSP_CFG_USER_WARM_START_CALLBACK_POST_INITC_ENABLED = 1 will result in a callback to the user defined
-   my_sw_warmstart_postc_function just after the initialization of the C runtime environment by resetprg.
-*/
-#define BSP_CFG_USER_WARM_START_CALLBACK_PRE_INITC_ENABLED    (0)
-#define BSP_CFG_USER_WARM_START_PRE_C_FUNCTION     my_sw_warmstart_prec_function
-
-#define BSP_CFG_USER_WARM_START_CALLBACK_POST_INITC_ENABLED    (0)
-#define BSP_CFG_USER_WARM_START_POST_C_FUNCTION    my_sw_warmstart_postc_function
-
-/* By default FIT modules will check input parameters to be valid. This is helpful during development but some users
-   will want to disable this for production code. The reason for this would be to save execution time and code space.
-   This macro is a global setting for enabling or disabling parameter checking. Each FIT module will also have its
-   own local macro for this same purpose. By default the local macros will take the global value from here though
-   they can be overridden. Therefore, the local setting has priority over this global setting. Disabling parameter
-   checking should only used when inputs are known to be good and the increase in speed or decrease in code space is 
-   needed.
-   0 = Global setting for parameter checking is disabled.
-   1 = Global setting for parameter checking is enabled (Default).
-*/
-#define BSP_CFG_PARAM_CHECKING_ENABLE               (1)
-
-/* The extended bus master has five transfer sources: EDMAC, GLCDC-GRA1 (GLCDC graphics 1 data read), GLCDCGRA2 (GLCDC
-   graphics 2 data read), DRW2D-TX (DRW2D texture data read), and DRW2D-FB (DRW2D frame buffer data read write and
-   display list data read).
-   The default priority order in bsp is below
-   GLCDC-GRA1 > GLCDC-GRA2 > DRW2D-TX > DRW2D-FB > EDMAC.
-   Priority can be changed with this macro.
-
-   Extended Bus Master Priority setting
-   0 = GLCDC graphics 1 data read
-   1 = DRW2D texture data read
-   2 = DRW2D frame buffer data read write and display list data read
-   3 = GLCDC graphics 2 data read
-   4 = EDMAC
-
-   Note : This macro is only available for products with at least 1.5 Mbytes of code flash memory.
-          Settings other than above are prohibited.
-          Duplicate priority settings can not be made.
-*/
-#define BSP_CFG_EBMAPCR_1ST_PRIORITY                (0) /* Extended Bus Master 1st Priority Selection */
-#define BSP_CFG_EBMAPCR_2ND_PRIORITY                (3) /* Extended Bus Master 2nd Priority Selection */
-#define BSP_CFG_EBMAPCR_3RD_PRIORITY                (1) /* Extended Bus Master 3rd Priority Selection */
-#define BSP_CFG_EBMAPCR_4TH_PRIORITY                (2) /* Extended Bus Master 4th Priority Selection */
-#define BSP_CFG_EBMAPCR_5TH_PRIORITY                (4) /* Extended Bus Master 5th Priority Selection */
-
-/* This macro is used to define the voltage that is supplied to the MCU (Vcc). This macro is defined in millivolts. This
-   macro does not actually change anything on the MCU. Some FIT modules need this information so it is defined here. */
-#define BSP_CFG_MCU_VCC_MV                          (3300) /* Generated value. Do not edit this manually */
-
-/* Allow initialization of auto-generated peripheral initialization code by Smart Configurator tool.
-   When not using the Smart Configurator, set the value of BSP_CFG_CONFIGURATOR_SELECT to 0.
-   0 = Disabled (default)
-   1 = Smart Configurator initialization code used
-*/
-#define BSP_CFG_CONFIGURATOR_SELECT                 (1) /* Generated value. Do not edit this manually */
-
-/* Version number of Smart Configurator.
-   This macro definition is updated by Smart Configurator.
-*/
-#define BSP_CFG_CONFIGURATOR_VERSION                (2170) /* Generated value. Do not edit this manually */
-
-/* For some BSP functions, it is necessary to ensure that, while these functions are executing, interrupts from other 
-   FIT modules do not occur. By controlling the IPL, these functions disable interrupts that are at or below the 
-   specified interrupt priority level.
-   This macro sets the IPL. Range is 0x0 - 0xF.
-   Please set this macro more than IPR for other FIT module interrupts.
-   The default value is 0xF (maximum value).
-   Don't change if there is no special processing with higher priority than all fit modules.
-*/
-#define BSP_CFG_FIT_IPL_MAX                         (0xF)
-
-/* Software Interrupt (SWINT).
-   0 = Software interrupt is not used.
-   1 = Software interrupt is used.
-   NOTE: When this macro is set to 1, the software interrupt is initialized in bsp startup routine. 
-*/
-#define BSP_CFG_SWINT_UNIT1_ENABLE    (0)
-#define BSP_CFG_SWINT_UNIT2_ENABLE    (0)
-
-/* Software Interrupt Task Buffer Number.
-   For software interrupt, this value is number of buffering user tasks.
-   So user can increase this value if user system would have many software interrupt tasks
-   and user system has enough buffer. This value requires 9 byte per task.
-   NOTE: This setting is common to all units. It can not be set individually. 
-         The maximum value is 254.
-*/
-#define BSP_CFG_SWINT_TASK_BUFFER_NUMBER     (8)
-
-/* Initial value of the software interrupt priority.
-   For software interrupt, this value is interrupt priority. Range is 0x0 - 0xF.
-   NOTE: This setting is common to all units. It can not be set individually. 
-         Please be careful that this setting is the initial value of the interrupt priority register(IPR).
-         It is possible to dynamically change the IPR.
-*/
-#define BSP_CFG_SWINT_IPR_INITIAL_VALUE     (0x1)
-
-/* This macro is used for serial terminal on the board selected by smart configurator.
-   0 = SCI UART Terminal is disabled.
-   1 = SCI UART Terminal is enabled.
-*/
-#define BSP_CFG_SCI_UART_TERMINAL_ENABLE         (1)
-
-/* This macro is channel number for serial terminal.
-*/
-#define BSP_CFG_SCI_UART_TERMINAL_CHANNEL        (5)
-
-/* This macro is bit-rate for serial terminal.
-*/
-#define BSP_CFG_SCI_UART_TERMINAL_BITRATE        (115200)
-
-/* This macro is interrupt priority for serial terminal.
-   0(low) - 15(high)
-*/
-#define BSP_CFG_SCI_UART_TERMINAL_INTERRUPT_PRIORITY   (15)
-
-/* This macro is used for C++ project and updated by Smart Configurator.
-   0 = This project is a C project.(Not a C++ project).
-   1 = This project is a C++ project.
-*/
-#define BSP_CFG_CPLUSPLUS             (0) /* Generated value. Do not edit this manually */
-
-#endif /* R_BSP_CONFIG_REF_HEADER_FILE */
-
diff --git a/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_bsp_interrupt_config.h b/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_bsp_interrupt_config.h
deleted file mode 100644
index 39237823..00000000
--- a/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_bsp_interrupt_config.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer 
-*
-* Copyright (C) 2016 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name    : r_bsp_interrupt_config.h
-* Description  : This module maps Interrupt A & B interrupts. More information on how this is done is given below.
-***********************************************************************************************************************/
-/**********************************************************************************************************************
-* History : DD.MM.YYYY Version   Description
-*         : 01.10.2016 1.00      First Release
-*         : 15.05.2017 2.00      Changed the name of the following macro definition, because there was a mistake
-*                                in the name of macro definition.
-*                                - From XXX_TPU0_TGI0V to XXX_TPU0_TCI0V.
-*                                - From XXX_TPU1_TGI1V to XXX_TPU1_TCI1V.
-*                                - From XXX_TPU1_TGI1U to XXX_TPU1_TCI1U.
-*                                - From XXX_TPU2_TGI2V to XXX_TPU2_TCI2V.
-*                                - From XXX_TPU2_TGI2U to XXX_TPU2_TCI2U.
-*                                - From XXX_TPU3_TGI3V to XXX_TPU3_TCI3V.
-*                                - From XXX_TPU4_TGI4V to XXX_TPU4_TCI4V.
-*                                - From XXX_TPU4_TGI4U to XXX_TPU4_TCI4U.
-*                                - From XXX_TPU5_TGI5V to XXX_TPU5_TCI5V.
-*                                - From XXX_TPU5_TGI5U to XXX_TPU5_TCI5U.
-*                                - From XXX_MTU0_TGIV0 to XXX_MTU0_TCIV0.
-*                                - From XXX_MTU1_TGIV1 to XXX_MTU1_TCIV1.
-*                                - From XXX_MTU1_TGIU1 to XXX_MTU1_TCIU1.
-*                                - From XXX_MTU2_TGIV2 to XXX_MTU2_TCIV2.
-*                                - From XXX_MTU2_TGIU2 to XXX_MTU2_TCIU2.
-*                                - From XXX_MTU3_TGIV3 to XXX_MTU3_TCIV3.
-*                                - From XXX_MTU4_TGIV4 to XXX_MTU4_TCIV4.
-*                                - From XXX_MTU6_TGIV6 to XXX_MTU6_TCIV6.
-*                                - From XXX_MTU7_TGIV7 to XXX_MTU7_TCIV7.
-*                                - From XXX_MTU8_TGIV8 to XXX_MTU8_TCIV8.
-*                                Added select processing of the following software configurable interrupt source.
-*                                - TSIP_PROC_BUSY
-*                                - TSIP_ROMOK
-*                                - TSIP_LONG_PLG
-*                                - TSIP_TEST_BUSY
-*                                - TSIP_WRRDY0
-*                                - TSIP_WRRDY1
-*                                - TSIP_WRRDY4
-*                                - TSIP_RDRDY0
-*                                - TSIP_RDRDY1
-*                                - TSIP_INTEGRATE_WRRDY
-*                                - TSIP_INTEGRATE_RDRDY
-***********************************************************************************************************************/
-#ifndef R_BSP_INTERRUPT_CONFIG_REF_HEADER_FILE
-#define R_BSP_INTERRUPT_CONFIG_REF_HEADER_FILE
-
-/***********************************************************************************************************************
-Macro definitions
-***********************************************************************************************************************/
-
-/* If you wish to use one of the interrupt below then set the appropriate configuration macro to the vector number you
- * wish to use for that interrupt. For example, if you want to use the RTC carry interrupt (CUP) at vector 176 then you
- * would do the following:
- *
- * #define BSP_MAPPED_INT_CFG_B_VECT_RTC_CUP                                 176
- */
-
-/* Interrupt B Sources.
- * -Valid vector numbers are 128-207.
- * -There are more vector slots for B sources than actual B sources. By default all B sources are mapped.
- * -If using the 'TPU1, TGI1A' interrupt it must be vector 144 or 145. It is set to 144 by default.
- * -If a peripheral interrupt is going to be used to wake up the MCU from All-Module Clock Stop Mode then it must be
- *  in a vector between 146 to 157. Peripheral interrupts that can do this are TMR interrupts and the 'USB0, USBI0'
- *  interrupt. By default the TMR interrupts are chosen since there are 12 of them and there are 12 slots.
- */
-#define BSP_MAPPED_INT_CFG_B_VECT_CMT2_CMI2                               128
-#define BSP_MAPPED_INT_CFG_B_VECT_CMT3_CMI3                               129
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR0_CMIA0                              146
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR0_CMIB0                              147
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR0_OVI0                               148
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR1_CMIA1                              149
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR1_CMIB1                              150
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR1_OVI1                               151
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR2_CMIA2                              152
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR2_CMIB2                              153
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR2_OVI2                               154
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR3_CMIA3                              155
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR3_CMIB3                              156
-#define BSP_MAPPED_INT_CFG_B_VECT_TMR3_OVI3                               157
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TGI0A                              130
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TGI0B                              131
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TGI0C                              132
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TGI0D                              133
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU0_TCI0V                              134
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU1_TGI1A                              144
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU1_TGI1B                              135
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU1_TCI1V                              136
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU1_TCI1U                              137
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU2_TGI2A                              138
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU2_TGI2B                              139
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU2_TCI2V                              140
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU2_TCI2U                              141
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TGI3A                              142
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TGI3B                              143
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TGI3C                              145
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TGI3D                              158
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU3_TCI3V                              159
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU4_TGI4A                              160
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU4_TGI4B                              161
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU4_TCI4V                              162
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU4_TCI4U                              163
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU5_TGI5A                              164
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU5_TGI5B                              165
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU5_TCI5V                              166
-#define BSP_MAPPED_INT_CFG_B_VECT_TPU5_TCI5U                              167
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW0_IC0I0                             168
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW0_IC1I0                             169
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW0_OC0I0                             170
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW0_OC1I0                             171
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW1_IC0I1                             172
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW1_IC1I1                             173
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW1_OC0I1                             174
-#define BSP_MAPPED_INT_CFG_B_VECT_CMTW1_OC1I1                             175
-#define BSP_MAPPED_INT_CFG_B_VECT_RTC_CUP                                 176
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN0_RXF0                               177
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN0_TXF0                               178
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN0_RXM0                               179
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN0_TXM0                               180
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN1_RXF1                               181
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN1_TXF1                               182
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN1_RXM1                               183
-#define BSP_MAPPED_INT_CFG_B_VECT_CAN1_TXM1                               184
-#define BSP_MAPPED_INT_CFG_B_VECT_USB0_USBI0                              185
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC0_S12ADI0                         186
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC0_S12GBADI0                       187
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC0_S12GCADI0                       188
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC1_S12ADI1                         189
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC1_S12GBADI1                       190
-#define BSP_MAPPED_INT_CFG_B_VECT_S12ADC1_S12GCADI1                       191
-#define BSP_MAPPED_INT_CFG_B_VECT_RNG_RNGEND                              192
-#define BSP_MAPPED_INT_CFG_B_VECT_ELC_ELSR18I                             193
-#define BSP_MAPPED_INT_CFG_B_VECT_ELC_ELSR19I                             194
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_PROC_BUSY                          195
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_ROMOK                              196
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_LONG_PLG                           197
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_TEST_BUSY                          198
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_WRRDY0                             199
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_WRRDY1                             200
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_WRRDY4                             201
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_RDRDY0                             202
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_RDRDY1                             203
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_INTEGRATE_WRRDY                    204
-#define BSP_MAPPED_INT_CFG_B_VECT_TSIP_INTEGRATE_RDRDY                    205
-
-/* Interrupt A Sources.
- * -Valid vector numbers are 208-255.
- * -There are more A sources than A vector slots. By default none of the GPT interrupts are mapped.
- * -If using the 'MTU1, TGI1A' interrupt it must be vector 208 or 209. It is set to 208 by default.
- */
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIA0                              209
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIB0                              210
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIC0                              211
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGID0                              212
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TCIV0                              213
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIE0                              214
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU0_TGIF0                              215
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU1_TGIA1                              208
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU1_TGIB1                              216
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU1_TCIV1                              217
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU1_TCIU1                              218
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU2_TGIA2                              219
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU2_TGIB2                              220
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU2_TCIV2                              221
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU2_TCIU2                              222
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TGIA3                              223
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TGIB3                              224
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TGIC3                              225
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TGID3                              226
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU3_TCIV3                              227
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TGIA4                              228
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TGIB4                              229
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TGIC4                              230
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TGID4                              231
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU4_TCIV4                              232
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU5_TGIU5                              233
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU5_TGIV5                              234
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU5_TGIW5                              235
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TGIA6                              236
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TGIB6                              237
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TGIC6                              238
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TGID6                              239
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU6_TCIV6                              240
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TGIA7                              241
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TGIB7                              242
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TGIC7                              243
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TGID7                              244
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU7_TCIV7                              245
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TGIA8                              246
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TGIB8                              247
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TGIC8                              248
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TGID8                              249
-#define BSP_MAPPED_INT_CFG_A_VECT_MTU8_TCIV8                              250
-#define BSP_MAPPED_INT_CFG_A_VECT_AES_AESRDY                              251
-#define BSP_MAPPED_INT_CFG_A_VECT_AES_AESEND                              252
-
-#endif /* R_BSP_INTERRUPT_CONFIG_REF_HEADER_FILE */
-
diff --git a/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_byteq_config.h b/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_byteq_config.h
deleted file mode 100644
index 7c0e15a9..00000000
--- a/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_byteq_config.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer 
-*
-* Copyright (C) 2013 Renesas Electronics Corporation. All rights reserved.    
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name     : r_byteq_config.h
-* Description   : Configures the byte queue memory allocation
-************************************************************************************************************************
-* History : DD.MM.YYYY Version Description  
-*         : 24.07.2013 1.00     Initial Release
-*         : 11.21.2014 1.20     Removed dependency to BSP
-*         : 30.09.2015 1.50     Added dependency to BSP
-*         : 01.06.2018 1.70     Changed the default value of the following macro definition.
-*                                - BYTEQ_CFG_MAX_CTRL_BLKS - Changed the default value from 4 to 32.
-*         : 31.03.2021 1.90     Updated for queue protection.
-*         : 29.10.2021 2.00     Updated for critical section protection.
-***********************************************************************************************************************/
-#ifndef BYTEQ_CONFIG_H
-#define BYTEQ_CONFIG_H
-
-/***********************************************************************************************************************
-Includes   <System Includes> , "Project Includes"
-***********************************************************************************************************************/
-#include "platform.h"
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-
-/* SPECIFY WHETHER TO INCLUDE CODE FOR API PARAMETER CHECKING
-   Available settings:
-   BSP_CFG_PARAM_CHECKING_ENABLE:
-       Utilizes the system default setting
-   1:
-       Includes parameter checking
-   0:
-       Compiles out parameter checking
-*/
-#define BYTEQ_CFG_PARAM_CHECKING_ENABLE     (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-/* SPECIFY IF SHOULD USE MALLOC() TO ALLOCATE MEMORY FOR QUEUE CONTROL BLOCKS */
-#define BYTEQ_CFG_USE_HEAP_FOR_CTRL_BLKS    (0)
-
-/* SPECIFY NUMBER OF STATIC QUEUE CONTROL BLOCKS TO SUPPORT */
-/* valid only when BYTEQ_USE_HEAP_FOR_CTRL_BLKS is set to 0 */
-#define BYTEQ_CFG_MAX_CTRL_BLKS             (32)
-
-/* Selects to use disable interrupt to protect queue. */
-#define BYTEQ_CFG_PROTECT_QUEUE             (0)
-
-/* Selects to use disable interrupt to protect critical section. */
-#define BYTEQ_CFG_CRITICAL_SECTION          (0)
-
-#endif /* BYTEQ_CONFIG_H */
diff --git a/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_flash_rx_config.h b/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_flash_rx_config.h
deleted file mode 100644
index ef1be384..00000000
--- a/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_flash_rx_config.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
- * DISCLAIMER
- * This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
- * other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
- * applicable laws, including copyright laws.
- * THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
- * THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
- * EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
- * SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS
- * SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
- * this software. By using this software, you agree to the additional terms and conditions found by accessing the
- * following link:
- * http://www.renesas.com/disclaimer
- *
- * Copyright (C) 2014-2019 Renesas Electronics Corporation. All rights reserved.
- ***********************************************************************************************************************/
-/***********************************************************************************************************************
- * File Name    : r_flash_rx_config_reference.h
- * Description  : Configures the FLASH API module for RX200 and RX600 Series MCU's.
- ***********************************************************************************************************************/
-/***********************************************************************************************************************
-* History : DD.MM.YYYY Version Description
-*           12.04.2014 1.00    First Release
-*           22.12.2014 1.10    Added flash type usage comments.
-*           25.06.2015 1.20    Added FLASH_CFG_CODE_FLASH_RUN_FROM_ROM.
-*         : 12.10.2016 2.00    Modified for BSPless operation (added FLASH_CFG_USE_FIT_BSP).
-*         : 19.04.2019 4.00    Removed BSPless operation (FLASH_CFG_USE_FIT_BSP).
-*                              Removed flash type 2 only operation (FLASH_CFG_FLASH_READY_IPL).
-*                              Removed flash type 2 only operation (FLASH_CFG_IGNORE_LOCK_BITS).
-*         : 19.07.2019 4.20    Modified comments (FLASH_CFG_CODE_FLASH_ENABLE, FLASH_CFG_CODE_FLASH_RUN_FROM_ROM).
-*         : 09.09.2019 4.30    Modified comments (FLASH_CFG_CODE_FLASH_ENABLE, FLASH_CFG_CODE_FLASH_RUN_FROM_ROM).
-***********************************************************************************************************************/
-#ifndef FLASH_CONFIG_HEADER_FILE
-#define FLASH_CONFIG_HEADER_FILE
-
-/***********************************************************************************************************************
- Configuration Options
- ***********************************************************************************************************************/
-/* SPECIFY WHETHER TO INCLUDE CODE FOR API PARAMETER CHECKING
- * Setting to BSP_CFG_PARAM_CHECKING_ENABLE utilizes the system default setting
- * Setting to 1 includes parameter checking; 0 compiles out parameter checking
- */
-#define FLASH_CFG_PARAM_CHECKING_ENABLE     (1)
-
-
-/******************************************************************************
- ENABLE CODE FLASH PROGRAMMING
-******************************************************************************/
-/* If you are only using data flash, set this to 0.
- * Setting to 1 includes code to program the ROM area. When programming ROM,
- * code must be executed from RAM, except under certain restrictions for flash
- * type 3 (see section 2.16 in App Note). See section 2.15 in the App Note for
- * details on how to set up code and the linker to execute code from RAM.
- */
-#define FLASH_CFG_CODE_FLASH_ENABLE (1)
-
-
-/******************************************************************************
- ENABLE BGO/NON-BLOCKING DATA FLASH OPERATIONS
-******************************************************************************/
-/* Setting this to 0 forces data flash API function to block until completed.
- * Setting to 1 places the module in BGO (background operations) mode. In BGO 
- * mode, data flash operations return immediately after the operation has been 
- * started. Notification of the operation completion is done via the callback 
- * function. 
- */
-#define FLASH_CFG_DATA_FLASH_BGO   (1)
-
-
-/******************************************************************************
- ENABLE BGO/NON-BLOCKING CODE FLASH (ROM) OPERATIONS
-******************************************************************************/
-/* Setting this to 0 forces ROM API function to block until completed.
- * Setting to 1 places the module in BGO (background operations) mode. In BGO 
- * mode, ROM operations return immediately after the operation has been started.
- * Notification of the operation completion is done via the callback function. 
- * When reprogramming ROM, THE RELOCATABLE VECTOR TABLE AND CORRESPONDING
- * INTERRUPT ROUTINES MUST BE IN RAM.  
- * See sections 2.17 Usage Notes in the App Note.
- */
-#define FLASH_CFG_CODE_FLASH_BGO   (1)
-
-
-/******************************************************************************
- ENABLE CODE FLASH SELF-PROGRAMMING
-******************************************************************************/
-/* Set this to 0 when programming code flash while executing in RAM.
- * Set this to 1 when programming code flash while executing from another
- * segment in ROM (possible only with RX64M, RX71M, RX65N-2, RX72M groups).
- * See section 2.16 in the App Note.
- */
-#define FLASH_CFG_CODE_FLASH_RUN_FROM_ROM   (1)
-
-
-#endif /* FLASH_CONFIG_HEADER_FILE */
diff --git a/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_irq_rx_config.h b/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_irq_rx_config.h
deleted file mode 100644
index 3fd5e871..00000000
--- a/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_irq_rx_config.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
-* applicable laws, including copyright laws.
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the
-* following link:
-* http://www.renesas.com/disclaimer
-*
-* Copyright (C) 2013-2018 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name    : r_irq_rx_config.h
-* Device(s)    : Renesas RX Family
-* Tool-Chain   : Renesas RX Standard Toolchain
-* H/W Platform :
-* Description  : User configurable options and setup definitions for the RX IRQ support module.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* History : DD.MM.YYYY  Version Description
-*         : 15.07.2013  1.00    First Release
-*         : 04.04.2014  1.20    Using the definition of VECT_ICU_IRQ15 to check the number of IRQs.
-*         : 30.09.2015  1.70    Using the definition of VECT_ICU_IRQ7  to check the number of IRQs.
-*         : 28.09.2018  2.30    Updated the coding rules of Renesas.
-***********************************************************************************************************************/
-#ifndef IRQ_CONFIG_H
-#define IRQ_CONFIG_H
-/***********************************************************************************************************************
-Includes   <System Includes> , "Project Includes"
-***********************************************************************************************************************/
-#include "platform.h"
-#include "r_irq_rx_if.h"
-
-/***********************************************************************************************************************
-Macro definitions
-***********************************************************************************************************************/
-
-/* Set this value to 1 to enable locking functions for the IRQ APIs, otherwise set to 0 to ignore locking.
- * If locking is enabled, the application must obtain a lock on the selected IRQ before making calls to the API
- * for that IRQ. If locking is disabled, any caller has unrestricted access to any IRQ function. Disabling is
- * provided for systems that require faster and smaller code, however care must be taken to prevent reentrancy or
- * conflict over resource usage.
- */
-#define IRQ_CFG_REQUIRE_LOCK    (1)
-
-/* Checking of arguments passed to IRQ API functions can be enable or disabled.
- * Disabling argument checking is provided for systems that absolutely require faster and smaller code.
- * By default the module is configured to use the setting of the system-wide BSP_CFG_PARAM_CHECKING_ENABLE macro.
- * This can be overridden for the local module by redefining IRQ_CFG_PARAM_CHECKING.
- * To control parameter checking locally, set IRQ_CFG_PARAM_CHECKING to 1 to enable it, otherwise set to 0 skip checking.
- *
- * Use this option with caution.
- */
-
-#define IRQ_CFG_PARAM_CHECKING  (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-
-/* *********************************************************************************************************************
- * IRQ enabling and port assignments
- *
- * If you are using Smart Configurator for pin assignment, use the following:
- *   #include "r_irq_rx_pinset.h"
- *   #ifndef R_IRQ_RX_PINSET_H
- *   #error "Please check IRQ port assignments in Smart Configurator"
- *   #endif
- * and comment out the following:
- *   #define IRQ_PORT_IRQ0_PORT     ('m') 
- *   #define IRQ_PORT_IRQ0_BIT      ('n')
- *          ...
- *   #define IRQ_PORT_IRQ15_PORT     ('m') 
- *   #define IRQ_PORT_IRQ15_BIT      ('n')
- * --------------------------------------------------------------------------------------------
- * Conversely, if you are using FIT Configurator for pin assignment, comment out the following:
- *   #include "r_irq_rx_pinset.h"
- *   #ifndef R_IRQ_RX_PINSET_H
- *   #error "Please check IRQ port assignments in Smart Configurator"
- *   #endif
- * and use the following:
- *   #define IRQ_PORT_IRQ0_PORT     ('m') 
- *   #define IRQ_PORT_IRQ0_BIT      ('n')
- *          ...
- *   #define IRQ_PORT_IRQ15_PORT     ('m') 
- *   #define IRQ_PORT_IRQ15_BIT      ('n')
- * Use these defines to select IRQs that are to be used in your system.
- * This will eliminate the generation of code for unused IRQs.
- *
- * IRQs intended for use must have an I/O port and bit assigned. Use these definitions to make the assignments.
- * These are decoded by the API to map to the port input data registers.
- * Set these as required according to the following format:
- * #define IRQ_PORT_IRQ0_PORT     ('m') where m is the port number and the IRQ number replaces *
- * ##define IRQ_PORT_IRQ0_BIT     ('n') where n is the bit number and the IRQ number replaces *
- * Port assignments here must match the port configuration settings performed externally for them.
-***********************************************************************************************************************/
-#include "r_irq_rx_pinset.h"
-#ifndef R_IRQ_RX_H
-#error "Please add IRQ Pin setting in Smart Configurator, or if you are using FIT Configurator remove the comment of following macros"
-#endif
-/*
-#define IRQ_PORT_IRQ0_PORT      ('m')
-#define IRQ_PORT_IRQ0_BIT       ('n')
-
-#define IRQ_PORT_IRQ1_PORT      ('m')
-#define IRQ_PORT_IRQ1_BIT       ('n')
-
-#define IRQ_PORT_IRQ2_PORT      ('m')
-#define IRQ_PORT_IRQ2_BIT       ('n')
-
-#define IRQ_PORT_IRQ3_PORT      ('m')
-#define IRQ_PORT_IRQ3_BIT       ('n')
-
-#define IRQ_PORT_IRQ4_PORT      ('m')
-#define IRQ_PORT_IRQ4_BIT       ('n')
-
-#define IRQ_PORT_IRQ5_PORT      ('m')
-#define IRQ_PORT_IRQ5_BIT       ('n')
-
-#if defined(VECT_ICU_IRQ7)               // For MCUs with 8 IRQs
-#define IRQ_PORT_IRQ6_PORT      ('m')
-#define IRQ_PORT_IRQ6_BIT       ('n')
-
-#define IRQ_PORT_IRQ7_PORT      ('m')
-#define IRQ_PORT_IRQ7_BIT       ('n')
-#endif // #if defined(VECT_ICU_IRQ7)
-
-#if defined(VECT_ICU_IRQ15)              // For MCUs with 16 IRQs
-#define IRQ_PORT_IRQ8_PORT      ('m')
-#define IRQ_PORT_IRQ8_BIT       ('n')
-
-#define IRQ_PORT_IRQ9_PORT      ('m')
-#define IRQ_PORT_IRQ9_BIT       ('n')
-
-#define IRQ_PORT_IRQ10_PORT     ('m')
-#define IRQ_PORT_IRQ10_BIT      ('n')
-
-#define IRQ_PORT_IRQ11_PORT     ('m')
-#define IRQ_PORT_IRQ11_BIT      ('n')
-
-#define IRQ_PORT_IRQ12_PORT     ('m')
-#define IRQ_PORT_IRQ12_BIT      ('n')
-
-#define IRQ_PORT_IRQ13_PORT     ('m')
-#define IRQ_PORT_IRQ13_BIT      ('n')
-
-#define IRQ_PORT_IRQ14_PORT     ('m')
-#define IRQ_PORT_IRQ14_BIT      ('n')
-
-#define IRQ_PORT_IRQ15_PORT     ('m')
-#define IRQ_PORT_IRQ15_BIT      ('n')
-#endif // #if defined(VECT_ICU_IRQ15)
-*/
-
-/***********************************************************************************************************************
-Digital Filtering
-***********************************************************************************************************************/
-/* To enable digital noise filtering with the selected IRQ.
- * Set the value to 1 to enable the filter or 0 to disable it. */
-#define IRQ_CFG_FILT_EN_IRQ0       (0)   /* Filtering disabled on IRQ 0. */
-#define IRQ_CFG_FILT_EN_IRQ1       (0)   /* Filtering disabled on IRQ 1. */
-#define IRQ_CFG_FILT_EN_IRQ2       (0)   /* Filtering disabled on IRQ 2. */
-#define IRQ_CFG_FILT_EN_IRQ3       (0)   /* Filtering disabled on IRQ 3. */
-#define IRQ_CFG_FILT_EN_IRQ4       (0)   /* Filtering disabled on IRQ 4. */
-#define IRQ_CFG_FILT_EN_IRQ5       (0)   /* Filtering disabled on IRQ 5. */
-#define IRQ_CFG_FILT_EN_IRQ6       (0)   /* Filtering disabled on IRQ 6. */
-#define IRQ_CFG_FILT_EN_IRQ7       (0)   /* Filtering disabled on IRQ 7. */
-#define IRQ_CFG_FILT_EN_IRQ8       (0)   /* Filtering disabled on IRQ 8. */
-#define IRQ_CFG_FILT_EN_IRQ9       (0)   /* Filtering disabled on IRQ 9. */
-#define IRQ_CFG_FILT_EN_IRQ10      (0)   /* Filtering disabled on IRQ 10. */
-#define IRQ_CFG_FILT_EN_IRQ11      (0)   /* Filtering disabled on IRQ 11. */
-#define IRQ_CFG_FILT_EN_IRQ12      (0)   /* Filtering disabled on IRQ 12. */
-#define IRQ_CFG_FILT_EN_IRQ13      (0)   /* Filtering disabled on IRQ 13. */
-#define IRQ_CFG_FILT_EN_IRQ14      (0)   /* Filtering disabled on IRQ 14. */
-#define IRQ_CFG_FILT_EN_IRQ15      (0)   /* Filtering disabled on IRQ 15. */
-
-/* Example settings for IRQ input pin digital filtering sample clock divisors for each IRQ.
- * Change as required by selecting a divisor value from the IRQ_CFG_PCLK_DIVxx definitions.
- * Filtering must be enabled for the corresponding IRQ for these settings to be effective.  */
-#define IRQ_CFG_FILT_PLCK_IRQ0    (IRQ_CFG_PCLK_DIV64)  /* Filter sample clock divisor for IRQ 0 = PCLK/64. */
-#define IRQ_CFG_FILT_PLCK_IRQ1    (IRQ_CFG_PCLK_DIV64)  /* Filter sample clock divisor for IRQ 1 = PCLK/64. */
-#define IRQ_CFG_FILT_PLCK_IRQ2    (IRQ_CFG_PCLK_DIV64)  /* Filter sample clock divisor for IRQ 2 = PCLK/64. */
-#define IRQ_CFG_FILT_PLCK_IRQ3    (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 3 = PCLK. */
-#define IRQ_CFG_FILT_PLCK_IRQ4    (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 4 = PCLK. */
-#define IRQ_CFG_FILT_PLCK_IRQ5    (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 5 = PCLK. */
-#define IRQ_CFG_FILT_PLCK_IRQ6    (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 6 = PCLK. */
-#define IRQ_CFG_FILT_PLCK_IRQ7    (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 7 = PCLK. */
-#define IRQ_CFG_FILT_PLCK_IRQ8    (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 8 = PCLK. */
-#define IRQ_CFG_FILT_PLCK_IRQ9    (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 9 = PCLK. */
-#define IRQ_CFG_FILT_PLCK_IRQ10   (IRQ_CFG_PCLK_DIV64)  /* Filter sample clock divisor for IRQ 10 = PCLK/64. */
-#define IRQ_CFG_FILT_PLCK_IRQ11   (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 11 = PCLK. */
-#define IRQ_CFG_FILT_PLCK_IRQ12   (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 12 = PCLK. */
-#define IRQ_CFG_FILT_PLCK_IRQ13   (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 13 = PCLK. */
-#define IRQ_CFG_FILT_PLCK_IRQ14   (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 14 = PCLK. */
-#define IRQ_CFG_FILT_PLCK_IRQ15   (IRQ_CFG_PCLK_DIV1)   /* Filter sample clock divisor for IRQ 15 = PCLK. */
-
-/***********************************************************************************************************************
-Typedef definitions
-***********************************************************************************************************************/
-
-      
-#endif /* IRQ_CONFIG_H */
diff --git a/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_s12ad_rx_config.h b/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_s12ad_rx_config.h
deleted file mode 100644
index 3b94f537..00000000
--- a/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_s12ad_rx_config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer 
-*
-* Copyright (C) 2013 Renesas Electronics Corporation. All rights reserved.    
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name     : r_s12ad_rx_config.h
-* Description   : Configures the 12-bit A/D driver
-************************************************************************************************************************
-* History : DD.MM.YYYY Version Description
-*           22.07.2013 1.00    Initial Release.
-*           21.04.2014 1.20    Updated for RX210 advanced features; RX110/63x support.
-*           05.04.2019 4.00    Deleted the macro definition of ADC_CFG_PGA_GAIN.
-***********************************************************************************************************************/
-#ifndef S12AD_CONFIG_H
-#define S12AD_CONFIG_H
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-
-/*
- * SPECIFY WHETHER TO INCLUDE CODE FOR API PARAMETER CHECKING
- * Setting to BSP_CFG_PARAM_CHECKING_ENABLE utilizes the system default setting.
- * Setting to 1 includes parameter checking; 0 compiles out parameter checking.
- */
-#define ADC_CFG_PARAM_CHECKING_ENABLE   BSP_CFG_PARAM_CHECKING_ENABLE
-
-#endif /* S12AD_CONFIG_H */
diff --git a/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_sci_rx_config.h b/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_sci_rx_config.h
deleted file mode 100644
index d2dd3363..00000000
--- a/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_sci_rx_config.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No 
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all 
-* applicable laws, including copyright laws. 
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, 
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM 
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES 
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS 
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of 
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the 
-* following link:
-* http://www.renesas.com/disclaimer 
-*
-* Copyright (C) 2013-2022 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name     : r_sci_rx_config.h
-* Description   : Configures the SCI driver
-************************************************************************************************************************
-* History : DD.MM.YYYY Version Description
-*           25.09.2013 1.00    Initial Release
-*           17.04.2014 1.20    Added comments for new RX110 support.
-*           02.07.2014 1.30    Fixed bug that caused Group12 rx errors to only be enabled for channel 2.
-*           25.11.2014 1.40    Added comments for RX113 support
-*           30.09.2015 1.70    Added comments for RX23T support
-*           01.10.2016 1.80    Added support for RX65N (comments and TX/RX FIFO THRESHOLD options)
-*           19.12.2016 1.90    Added comments for RX24U support
-*           07.03.2017 2.00    Added comments for RX130-512KB support
-*           28.09.2018 2.10    Added comments for RX66T support
-*           01.02.2019 2.20    Added comments for RX72T, RX65N-64pin support
-*                              Added support received data match function for RX65N
-*           28.06.2019 3.10    Added comments for RX23W support
-*           15.08.2019 3.20    Added support received data match function for RX72M (SCI0- SCI11)
-*                              Added support FIFO mode for RX72M (SCI7 - SCI11)
-*           25.11.2019 3.30    Added support RX13T.
-*                              Removed support for Generation 1 devices.
-*           30.12.2019 3.40    Added support RX66N, RX72N.
-*           31.03.2020 3.50    Added support RX23E-A.
-*           25.08.2020 3.60    Added feature using DTC/DMAC in SCI transfer.
-*                              Merged IrDA functionality to SCI FIT.
-*           31.03.2021 3.80    Added support for RX671.
-*                              Added support circular buffer in mode asynchronous.
-*           15.04.2021 3.90    Added support for RX140.
-*           31.03.2022 4.40    Added support for RX660.
-***********************************************************************************************************************/
-#ifndef SCI_CONFIG_H
-#define SCI_CONFIG_H
-
-#include "platform.h"
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-
-/* SPECIFY WHETHER TO INCLUDE CODE FOR API PARAMETER CHECKING */
-/* Setting to BSP_CFG_PARAM_CHECKING_ENABLE utilizes the system default setting */
-/* Setting to 1 includes parameter checking; 0 compiles out parameter checking */
-#define SCI_CFG_PARAM_CHECKING_ENABLE   (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-/* SPECIFY WHETHER TO INCLUDE CODE FOR DIFFERENT SCI MODES */
-/* Setting an equate to 1 includes code specific to that mode. */
-#define SCI_CFG_ASYNC_INCLUDED  (1)
-#define SCI_CFG_SYNC_INCLUDED   (0)
-#define SCI_CFG_SSPI_INCLUDED   (0)
-#define SCI_CFG_IRDA_INCLUDED   (0)
-
-/* Use circular buffer in mode asynchronous */
-/* 1=Use , 0=Unused */
-/* When SCI_CFG_USE_CIRCULAR is 1, please set BSP_CFG_RUN_IN_USER_MODE = 0  and BYTEQ_CFG_PROTECT_QUEUE = 1*/
-#define SCI_CFG_USE_CIRCULAR_BUFFER (0)
-
-/* SPECIFY BYTE VALUE TO TRANSMIT WHILE CLOCKING IN DATA IN SSPI MODES */
-#define SCI_CFG_DUMMY_TX_BYTE   (0xFF)
-
-/* SPECIFY CHANNELS TO INCLUDE SOFTWARE SUPPORT FOR 1=included, 0=not */
-/*
- * NOTE: If using ASYNC mode, adjust BYTEQ_CFG_MAX_CTRL_BLKS in r_byteq_config.h
- * to provide 2 queues per channel (static mode only).
- * * = port connector RSKRX11x
- * u = channel used by the USB-UART port (G1CUSB0)
- * a = this channel is used only for RX130-512KB
- * n = this channel is not available for RX65N-64pin.
- * s = this channel is not available in simple SPI mode.
- * i = this channel is available in IrDA interface.
- * RX MCU supported channels
- *
- * CH#  110 111 113 130 140 230  231  23T 24T 24U 64M 71M 65N 66T 72T 23W 72M 13T 72N 66N 23E-A 671 660
- * ---  --- --- --- --- --- --- ----- --- --- --- --- --- --- --- --- --- --- --- --- --- ----- --- ---
- * CH0           X   Xa      X    X                X   X   Xn              X       X   X          X   X
- * CH1   X   X*  X*  Xu   X  X    X    Xu  Xu  Xu  X   X   Xs  X   X   X   X   X   X   X    Xu    X   X
- * CH2           X                                 X   X   Xu              X       X   X          X   X
- * CH3                                             X   X   Xs              X       X   X          X   X
- * CH4                                             X   X   Xn              X       X   X          X   X
- * CH5   X   X   Xi  X    X  Xi   Xu,i X   X   X   X   X   X   X   X   Xi  X   X   X   X    X     X   X
- * CH6           X   X    X  X    X        X   X   X   X   Xn  X   X       Xu      X   X    X     X   X
- * CH7                                             Xu  Xu  Xn              X       X   X          X   X
- * CH8           X   Xa   X  X    X            X           X   X   X   Xu  X       X   X          X   X
- * CH9           X   Xa   X  X    X            X           Xs  X   X       X       X   X          X   X
- * CH10                                                    X               X       X   X          X   X
- * CH11                                        X           Xs  X   X       X       X   X          X   X
- * CH12  X   X   X   X    X  X    X                X   X   Xs  X   X   X   X   X   X   X    X     X   X
-*/
-                                   
-#define SCI_CFG_CH0_INCLUDED    (0)
-#define SCI_CFG_CH1_INCLUDED    (0)
-#define SCI_CFG_CH2_INCLUDED    (0)
-#define SCI_CFG_CH3_INCLUDED    (0)
-#define SCI_CFG_CH4_INCLUDED    (0)
-#define SCI_CFG_CH5_INCLUDED    (1)
-#define SCI_CFG_CH6_INCLUDED    (1)
-#define SCI_CFG_CH7_INCLUDED    (0)
-#define SCI_CFG_CH8_INCLUDED    (0)
-#define SCI_CFG_CH9_INCLUDED    (0)
-#define SCI_CFG_CH10_INCLUDED   (0)
-#define SCI_CFG_CH11_INCLUDED   (0)
-#define SCI_CFG_CH12_INCLUDED   (0)
-
-/* SPECIFY ASYNC MODE TX QUEUE BUFFER SIZES (will not allocate if chan not enabled */
-#define SCI_CFG_CH0_TX_BUFSIZ   (80)
-#define SCI_CFG_CH1_TX_BUFSIZ   (80)
-#define SCI_CFG_CH2_TX_BUFSIZ   (80)
-#define SCI_CFG_CH3_TX_BUFSIZ   (80)
-#define SCI_CFG_CH4_TX_BUFSIZ   (80)
-#define SCI_CFG_CH5_TX_BUFSIZ   (80)
-#define SCI_CFG_CH6_TX_BUFSIZ   (2180)
-#define SCI_CFG_CH7_TX_BUFSIZ   (80)
-#define SCI_CFG_CH8_TX_BUFSIZ   (80)
-#define SCI_CFG_CH9_TX_BUFSIZ   (80)
-#define SCI_CFG_CH10_TX_BUFSIZ  (80)
-#define SCI_CFG_CH11_TX_BUFSIZ  (80)
-#define SCI_CFG_CH12_TX_BUFSIZ  (80)
-
-/* SPECIFY ASYNC MODE RX QUEUE BUFFER SIZES (will not allocate if chan not enabled */
-#define SCI_CFG_CH0_RX_BUFSIZ   (80)
-#define SCI_CFG_CH1_RX_BUFSIZ   (80)
-#define SCI_CFG_CH2_RX_BUFSIZ   (80)
-#define SCI_CFG_CH3_RX_BUFSIZ   (80)
-#define SCI_CFG_CH4_RX_BUFSIZ   (80)
-#define SCI_CFG_CH5_RX_BUFSIZ   (80)
-#define SCI_CFG_CH6_RX_BUFSIZ   (8192)
-#define SCI_CFG_CH7_RX_BUFSIZ   (80)
-#define SCI_CFG_CH8_RX_BUFSIZ   (80)
-#define SCI_CFG_CH9_RX_BUFSIZ   (80)
-#define SCI_CFG_CH10_RX_BUFSIZ  (80)
-#define SCI_CFG_CH11_RX_BUFSIZ  (80)
-#define SCI_CFG_CH12_RX_BUFSIZ  (80)
-
-/* 
-* ENABLE TRANSMIT END INTERRUPT (ASYNCHRONOUS)
-* This interrupt only occurs when the last bit of the last byte of data 
-* has been sent and the transmitter has become idle. The interrupt calls
-* the user's callback function specified in R_SCI_Open() and passes it an
-* SCI_EVT_TEI event. A typical use of this feature is to disable an external
-* transceiver to save power. It would then be up to the user's code to 
-* re-enable the transceiver before sending again. Not including this feature
-* reduces code space used by the interrupt. Note that this equate is only
-* for including the TEI code. The interrupt itself must be enabled using an
-* R_SCI_Control(hdl, SCI_CMD_EN_TEI, NULL) call.
-*/
-#define SCI_CFG_TEI_INCLUDED    (1)      /* 1=included, 0=not */
-
-/* 
-* SET GROUPBL0 (ERI, TEI) INTERRUPT PRIORITY; RX64M/RX71M/RX65N/RX72M/RX72N/RX66N/RX671/RX660 ONLY
-* SET GROUPBL1; RX65N ONLY
-* SET GROUPAL0 (ERI,TEI) INTERRUPT PRIORITY; RX65N, RX72M, RX72N, RX66N ONLY
-* This sets the priority level for receiver overrun, framing, and parity errors
-* as well as TEI interrupts for all SCI channels.
-*/
-#define SCI_CFG_ERI_TEI_PRIORITY (3)     /* (RX64M/RX71M/RX65N/RX72M/RX72N/RX66N/RX671/RX660 ONLY) 1 lowest, 15 highest */
-
-/* ENABLE TX/RX FIFO; (SCIi supported MCU ONLY) 1=included, 0=not */
-#define SCI_CFG_CH7_FIFO_INCLUDED   (0)
-#define SCI_CFG_CH8_FIFO_INCLUDED   (0)
-#define SCI_CFG_CH9_FIFO_INCLUDED   (0)
-#define SCI_CFG_CH10_FIFO_INCLUDED  (0)
-#define SCI_CFG_CH11_FIFO_INCLUDED  (0)
-
-/* SET TX FIFO THRESHOLD; (SCIi supported MCU ONLY) 0 lowest, 15 highest */
-/* TX FIFO THRESHOLD is invalid in Clock Synchronous Mode and Simple SPI Mode. */
-/* Set the same value for TX FIFO THRESHOLD and RX FIFO THRESHOLD in Clock Synchronous Mode and Simple SPI Mode. */
-#define SCI_CFG_CH7_TX_FIFO_THRESH (8)
-#define SCI_CFG_CH8_TX_FIFO_THRESH (8)
-#define SCI_CFG_CH9_TX_FIFO_THRESH (8)
-#define SCI_CFG_CH10_TX_FIFO_THRESH (8)
-#define SCI_CFG_CH11_TX_FIFO_THRESH (8)
-
-/* SET RX FIFO THRESHOLD; (SCIi supported MCU ONLY) 1 lowest, 15 highest */
-#define SCI_CFG_CH7_RX_FIFO_THRESH (8)
-#define SCI_CFG_CH8_RX_FIFO_THRESH (8)
-#define SCI_CFG_CH9_RX_FIFO_THRESH (8)
-#define SCI_CFG_CH10_RX_FIFO_THRESH (8)
-#define SCI_CFG_CH11_RX_FIFO_THRESH (8)
-
-/* ENABLE Received Data match function (SCIj and SCIi supported MCU RX65N/RX66T/RX72T/RX72M/RX72N/RX66N ONLY) 1=included, 0=not */
-/*((SCIk and SCIm supported MCU RX671/RX660 ONLY) 1=included, 0=not */
-#define SCI_CFG_CH0_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH1_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH2_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH3_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH4_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH5_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH6_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH7_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH8_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH9_DATA_MATCH_INCLUDED  (0)
-#define SCI_CFG_CH10_DATA_MATCH_INCLUDED (0)
-#define SCI_CFG_CH11_DATA_MATCH_INCLUDED (0)
-
-/* 0=Disable, 1=DTC, 2=DMAC */
-#define SCI_CFG_CH0_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH1_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH2_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH3_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH4_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH5_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH6_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH7_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH8_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH9_TX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH10_TX_DTC_DMACA_ENABLE (0)
-#define SCI_CFG_CH11_TX_DTC_DMACA_ENABLE (0)
-#define SCI_CFG_CH12_TX_DTC_DMACA_ENABLE (0)
-
-#define SCI_CFG_CH0_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH1_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH2_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH3_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH4_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH5_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH6_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH7_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH8_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH9_RX_DTC_DMACA_ENABLE  (0)
-#define SCI_CFG_CH10_RX_DTC_DMACA_ENABLE (0)
-#define SCI_CFG_CH11_RX_DTC_DMACA_ENABLE (0)
-#define SCI_CFG_CH12_RX_DTC_DMACA_ENABLE (0)
-
-/* 0~7 8 channels dmac, but maximum of SCI channel is 13 channel => cost 13*2 = 26 dmac channels in case all of sci channels run simultaneously */
-#define SCI_CFG_CH0_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH1_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH2_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH3_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH4_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH5_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH6_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH7_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH8_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH9_TX_DMACA_CH_NUM      (0)
-#define SCI_CFG_CH10_TX_DMACA_CH_NUM     (0)
-#define SCI_CFG_CH11_TX_DMACA_CH_NUM     (0)
-#define SCI_CFG_CH12_TX_DMACA_CH_NUM     (0)
-
-#define SCI_CFG_CH0_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH1_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH2_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH3_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH4_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH5_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH6_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH7_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH8_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH9_RX_DMACA_CH_NUM      (1)
-#define SCI_CFG_CH10_RX_DMACA_CH_NUM     (1)
-#define SCI_CFG_CH11_RX_DMACA_CH_NUM     (1)
-#define SCI_CFG_CH12_RX_DMACA_CH_NUM     (1)
-
-/* Set enable/ disable transmit signal transition timing adjust feature for each channel*/
-#define SCI_CFG_CH0_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH1_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH2_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH3_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH4_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH5_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH6_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH7_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH8_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH9_TX_SIGNAL_TRANSITION_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH10_TX_SIGNAL_TRANSITION_TIMING_INCLUDED   (0)
-#define SCI_CFG_CH11_TX_SIGNAL_TRANSITION_TIMING_INCLUDED   (0)
-
-/* Set enable/ disable receive data sampling timing adjust feature for each channel*/
-#define SCI_CFG_CH0_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH1_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH2_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH3_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH4_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH5_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH6_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH7_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH8_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH9_RX_DATA_SAMPLING_TIMING_INCLUDED    (0)
-#define SCI_CFG_CH10_RX_DATA_SAMPLING_TIMING_INCLUDED   (0)
-#define SCI_CFG_CH11_RX_DATA_SAMPLING_TIMING_INCLUDED   (0)
-
-/* SPECIFY IRDA CHANNELS TO INCLUDE SOFTWARE (SUPPORTED MCU RX113/RX23W/RX231/RX230 ONLY) 1=included, 0=not */
-#define SCI_CFG_CH5_IRDA_INCLUDED    (0)
-
-/* Set the non-active level of the TXD pin */
-/* 1=High , 0=Low */
-#define SCI_CFG_CH5_IRDA_IRTXD_INACTIVE_LEVEL (1)
-
-/* Set the non-active level of the RXD pin */
-/* 1=High , 0=Low */
-#define SCI_CFG_CH5_IRDA_IRRXD_INACTIVE_LEVEL (1)
-
-#endif /* SCI_CONFIG_H */
diff --git a/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_tsip_rx_config.h b/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_tsip_rx_config.h
deleted file mode 100644
index a8d7db11..00000000
--- a/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_tsip_rx_config.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* Generated configuration header file - do not edit */
-/**********************************************************************************************************************
- * DISCLAIMER
- * This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
- * other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
- * applicable laws, including copyright laws.
- * THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
- * THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
- * EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
- * SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO
- * THIS SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
- * this software. By using this software, you agree to the additional terms and conditions found by accessing the
- * following link:
- * http://www.renesas.com/disclaimer
- *
- * Copyright (C) 2015-2023 Renesas Electronics Corporation. All rights reserved.
- *********************************************************************************************************************/
-/**********************************************************************************************************************
- * File Name    : r_tsip_rx_config.h
- * Version      : 1.17
- * Description  : Configuration options for the r_tsip_rx module.
- *********************************************************************************************************************/
-/**********************************************************************************************************************
- * History : DD.MM.YYYY Version  Description
- *         : 27.06.2015 1.00     First Release
- *         : 15.05.2017 1.01     Add AES-CMAC
- *         : 30.09.2017 1.03     Add Init/Update/Final API and SHA, RSA
- *         : 28.02.2018 1.04     Change Init/Update/Final API for RX231, add TLS function and 
- *         :                     return values change FIT rules.
- *         : 30.04.2018 1.05     Add TDES, MD5 and RSAES-PKCS1-v1_5 API
- *         : 28.09.2018 1.06     Add RSA Key Generation, AES, TDES, RSA Key update features, RX66T support
- *         : 28.12.2018 1.07     Add RX72T support
- *         : 30.09.2019 1.08     Added support for GCC and IAR compiler, ECC API, RX23W and RX72M
- *         : 31.03.2020 1.09     Added support for AES-CCM, HMAC key generation, ECDH, Key wrap API, RX66N and RX72N
- *         : 30.06.2020 1.10     Added support for ARC4, ECC(P-384) API
- *         : 30.09.2020 1.11     Added support for DH, ECDHE P-512r1 API, and generalization of KDF.
- *         :                     Added support for Key wrap API with TSIP-Lite.
- *         : 30.06.2021 1.12     Added support for RX23W chip version D
- *         : 31.08.2021 1.13     Added support for RX671
- *         : 22.10.2021 1.14     Added support for TLS1.3
- *         : 31.03.2022 1.15     Added support for TLS1.3(RX72M_RX72N_RX66N)
- *         : 15.09.2022 1.16     Added support for RSA 3k/4k and updated support for TLS1.3
- *         : 20.01.2023 1.17     Added support for TLS1.3 server
- *********************************************************************************************************************/
-
-/**********************************************************************************************************************
- Macro definitions
- *********************************************************************************************************************/
-
-#ifndef R_TSIP_RX_CONFIG_HEADER_FILE
-#define R_TSIP_RX_CONFIG_HEADER_FILE
-
-/* For AES operation. */
-#define TSIP_AES_128_ECB_ENCRYPT    (1)
-#define TSIP_AES_256_ECB_ENCRYPT    (1)
-#define TSIP_AES_128_ECB_DECRYPT    (1)
-#define TSIP_AES_256_ECB_DECRYPT    (1)
-#define TSIP_AES_128_CBC_ENCRYPT    (1)
-#define TSIP_AES_256_CBC_ENCRYPT    (1)
-#define TSIP_AES_128_CBC_DECRYPT    (1)
-#define TSIP_AES_256_CBC_DECRYPT    (1)
-#define TSIP_AES_128_CTR            (1)
-#define TSIP_AES_256_CTR            (1)
-#define TSIP_AES_128_GCM_ENCRYPT    (1)
-#define TSIP_AES_256_GCM_ENCRYPT    (1)
-#define TSIP_AES_128_GCM_DECRYPT    (1)
-#define TSIP_AES_256_GCM_DECRYPT    (1)
-#define TSIP_AES_128_CMAC           (1)
-#define TSIP_AES_256_CMAC           (1)
-#define TSIP_AES_128_CCM_ENCRYPT    (1)
-#define TSIP_AES_256_CCM_ENCRYPT    (1)
-#define TSIP_AES_128_CCM_DECRYPT    (1)
-#define TSIP_AES_256_CCM_DECRYPT    (1)
-#define TSIP_AES_128_KEY_WRAP       (1)
-#define TSIP_AES_256_KEY_WRAP       (1)
-
-/* For TDES operation. */
-#define TSIP_TDES_ECB_ENCRYPT   (1)
-#define TSIP_TDES_ECB_DECRYPT   (1)
-#define TSIP_TDES_CBC_ENCRYPT   (1)
-#define TSIP_TDES_CBC_DECRYPT   (1)
-
-/* For ARC4 operation. */
-#define TSIP_ARC4_ENCRYPT   (1)
-#define TSIP_ARC4_DECRYPT   (1)
-
-/* For HASH operation. */
-#define TSIP_SHA_1      (1)
-#define TSIP_SHA_256    (1)
-#define TSIP_MD5        (1)
-
-/* For HMAC operation. */
-#define TSIP_SHA_1_HMAC     (1)
-#define TSIP_SHA_256_HMAC   (1)
-
-/* For RSA operation. */
-#define TSIP_RSAES_1024         (1)
-#define TSIP_RSAES_2048         (1)
-#define TSIP_RSAES_3072         (1)
-#define TSIP_RSAES_4096         (1)
-#define TSIP_RSASSA_1024        (1)
-#define TSIP_RSASSA_2048        (1)
-#define TSIP_RSASSA_3072        (1)
-#define TSIP_RSASSA_4096        (1)
-    /* 5*(key_length/2) is recommended by NIST FIPS186-4, 5120 is for key_length = 2048. *2 means the margin. */
-#define TSIP_RSA_RETRY_COUNT_FOR_RSA_KEY_GENERATION (5120*2)
-
-/* For ECC operation. */
-#define TSIP_ECDSA_P192            (1)
-#define TSIP_ECDSA_P224            (1)
-#define TSIP_ECDSA_P256            (1)
-#define TSIP_ECDSA_P384            (1)
-#define TSIP_ECDH_P256             (1)
-#define TSIP_USER_SHA_384_ENABLED  (0)
-#define TSIP_USER_SHA_384_FUNCTION (user_sha384_function)
-
-/* For TLS. */
-#define TSIP_TLS    (1)
-
-/* Firmware update. */
-#define TSIP_SECURE_BOOT        (0)
-#define TSIP_FIRMWARE_UPDATE    (1)
-
-/* For multi threading */
-#define TSIP_MULTI_THREADING                    (0)
-#define TSIP_MULTI_THREADING_LOCK_FUNCTION      (user_lock_function)
-#define TSIP_MULTI_THREADING_UNLOCK_FUNCTION    (user_unlock_function)
-
-/* Key update. */
-#if defined BSP_MCU_RX231 || defined BSP_MCU_RX23W || defined BSP_MCU_RX66T || defined BSP_MCU_RX72T
-#define TSIP_INSTALL_KEY_RING_INDEX (0) /* 0-15 */
-#else
-#define TSIP_INSTALL_KEY_RING_INDEX (1) /* 0-15 */
-#endif  /* defined BSP_MCU_RX231 || defined BSP_MCU_RX23W || defined BSP_MCU_RX66T || defined BSP_MCU_RX72T */
-
-#endif /* R_TSIP_RX_CONFIG_HEADER_FILE */
diff --git a/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_wifi_da16xxx_config.h b/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_wifi_da16xxx_config.h
deleted file mode 100644
index 47ca3cdb..00000000
--- a/Configuration/samples/common/ck-rx65n/wifi/src/smc_gen/r_config/r_wifi_da16xxx_config.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/* Generated configuration header file - do not edit */
-/**********************************************************************************************************************
- * DISCLAIMER
- * This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
- * other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
- * applicable laws, including copyright laws.
- * THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
- * THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
- * EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
- * SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO
- * THIS SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
- * this software. By using this software, you agree to the additional terms and conditions found by accessing the
- * following link:
- * http://www.renesas.com/disclaimer
- *
- * Copyright (C) 2023 Renesas Electronics Corporation. All rights reserved.
- *********************************************************************************************************************/
-/**********************************************************************************************************************
- * File Name    : r_wifi_da16xxx_config.h
- * Description  : DA16XXX WiFi driver Configuration.
- *********************************************************************************************************************/
-
-/**********************************************************************************************************************
- Includes   <System Includes> , "Project Includes"
- *********************************************************************************************************************/
-
-/**********************************************************************************************************************
- Macro definitions
- *********************************************************************************************************************/
-#ifndef R_WIFI_DA16XXX_CONFIG_H
-#define R_WIFI_DA16XXX_CONFIG_H
-
-#define WIFI_CFG_DA16600_SUPPORT              1
-
-#define WIFI_CFG_SCI_CHANNEL                  (6)
-
-#define WIFI_CFG_SCI_INTERRUPT_LEVEL          (4)
-
-#define WIFI_CFG_SCI_PCLK_HZ                  (60000000)  // peripheral clock speed in Clocks tab of Smart Configuration
-
-#define WIFI_CFG_SCI_BAUDRATE                 (115200)
-
-#define WIFI_CFG_CTS_SW_CTRL                  (1)
-
-#define WIFI_CFG_CTS_PORT                     J
-#define WIFI_CFG_CTS_PIN                      3
-
-#define WIFI_CFG_RTS_PORT                     J
-#define WIFI_CFG_RTS_PIN                      3
-#define WIFI_CFG_PFS_SET_VALUE                0x0AU
-
-#define WIFI_CFG_RESET_PORT                   5
-#define WIFI_CFG_RESET_PIN                    5
-
-/* Board dependent settings; please use the value for each setting listed below depending on the board you use.
-
-Preprocessors that define board dependent settings and the corresponding values to be set are as follows:
-Confirmed board number          1      2      3      4      5      6      7      8      9      10
-WIFI_CFG_SCI_CHANNEL            0      2      6      1      6      0      6      2      5      5
-WIFI_CFG_SCI_PCLK_HZ (*note1)   60000000
-WIFI_CFG_CTS_PORT               2      J      J      3      J      2      J      J      C      C
-WIFI_CFG_CTS_PIN                3      5      3      1      3      3      3      5      0      0
-WIFI_CFG_RTS_PORT               2      J      J      3      J      2      J      J      C      C
-WIFI_CFG_RTS_PIN                3      5      3      1      3      3      3      5      0      0
-WIFI_CFG_PFS_SET_VALUE (*note2) 0x0BU  0x0BU  0x0AU  0x0BU  0x0AU  0x0BU  0x0AU  0x0BU  0x0BU  0x0BU
-WIFI_CFG_RESET_PORT             D      5      F      2      5      A      5      A      B      B
-WIFI_CFG_RESET_PIN              0      5      5      0      5      1      5      1      1      1
-
-where the confirmed board numbers listed in the first row above are as follows (*note3):
-1: RX65N Cloud Kit (PMOD(CN5)),
-2: RX65N Envision Kit (PMOD(CN14)),
-3: RX65N RSK (2MB) (PMOD1),
-4: RX65N RSK (2MB) (PMOD2),
-5: Cloud Kit for RX65N v1, CK-RX65N v1 (PMOD1),
-6: Cloud Kit for RX65N v1, CK-RX65N v1 (PMOD2),
-7: Cloud Kit for RX65N v2, CK-RX65N v2 (PMOD1),
-8: Cloud Kit for RX65N v2, CK-RX65N v2 (PMOD2),
-9: RX671 Target Board (PMOD(CN1)) (not tested), *note4.
-10: RX66N Target Board (PMOD(CN1)) (not tested), *note5.
-In the above preprocessor list, please use one of the values listed on the right side.
-On the right side, each column corresponds to each confirmed board number.
-
-Note1: Check Peripheral clock speed in Clocks tab on Smart Configuration.
-    For Peripheral module clock, check board group hardware manual, Serial Communications Interface section in Note2.
-    e.g. if PCLKB speed is 60MHz then WIFI_CFG_SCI_PCLK_HZ is 60000000).
-
-Note2: Check Pin Function Select (PSEL) of Pin Function Control Register (PxyPFS)
-    in Multi-Function Pin Controller (MPC) section of board group hardware manual.
-    Below is list of board group hardware manual:
-    1: RX65N group: https://www.renesas.com/us/en/document/mah/rx65n-group-rx651-group-users-manualhardware-rev230
-    2: RX671 group: https://www.renesas.com/tw/en/document/mah/rx671-group-users-manual-hardware-rev100
-    3: RX66N group: https://www.renesas.com/us/en/document/mah/rx66n-group-users-manual-hardware-rev111
-
-Note3: List of board user's manual:
-    1: RX65N Cloud Kit:    https://www.renesas.com/us/en/document/mat/uses-manual-cloud-option-board
-    2: RX65N Envision Kit: https://www.renesas.com/us/en/document/mat/rx65n-envision-kit-users-manual-rev100
-    3: RX65N RSK (2MB):    https://www.renesas.com/us/en/document/mat/renesas-starter-kit-rx65n-2mb-users-manual
-    4: CK-RX65N v1:        https://www.renesas.com/kr/en/document/mat/ck-rx65n-v1-users-manual
-    5: RX671 Target Board: https://www.renesas.com/br/en/document/mat/target-board-rx671-users-manual-rev100
-    6: RX66N Target Board: https://www.renesas.com/us/en/document/mah/target-board-rx66n-users-manual-rev100
-
-Note4:
-When you use RX671 Target Board, you need pattern cut and so on to use SCI channel 5(TXD5/RXD5/CTS5) and GPIO(PC1).
-Please refer to User's Manual: https://www.renesas.com/products/microcontrollers-microprocessors/rx-32-bit-performance-efficiency-mcus/rtk5rx6710c00000bj-target-board-rx671
-
-Note5:
-When you use RX66N Target Board, you need remodeling of the board to use SCI channel 5(TXD5/RXD5/CTS5) and GPIO(PC1).
-Please refer to User's Manual: https://www.renesas.com/products/microcontrollers-microprocessors/rx-32-bit-performance-efficiency-mcus/rtk5rx66n0c00000bj-target-board-rx66n
-
-*/
-
-#define WIFI_CFG_CREATABLE_SOCKETS            (4)
-
-#define WIFI_CFG_SOCKETS_RECEIVE_BUFFER_SIZE  (8192)
-
-#define WIFI_CFG_AT_CMD_TX_BUFFER_SIZE        (1500)
-
-#define WIFI_CFG_AT_CMD_RX_BUFFER_SIZE        (3000)
-
-#define WIFI_CFG_USE_CALLBACK_FUNCTION        (0)
-
-#if WIFI_CFG_USE_CALLBACK_FUNCTION == 1
-
-#define WIFI_CFG_CALLBACK_FUNCTION_NAME       (NULL)
-
-#endif
-
-#define WIFI_CFG_COUNTRY_CODE                 "VN"
-
-#define WIFI_CFG_MAX_SSID_LEN                 32
-
-#define WIFI_CFG_MAX_BSSID_LEN                6
-
-#define WIFI_CFG_MAX_PASS_LEN                 32
-
-#define WIFI_CFG_SNTP_ENABLE                  1
-
-#if WIFI_CFG_SNTP_ENABLE == 1
-
-#define WIFI_CFG_SNTP_SERVER_IP               "0.0.0.0"
-
-#define WIFI_CFG_SNTP_UTC_OFFSET              7
-
-#endif
-
-#define WIFI_CFG_USE_FREERTOS_LOGGING         1
-
-#define WIFI_CFG_DEBUG_LOG                    4
-
-/**********************************************************************************************************************
- Global Typedef definitions
- *********************************************************************************************************************/
-
-/**********************************************************************************************************************
- External global variables
- *********************************************************************************************************************/
-
-/**********************************************************************************************************************
- Exported global functions
- *********************************************************************************************************************/
-
-#endif /* R_WIFI_DA16XXX_CONFIG_H */
diff --git a/Configuration/samples/common/ck-rx65n_ota/cellular/CK-RX65N_cellular_scfg.ftl b/Configuration/samples/common/ck-rx65n_ota/cellular/CK-RX65N_cellular_scfg.ftl
deleted file mode 100644
index 46c9aa06..00000000
--- a/Configuration/samples/common/ck-rx65n_ota/cellular/CK-RX65N_cellular_scfg.ftl
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<smc>
-    <general version="2.0.0.0">
-        <configuration active="true" id="${configurationTypeReleaseID}">
-            <property id="com.renesas.smc.service.project.buildArtefactType" values="com.renesas.smc.service.project.buildArtefactType.exe"/>
-            <toolchain id="${toolChainID}">
-                <option id="com.renesas.smc.toolchain.option.buildArtefactType" key="com.renesas.smc.toolchain.option.buildArtefactType.exe"/>
-                <option id="com.renesas.smc.toolchain.option.rtos" key="com.renesas.smc.toolchain.option.rtos.freertoslts">
-                    <item id="com.renesas.smc.toolchain.option.rtos.freertoslts" value="${packageVersion}"/>
-                </option>
-            </toolchain>
-        </configuration>
-        <platform id="${targetDevice}"/>
-    </general>
-    <tool id="SWComponent" version="1.0.0.0">
-        <configuration inuse="true" name="r_bsp">
-            <component display="r_bsp" id="r_bsp7.20" version="7.20">
-                <gridItem id="BSP_CFG_HEAP_BYTES" selectedIndex="0x1000"/>
-                <gridItem id="BSP_CFG_SCI_UART_TERMINAL_ENABLE" selectedIndex="1"/>
-                <gridItem id="BSP_CFG_SCI_UART_TERMINAL_CHANNEL" selectedIndex="5"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_s12ad_rx">
-            <component detailDescription="ADC Driver" display="r_s12ad_rx" id="r_s12ad_rx5.00" version="5.00">
-                <gridItem id="AN115" selectedIndex="1"/>
-                <gridItem id="AN117" selectedIndex="1"/>
-                <gridItem id="S12AD1" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_flash_rx">
-            <component display="r_flash_rx" id="r_flash_rx5.00" version="5.00">
-                <gridItem id="FLASH_CFG_PARAM_CHECKING_ENABLE" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_CODE_FLASH_ENABLE" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_DATA_FLASH_BGO" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_CODE_FLASH_BGO" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_CODE_FLASH_RUN_FROM_ROM" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_irq_rx">
-            <component display="r_irq_rx" id="r_irq_rx4.00" version="4.00">
-                <gridItem id="IRQ1" selectedIndex="1"/>
-                <gridItem id="IRQ2" selectedIndex="1"/>
-                <gridItem id="IRQ7" selectedIndex="1"/>
-                <gridItem id="IRQ13" selectedIndex="1"/>
-                <gridItem id="IRQ14" selectedIndex="1"/>
-                <gridItem id="IRQ15" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_cellular">
-            <component display="r_cellular" id="r_cellular1.11" version="1.11">
-                <gridItem id="CELLULAR_CFG_AP_NAME" selectedIndex="ibasis.iot"/>
-                <gridItem id="CELLULAR_CFG_AUTH_TYPE" selectedIndex="2"/>
-                <gridItem id="CELLULAR_CFG_DEBUGLOG" selectedIndex="4"/>
-                <gridItem id="CELLULAR_CFG_UART_SCI_CH" selectedIndex="6"/>
-                <gridItem id="CELLULAR_CFG_RTS_PORT" selectedIndex="0"/>
-                <gridItem id="CELLULAR_CFG_RESET_PORT" selectedIndex="5"/>
-                <gridItem id="CELLULAR_CFG_RESET_PIN" selectedIndex="5"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_sci_rx">
-            <component detailDescription="Multi-Channel Multi-Mode SCI Driver." display="r_sci_rx" id="r_sci_rx4.40" version="4.40">
-                <gridItem id="RXD5/SMISO5/SSCL5" selectedIndex="1"/>
-                <gridItem id="TXD5/SMOSI5/SSDA5" selectedIndex="1"/>
-                <gridItem id="SCI5" selectedIndex="1"/>
-                <gridItem id="RXD6/SMISO6/SSCL6" selectedIndex="1"/>
-                <gridItem id="TXD6/SMOSI6/SSDA6" selectedIndex="1"/>
-                <gridItem id="CTS6#/RTS6#/SS6#" selectedIndex="1"/>
-                <gridItem id="SCI6" selectedIndex="1"/>
-                <gridItem id="SCI_CFG_CH1_INCLUDED" selectedIndex="0"/>
-                <gridItem id="SCI_CFG_CH5_INCLUDED" selectedIndex="1"/>
-                <gridItem id="SCI_CFG_CH6_INCLUDED" selectedIndex="1"/>
-                <gridItem id="SCI_CFG_CH6_TX_BUFSIZ" selectedIndex="2180"/>
-                <gridItem id="SCI_CFG_CH6_RX_BUFSIZ" selectedIndex="8192"/>
-                <gridItem id="SCI_CFG_TEI_INCLUDED" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_byteq">
-            <component display="r_byteq" id="r_byteq2.00" version="2.00">
-                <gridItem id="BYTEQ_CFG_PARAM_CHECKING_ENABLE" selectedIndex="0"/>
-                <gridItem id="BYTEQ_CFG_USE_HEAP_FOR_CTRL_BLKS" selectedIndex="0"/>
-                <gridItem id="BYTEQ_CFG_MAX_CTRL_BLKS" selectedIndex="32"/>
-                <gridItem id="BYTEQ_CFG_PROTECT_QUEUE" selectedIndex="0"/>
-                <gridItem id="BYTEQ_CFG_CRITICAL_SECTION" selectedIndex="0"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_tsip_rx">
-            <component display="r_tsip_rx" id="r_tsip_rx1.17.l" version="1.17.l"/>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration enable="true" exclude="false" inuse="true" name="FreeRTOS_Kernel">
-            <component display="FreeRTOS Kernel" id="FreeRTOS_Kernel${packageVersion}" version="${packageVersion}">
-                <gridItem id="configMINIMAL_STACK_SIZE" selectedIndex="768"/>
-                <gridItem id="configUSE_TICK_HOOK" selectedIndex="1"/>
-                <gridItem id="configUSE_IDLE_HOOK" selectedIndex="1"/>
-                <gridItem id="configUSE_MALLOC_FAILED_HOOK" selectedIndex="1"/>
-                <gridItem id="configCHECK_FOR_STACK_OVERFLOW" selectedIndex="2"/>
-                <gridItem id="configCOMMAND_INT_MAX_OUTPUT_SIZE" selectedIndex="850"/>
-                <gridItem id="configIP_ADDR0" selectedIndex="192"/>
-                <gridItem id="configIP_ADDR1" selectedIndex="168"/>
-                <gridItem id="configIP_ADDR2" selectedIndex="11"/>
-                <gridItem id="configIP_ADDR3" selectedIndex="12"/>
-            </component>
-            <source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
-        </configuration>
-        <configuration enable="true" exclude="false" inuse="true" name="LittleFS">
-            <component display="LittleFS" id="LittleFS${packageVersion}" version="${packageVersion}">
-                <gridItem id="RM_LITTLEFS_FLASH_DATA_START" selectedIndex="FLASH_DF_BLOCK_0_MACRO"/>
-            </component>
-            <source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_fwup">
-            <component display="r_fwup" id="r_fwup2.01" version="2.01">
-                <gridItem id="FWUP_CFG_UPDATE_MODE" selectedIndex="0"/>
-                <gridItem id="FWUP_CFG_FUNCTION_MODE" selectedIndex="1"/>
-                <gridItem id="FWUP_CFG_MAIN_AREA_ADDR_L" selectedIndex="0xFFF00000U"/>
-                <gridItem id="FWUP_CFG_BUF_AREA_ADDR_L" selectedIndex="0xFFE00000U"/>
-                <gridItem id="FWUP_CFG_AREA_SIZE" selectedIndex="0xF0000U"/>
-                <gridItem id="FWUP_CFG_CF_BLK_SIZE" selectedIndex="0x8000U"/>
-                <gridItem id="FWUP_CFG_CF_W_UNIT_SIZE" selectedIndex="128U"/>
-                <gridItem id="FWUP_CFG_EXT_BUF_AREA_ADDR_L" selectedIndex="0x00000U"/>
-                <gridItem id="FWUP_CFG_EXT_BUF_AREA_BLK_SIZE" selectedIndex="4096U"/>
-                <gridItem id="FWUP_CFG_DF_BLK_SIZE" selectedIndex="64U"/>
-                <gridItem id="FWUP_CFG_DF_NUM_BLKS" selectedIndex="512U"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration enable="true" exclude="false" inuse="true" name="FreeRTOS Object">
-            <allocatable id="OBJECT" name="OBJECT" type="">
-                <allocatable id="TASK" name="TASK" type="">
-                    <allocatable id="TASKOBJECTLINK1" name="TASK" type="" readonly="true">
-                        <option defaultValue="1" id="Initialize" value="0"/>
-                        <option defaultValue="task_[X]" id="TaskCode" value="main_task"/>
-                        <option defaultValue="task_[X]" id="TaskName" value="MAIN_TASK"/>
-                        <option defaultValue="512" id="StackSize" value="512"/>
-                        <option defaultValue="NULL" id="TaskHandler" value="NULL"/>
-                        <option defaultValue="NULL" id="Parameter" value="NULL"/>
-                        <option defaultValue="1" id="Priority" value="1"/>
-                    </allocatable>
-                    <option defaultValue="0" id="LinkNum" value="1"/>
-                </allocatable>
-                <allocatable id="QUEUE" name="QUEUE" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="SEMAPHORE" name="SEMAPHORE" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="SWTIMER" name="SWTIMER" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="EVENTGROUP" name="EVENTGROUP" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="STREAMBUFFER" name="STREAMBUFFER" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="MESSAGEBUFFER" name="MESSAGEBUFFER" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-            </allocatable>
-            <component description="" detailDescription="" display="FreeRTOS Object" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.freertos.object" version="1.0.120"/>
-            <source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
-        </configuration>
-    </tool>
-    <tool id="System">
-        <section id="ocd">
-            <option enabled="true" id="debugIF" selection="fine">
-                <item enabled="true" id="unused"/>
-                <item enabled="true" id="fine"/>
-                <item enabled="true" id="jtag"/>
-                <item enabled="true" id="jtagTrace"/>
-            </option>
-        </section>
-    </tool>
-</smc>
diff --git a/Configuration/samples/common/ck-rx65n_ota/cellular/src/smc_gen/r_config/r_fwup_config.h b/Configuration/samples/common/ck-rx65n_ota/cellular/src/smc_gen/r_config/r_fwup_config.h
deleted file mode 100644
index e6c19ca8..00000000
--- a/Configuration/samples/common/ck-rx65n_ota/cellular/src/smc_gen/r_config/r_fwup_config.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Generated configuration header file - do not edit */
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
-* applicable laws, including copyright laws.
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the
-* following link:
-* http://www.renesas.com/disclaimer
-*
-* Copyright (C) 2023 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name     : r_fwup_config.h
-* Description   : Configures the Firmware update module.
-************************************************************************************************************************
-* History : DD.MM.YYYY Version Description
-*         : 20.07.2023 2.00    First Release
-*         : 29.09.2023 2.01    Fixed log messages.
-*                              Add parameter checking.
-*                              Added arguments to R_FWUP_WriteImageProgram API.
-***********************************************************************************************************************/
-#include "platform.h"
-
-#ifndef R_FWUP_CONFIG_H
-#define R_FWUP_CONFIG_H
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-/* Select the update mode.
-    0 = Dual bank
-    1 = Single bank with buffer. (default)
-    2 = Single bank without buffer.
-    3 = Single bank with ext-buffer.
-*/
-#define FWUP_CFG_UPDATE_MODE                        (0)
-
-/* Select the function mode.
-    0 = use for Boot loader
-    1 = use for User program
-*/
-#define FWUP_CFG_FUNCTION_MODE                      (1)
-
-/* Area configuration */
-#define FWUP_CFG_MAIN_AREA_ADDR_L                   (0xFFF00000U)      /* Main area start address     */
-#define FWUP_CFG_BUF_AREA_ADDR_L                    (0xFFE00000U)      /* Buffer area start address   */
-#define FWUP_CFG_AREA_SIZE                          (0xF0000U)         /* Install area size           */
-
-/* Internal flash */
-#define FWUP_CFG_CF_BLK_SIZE                        (0x8000U)          /* Code flash block size       */
-#define FWUP_CFG_CF_W_UNIT_SIZE                     (128U)             /* Code flash write unit size  */
-
-/* External flash */
-#define FWUP_CFG_EXT_BUF_AREA_ADDR_L                (0x00000U)         /* External Buffer area Start address */
-#define FWUP_CFG_EXT_BUF_AREA_BLK_SIZE              (4096U)            /* Block(Sector) size  */
-
-/* Data flash */
-#define FWUP_CFG_DF_ADDR_L                          (0x00100000)       /* DF Start address    */
-#define FWUP_CFG_DF_BLK_SIZE                        (64U)              /* DF Block size       */
-#define FWUP_CFG_DF_NUM_BLKS                        (512U)             /* DF number of blocks */
-
-/* FWUP v1 compatible */
-#define FWUP_CFG_FWUPV1_COMPATIBLE                  (0)                /* 0:Disable, 1:Enable */
-
-/* Select the algorithm of signature verification.
-    0 = ECDSA. (default)
-    1 = SHA256
-*/
-#define FWUP_CFG_SIGNATURE_VERIFICATION             (0)
-
-/* Disable Printf Output Setting.
-    Disables the character output by printf to the terminal software.
-    0 = Enable (default)
-    1 = Disable.
- */
-#define FWUP_CFG_PRINTF_DISABLE                     (0)
-
-#endif /* R_FWUP_CONFIG_H */
diff --git a/Configuration/samples/common/ck-rx65n_ota/ether/CK-RX65N_ether_scfg.ftl b/Configuration/samples/common/ck-rx65n_ota/ether/CK-RX65N_ether_scfg.ftl
deleted file mode 100644
index 1d58b610..00000000
--- a/Configuration/samples/common/ck-rx65n_ota/ether/CK-RX65N_ether_scfg.ftl
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<smc>
-    <general version="2.0.0.0">
-        <configuration active="true" id="${configurationTypeReleaseID}">
-            <property id="com.renesas.smc.service.project.buildArtefactType" values="com.renesas.smc.service.project.buildArtefactType.exe"/>
-            <toolchain id="${toolChainID}">
-                <option id="com.renesas.smc.toolchain.option.buildArtefactType" key="com.renesas.smc.toolchain.option.buildArtefactType.exe"/>
-                <option id="com.renesas.smc.toolchain.option.rtos" key="com.renesas.smc.toolchain.option.rtos.freertoslts">
-                    <item id="com.renesas.smc.toolchain.option.rtos.freertoslts" value="${packageVersion}"/>
-                </option>
-            </toolchain>
-        </configuration>
-        <platform id="${targetDevice}"/>
-    </general>
-    <tool id="SWComponent" version="1.0.0.0">
-        <configuration inuse="true" name="r_bsp">
-            <component display="r_bsp" id="r_bsp7.20" version="7.20">
-                <gridItem id="BSP_CFG_HEAP_BYTES" selectedIndex="0x1000"/>
-                <gridItem id="BSP_CFG_SCI_UART_TERMINAL_ENABLE" selectedIndex="1"/>
-                <gridItem id="BSP_CFG_SCI_UART_TERMINAL_CHANNEL" selectedIndex="5"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_s12ad_rx">
-            <component detailDescription="ADC Driver" display="r_s12ad_rx" id="r_s12ad_rx5.00" version="5.00">
-                <gridItem id="AN000" selectedIndex="1"/>
-                <gridItem id="ADTRG0#" selectedIndex="1"/>
-                <gridItem id="S12AD0" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_flash_rx">
-            <component display="r_flash_rx" id="r_flash_rx5.00" version="5.00">
-                <gridItem id="FLASH_CFG_PARAM_CHECKING_ENABLE" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_CODE_FLASH_ENABLE" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_DATA_FLASH_BGO" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_CODE_FLASH_BGO" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_CODE_FLASH_RUN_FROM_ROM" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_ether_rx">
-            <component display="r_ether_rx" id="r_ether_rx1.23" version="1.23">
-                <gridItem id="ET0_TX_CLK" selectedIndex="1"/>
-                <gridItem id="ET0_RX_CLK" selectedIndex="1"/>
-                <gridItem id="ET0_TX_EN" selectedIndex="1"/>
-                <gridItem id="ET0_ETXD3" selectedIndex="1"/>
-                <gridItem id="ET0_ETXD2" selectedIndex="1"/>
-                <gridItem id="ET0_ETXD1" selectedIndex="1"/>
-                <gridItem id="ET0_ETXD0" selectedIndex="1"/>
-                <gridItem id="ET0_RX_DV" selectedIndex="1"/>
-                <gridItem id="ET0_ERXD3" selectedIndex="1"/>
-                <gridItem id="ET0_ERXD2" selectedIndex="1"/>
-                <gridItem id="ET0_ERXD1" selectedIndex="1"/>
-                <gridItem id="ET0_ERXD0" selectedIndex="1"/>
-                <gridItem id="ET0_RX_ER" selectedIndex="1"/>
-                <gridItem id="ET0_CRS" selectedIndex="1"/>
-                <gridItem id="ET0_COL" selectedIndex="1"/>
-                <gridItem id="ET0_MDC" selectedIndex="1"/>
-                <gridItem id="ET0_MDIO" selectedIndex="1"/>
-                <gridItem id="ET0_LINKSTA" selectedIndex="1"/>
-                <gridItem id="ETHERC0_MII" selectedIndex="1"/>
-                <gridItem id="REF50CK0" selectedIndex="1"/>
-                <gridItem id="RMII0_TXD_EN" selectedIndex="1"/>
-                <gridItem id="RMII0_TXD1" selectedIndex="1"/>
-                <gridItem id="RMII0_TXD0" selectedIndex="1"/>
-                <gridItem id="RMII0_RXD1" selectedIndex="1"/>
-                <gridItem id="RMII0_RXD0" selectedIndex="1"/>
-                <gridItem id="RMII0_RX_ER" selectedIndex="1"/>
-                <gridItem id="RMII0_CRS_DV" selectedIndex="1"/>
-                <gridItem id="ET0_MDC" selectedIndex="1"/>
-                <gridItem id="ET0_MDIO" selectedIndex="1"/>
-                <gridItem id="ET0_LINKSTA" selectedIndex="1"/>
-                <gridItem id="ETHERC0_RMII" selectedIndex="1"/>
-                <gridItem id="ETHER_CFG_MODE_SEL" selectedIndex="1"/>
-                <gridItem id="ETHER_CFG_CH0_PHY_ADDRESS" selectedIndex="5"/>
-                <gridItem id="ETHER_CFG_EMAC_RX_DESCRIPTORS" selectedIndex="6"/>
-                <gridItem id="ETHER_CFG_EMAC_TX_DESCRIPTORS" selectedIndex="3"/>
-                <gridItem id="ETHER_CFG_CH0_PHY_ACCESS" selectedIndex="0"/>
-                <gridItem id="ETHER_CFG_LINK_PRESENT" selectedIndex="1"/>
-                <gridItem id="ETHER_CFG_USE_PHY_ICS1894_32" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_sci_rx">
-            <component detailDescription="Multi-Channel Multi-Mode SCI Driver." display="r_sci_rx" id="r_sci_rx4.40" version="4.40">
-                <gridItem id="SCI1" selectedIndex="0"/>
-                <gridItem id="RXD5/SMISO5/SSCL5" selectedIndex="1"/>
-                <gridItem id="TXD5/SMOSI5/SSDA5" selectedIndex="1"/>
-                <gridItem id="SCI5" selectedIndex="1"/>
-                <gridItem id="SCI_CFG_CH1_INCLUDED" selectedIndex="0"/>
-                <gridItem id="SCI_CFG_CH5_INCLUDED" selectedIndex="1"/>
-                <gridItem id="SCI_CFG_TEI_INCLUDED" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_byteq">
-            <component display="r_byteq" id="r_byteq2.00" version="2.00">
-                <gridItem id="BYTEQ_CFG_PARAM_CHECKING_ENABLE" selectedIndex="0"/>
-                <gridItem id="BYTEQ_CFG_USE_HEAP_FOR_CTRL_BLKS" selectedIndex="0"/>
-                <gridItem id="BYTEQ_CFG_MAX_CTRL_BLKS" selectedIndex="32"/>
-                <gridItem id="BYTEQ_CFG_PROTECT_QUEUE" selectedIndex="0"/>
-                <gridItem id="BYTEQ_CFG_CRITICAL_SECTION" selectedIndex="0"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_tsip_rx">
-            <component display="r_tsip_rx" id="r_tsip_rx1.17.l" version="1.17.l"/>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration enable="true" exclude="false" inuse="true" name="FreeRTOS_Kernel">
-            <component display="FreeRTOS Kernel" id="FreeRTOS_Kernel${packageVersion}" version="${packageVersion}">
-                <gridItem id="configMINIMAL_STACK_SIZE" selectedIndex="768"/>
-                <gridItem id="configUSE_TICK_HOOK" selectedIndex="1"/>
-                <gridItem id="configUSE_IDLE_HOOK" selectedIndex="1"/>
-                <gridItem id="configUSE_MALLOC_FAILED_HOOK" selectedIndex="1"/>
-                <gridItem id="configCHECK_FOR_STACK_OVERFLOW" selectedIndex="2"/>
-                <gridItem id="configCOMMAND_INT_MAX_OUTPUT_SIZE" selectedIndex="850"/>
-                <gridItem id="configIP_ADDR0" selectedIndex="192"/>
-                <gridItem id="configIP_ADDR1" selectedIndex="168"/>
-                <gridItem id="configIP_ADDR2" selectedIndex="11"/>
-                <gridItem id="configIP_ADDR3" selectedIndex="12"/>
-            </component>
-            <source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
-        </configuration>
-        <configuration enable="true" exclude="false" inuse="true" name="LittleFS">
-            <component display="LittleFS" id="LittleFS${packageVersion}" version="${packageVersion}">
-                <gridItem id="RM_LITTLEFS_FLASH_DATA_START" selectedIndex="FLASH_DF_BLOCK_0_MACRO"/>
-            </component>
-            <source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_fwup">
-            <component display="r_fwup" id="r_fwup2.01" version="2.01">
-                <gridItem id="FWUP_CFG_UPDATE_MODE" selectedIndex="0"/>
-                <gridItem id="FWUP_CFG_FUNCTION_MODE" selectedIndex="1"/>
-                <gridItem id="FWUP_CFG_MAIN_AREA_ADDR_L" selectedIndex="0xFFF00000U"/>
-                <gridItem id="FWUP_CFG_BUF_AREA_ADDR_L" selectedIndex="0xFFE00000U"/>
-                <gridItem id="FWUP_CFG_AREA_SIZE" selectedIndex="0xF0000U"/>
-                <gridItem id="FWUP_CFG_CF_BLK_SIZE" selectedIndex="0x8000U"/>
-                <gridItem id="FWUP_CFG_CF_W_UNIT_SIZE" selectedIndex="128U"/>
-                <gridItem id="FWUP_CFG_EXT_BUF_AREA_ADDR_L" selectedIndex="0x00000U"/>
-                <gridItem id="FWUP_CFG_EXT_BUF_AREA_BLK_SIZE" selectedIndex="4096U"/>
-                <gridItem id="FWUP_CFG_DF_BLK_SIZE" selectedIndex="64U"/>
-                <gridItem id="FWUP_CFG_DF_NUM_BLKS" selectedIndex="512U"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration enable="true" exclude="false" inuse="true" name="FreeRTOS Object">
-            <allocatable id="OBJECT" name="OBJECT" type="">
-                <allocatable id="TASK" name="TASK" type="">
-                    <allocatable id="TASKOBJECTLINK1" name="TASK" type="" readonly="true">
-                        <option defaultValue="1" id="Initialize" value="0"/>
-                        <option defaultValue="task_[X]" id="TaskCode" value="main_task"/>
-                        <option defaultValue="task_[X]" id="TaskName" value="MAIN_TASK"/>
-                        <option defaultValue="512" id="StackSize" value="512"/>
-                        <option defaultValue="NULL" id="TaskHandler" value="NULL"/>
-                        <option defaultValue="NULL" id="Parameter" value="NULL"/>
-                        <option defaultValue="1" id="Priority" value="1"/>
-                    </allocatable>
-                    <option defaultValue="0" id="LinkNum" value="1"/>
-                </allocatable>
-                <allocatable id="QUEUE" name="QUEUE" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="SEMAPHORE" name="SEMAPHORE" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="SWTIMER" name="SWTIMER" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="EVENTGROUP" name="EVENTGROUP" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="STREAMBUFFER" name="STREAMBUFFER" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="MESSAGEBUFFER" name="MESSAGEBUFFER" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-            </allocatable>
-            <component description="" detailDescription="" display="FreeRTOS Object" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.freertos.object" version="1.0.120"/>
-            <source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
-        </configuration>
-    </tool>
-    <tool id="System">
-        <section id="ocd">
-            <option enabled="true" id="debugIF" selection="fine">
-                <item enabled="true" id="unused"/>
-                <item enabled="true" id="fine"/>
-                <item enabled="true" id="jtag"/>
-                <item enabled="true" id="jtagTrace"/>
-            </option>
-        </section>
-    </tool>
-</smc>
diff --git a/Configuration/samples/common/ck-rx65n_ota/ether/src/smc_gen/r_config/r_fwup_config.h b/Configuration/samples/common/ck-rx65n_ota/ether/src/smc_gen/r_config/r_fwup_config.h
deleted file mode 100644
index 6a3598e0..00000000
--- a/Configuration/samples/common/ck-rx65n_ota/ether/src/smc_gen/r_config/r_fwup_config.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
-* applicable laws, including copyright laws.
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the
-* following link:
-* http://www.renesas.com/disclaimer
-*
-* Copyright (C) 2023 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name     : r_fwup_config.h
-* Description   : Configures the Firmware update module.
-************************************************************************************************************************
-* History : DD.MM.YYYY Version Description
-*         : 20.07.2023 2.00    First Release
-*         : 29.09.2023 2.01    Fixed log messages.
-*                              Add parameter checking.
-*                              Added arguments to R_FWUP_WriteImageProgram API.
-***********************************************************************************************************************/
-#include "platform.h"
-
-#ifndef R_FWUP_CONFIG_H
-#define R_FWUP_CONFIG_H
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-/* Select the update mode.
-    0 = Dual bank
-    1 = Single bank with buffer. (default)
-    2 = Single bank without buffer.
-    3 = Single bank with ext-buffer.
-*/
-#define FWUP_CFG_UPDATE_MODE                        (0)
-
-/* Select the function mode.
-    0 = use for Boot loader
-    1 = use for User program
-*/
-#define FWUP_CFG_FUNCTION_MODE                      (1)
-
-/* Area configuration */
-#define FWUP_CFG_MAIN_AREA_ADDR_L                   (0xFFF00000U)      /* Main area start address     */
-#define FWUP_CFG_BUF_AREA_ADDR_L                    (0xFFE00000U)      /* Buffer area start address   */
-#define FWUP_CFG_AREA_SIZE                          (0xF0000U)         /* Install area size           */
-
-/* Internal flash */
-#define FWUP_CFG_CF_BLK_SIZE                        (0x8000U)          /* Code flash block size       */
-#define FWUP_CFG_CF_W_UNIT_SIZE                     (128U)             /* Code flash write unit size  */
-
-/* External flash */
-#define FWUP_CFG_EXT_BUF_AREA_ADDR_L                (0x00000U)         /* External Buffer area Start address */
-#define FWUP_CFG_EXT_BUF_AREA_BLK_SIZE              (4096U)            /* Block(Sector) size  */
-
-/* Data flash */
-#define FWUP_CFG_DF_ADDR_L                          (0x00100000)       /* DF Start address    */
-#define FWUP_CFG_DF_BLK_SIZE                        (64U)              /* DF Block size       */
-#define FWUP_CFG_DF_NUM_BLKS                        (512U)             /* DF number of blocks */
-
-/* FWUP v1 compatible */
-#define FWUP_CFG_FWUPV1_COMPATIBLE                  (0)                /* 0:Disable, 1:Enable */
-
-/* Select the algorithm of signature verification.
-    0 = ECDSA. (default)
-    1 = SHA256
-*/
-#define FWUP_CFG_SIGNATURE_VERIFICATION             (0)
-
-/* Disable Printf Output Setting.
-    Disables the character output by printf to the terminal software.
-    0 = Enable (default)
-    1 = Disable.
- */
-#define FWUP_CFG_PRINTF_DISABLE                     (0)
-
-#endif /* R_FWUP_CONFIG_H */
diff --git a/Configuration/samples/common/ck-rx65n_ota/wifi/CK-RX65N_wifi_scfg.ftl b/Configuration/samples/common/ck-rx65n_ota/wifi/CK-RX65N_wifi_scfg.ftl
deleted file mode 100644
index af42885d..00000000
--- a/Configuration/samples/common/ck-rx65n_ota/wifi/CK-RX65N_wifi_scfg.ftl
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<smc>
-    <general version="2.0.0.0">
-        <configuration active="true" id="${configurationTypeReleaseID}">
-            <property id="com.renesas.smc.service.project.buildArtefactType" values="com.renesas.smc.service.project.buildArtefactType.exe"/>
-            <toolchain id="${toolChainID}">
-                <option id="com.renesas.smc.toolchain.option.buildArtefactType" key="com.renesas.smc.toolchain.option.buildArtefactType.exe"/>
-                <option id="com.renesas.smc.toolchain.option.rtos" key="com.renesas.smc.toolchain.option.rtos.freertoslts">
-                    <item id="com.renesas.smc.toolchain.option.rtos.freertoslts" value="${packageVersion}"/>
-                </option>
-            </toolchain>
-        </configuration>
-        <platform id="${targetDevice}"/>
-    </general>
-    <tool id="SWComponent" version="1.0.0.0">
-        <configuration inuse="true" name="r_bsp">
-            <component display="r_bsp" id="r_bsp7.20" version="7.20">
-                <gridItem id="BSP_CFG_HEAP_BYTES" selectedIndex="0x1000"/>
-                <gridItem id="BSP_CFG_SCI_UART_TERMINAL_ENABLE" selectedIndex="1"/>
-                <gridItem id="BSP_CFG_SCI_UART_TERMINAL_CHANNEL" selectedIndex="5"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_s12ad_rx">
-            <component detailDescription="ADC Driver" display="r_s12ad_rx" id="r_s12ad_rx5.00" version="5.00">
-                <gridItem id="AN115" selectedIndex="1"/>
-                <gridItem id="AN117" selectedIndex="1"/>
-                <gridItem id="ADTRG0#" selectedIndex="1"/>
-                <gridItem id="S12AD1" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_flash_rx">
-            <component display="r_flash_rx" id="r_flash_rx5.00" version="5.00">
-                <gridItem id="FLASH_CFG_PARAM_CHECKING_ENABLE" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_CODE_FLASH_ENABLE" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_DATA_FLASH_BGO" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_CODE_FLASH_BGO" selectedIndex="1"/>
-                <gridItem id="FLASH_CFG_CODE_FLASH_RUN_FROM_ROM" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_irq_rx">
-            <component display="r_irq_rx" id="r_irq_rx4.00" version="4.00">
-                <gridItem id="IRQ1" selectedIndex="1"/>
-                <gridItem id="IRQ2" selectedIndex="1"/>
-                <gridItem id="IRQ7" selectedIndex="1"/>
-                <gridItem id="IRQ13" selectedIndex="1"/>
-                <gridItem id="IRQ14" selectedIndex="1"/>
-                <gridItem id="IRQ15" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_wifi_da16xxx">
-            <component display="r_wifi_da16xxx" id="r_wifi_da16xxx1.10" version="1.10">
-                <gridItem id="WIFI_CFG_DA16600_SUPPORT" selectedIndex="1"/>
-                <gridItem id="WIFI_CFG_SCI_CHANNEL" selectedIndex="6"/>
-                <gridItem id="WIFI_CFG_CTS_SW_CTRL" selectedIndex="1"/>
-                <gridItem id="WIFI_CFG_CTS_PORT" selectedIndex="18"/>
-                <gridItem id="WIFI_CFG_RTS_PORT" selectedIndex="18"/>
-                <gridItem id="WIFI_CFG_PFS_SET_VALUE" selectedIndex="0x0AU"/>
-                <gridItem id="WIFI_CFG_RESET_PORT" selectedIndex="5"/>
-                <gridItem id="WIFI_CFG_RESET_PIN" selectedIndex="5"/>
-                <gridItem id="WIFI_CFG_CREATABLE_SOCKETS" selectedIndex="4"/>
-                <gridItem id="WIFI_CFG_AT_CMD_TX_BUFFER_SIZE" selectedIndex="1500"/>
-                <gridItem id="WIFI_CFG_SNTP_ENABLE" selectedIndex="1"/>
-                <gridItem id="WIFI_CFG_USE_FREERTOS_LOGGING" selectedIndex="1"/>
-                <gridItem id="WIFI_CFG_DEBUG_LOG" selectedIndex="4"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_sci_rx">
-            <component detailDescription="Multi-Channel Multi-Mode SCI Driver." display="r_sci_rx" id="r_sci_rx4.40" version="4.40">
-                <gridItem id="RXD5/SMISO5/SSCL5" selectedIndex="1"/>
-                <gridItem id="TXD5/SMOSI5/SSDA5" selectedIndex="1"/>
-                <gridItem id="SCI5" selectedIndex="1"/>
-                <gridItem id="RXD6/SMISO6/SSCL6" selectedIndex="1"/>
-                <gridItem id="TXD6/SMOSI6/SSDA6" selectedIndex="1"/>
-                <gridItem id="CTS6#/RTS6#/SS6#" selectedIndex="1"/>
-                <gridItem id="SCI6" selectedIndex="1"/>
-                <gridItem id="SCI_CFG_CH1_INCLUDED" selectedIndex="0"/>
-                <gridItem id="SCI_CFG_CH5_INCLUDED" selectedIndex="1"/>
-                <gridItem id="SCI_CFG_CH6_INCLUDED" selectedIndex="1"/>
-                <gridItem id="SCI_CFG_CH6_TX_BUFSIZ" selectedIndex="2180"/>
-                <gridItem id="SCI_CFG_CH6_RX_BUFSIZ" selectedIndex="8192"/>
-                <gridItem id="SCI_CFG_TEI_INCLUDED" selectedIndex="1"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_byteq">
-            <component display="r_byteq" id="r_byteq2.00" version="2.00">
-                <gridItem id="BYTEQ_CFG_PARAM_CHECKING_ENABLE" selectedIndex="0"/>
-                <gridItem id="BYTEQ_CFG_USE_HEAP_FOR_CTRL_BLKS" selectedIndex="0"/>
-                <gridItem id="BYTEQ_CFG_MAX_CTRL_BLKS" selectedIndex="32"/>
-                <gridItem id="BYTEQ_CFG_PROTECT_QUEUE" selectedIndex="0"/>
-                <gridItem id="BYTEQ_CFG_CRITICAL_SECTION" selectedIndex="0"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_tsip_rx">
-            <component display="r_tsip_rx" id="r_tsip_rx1.17.l" version="1.17.l"/>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration enable="true" exclude="false" inuse="true" name="FreeRTOS_Kernel">
-            <component display="FreeRTOS Kernel" id="FreeRTOS_Kernel${packageVersion}" version="${packageVersion}">
-                <gridItem id="configMINIMAL_STACK_SIZE" selectedIndex="768"/>
-                <gridItem id="configUSE_TICK_HOOK" selectedIndex="1"/>
-                <gridItem id="configUSE_IDLE_HOOK" selectedIndex="1"/>
-                <gridItem id="configUSE_MALLOC_FAILED_HOOK" selectedIndex="1"/>
-                <gridItem id="configCHECK_FOR_STACK_OVERFLOW" selectedIndex="2"/>
-                <gridItem id="configCOMMAND_INT_MAX_OUTPUT_SIZE" selectedIndex="850"/>
-                <gridItem id="configIP_ADDR0" selectedIndex="192"/>
-                <gridItem id="configIP_ADDR1" selectedIndex="168"/>
-                <gridItem id="configIP_ADDR2" selectedIndex="11"/>
-                <gridItem id="configIP_ADDR3" selectedIndex="12"/>
-            </component>
-            <source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
-        </configuration>
-        <configuration enable="true" exclude="false" inuse="true" name="LittleFS">
-            <component display="LittleFS" id="LittleFS${packageVersion}" version="${packageVersion}">
-                <gridItem id="RM_LITTLEFS_FLASH_DATA_START" selectedIndex="FLASH_DF_BLOCK_0_MACRO"/>
-            </component>
-            <source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
-        </configuration>
-        <configuration inuse="true" name="r_fwup">
-            <component display="r_fwup" id="r_fwup2.01" version="2.01">
-                <gridItem id="FWUP_CFG_UPDATE_MODE" selectedIndex="0"/>
-                <gridItem id="FWUP_CFG_FUNCTION_MODE" selectedIndex="1"/>
-                <gridItem id="FWUP_CFG_MAIN_AREA_ADDR_L" selectedIndex="0xFFF00000U"/>
-                <gridItem id="FWUP_CFG_BUF_AREA_ADDR_L" selectedIndex="0xFFE00000U"/>
-                <gridItem id="FWUP_CFG_AREA_SIZE" selectedIndex="0xF0000U"/>
-                <gridItem id="FWUP_CFG_CF_BLK_SIZE" selectedIndex="0x8000U"/>
-                <gridItem id="FWUP_CFG_CF_W_UNIT_SIZE" selectedIndex="128U"/>
-                <gridItem id="FWUP_CFG_EXT_BUF_AREA_ADDR_L" selectedIndex="0x00000U"/>
-                <gridItem id="FWUP_CFG_EXT_BUF_AREA_BLK_SIZE" selectedIndex="4096U"/>
-                <gridItem id="FWUP_CFG_DF_BLK_SIZE" selectedIndex="64U"/>
-                <gridItem id="FWUP_CFG_DF_NUM_BLKS" selectedIndex="512U"/>
-            </component>
-            <source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
-        </configuration>
-        <configuration enable="true" exclude="false" inuse="true" name="FreeRTOS Object">
-            <allocatable id="OBJECT" name="OBJECT" type="">
-                <allocatable id="TASK" name="TASK" type="">
-                    <allocatable id="TASKOBJECTLINK1" name="TASK" type="" readonly="true">
-                        <option defaultValue="1" id="Initialize" value="0"/>
-                        <option defaultValue="task_[X]" id="TaskCode" value="main_task"/>
-                        <option defaultValue="task_[X]" id="TaskName" value="MAIN_TASK"/>
-                        <option defaultValue="512" id="StackSize" value="512"/>
-                        <option defaultValue="NULL" id="TaskHandler" value="NULL"/>
-                        <option defaultValue="NULL" id="Parameter" value="NULL"/>
-                        <option defaultValue="1" id="Priority" value="1"/>
-                    </allocatable>
-                    <option defaultValue="0" id="LinkNum" value="1"/>
-                </allocatable>
-                <allocatable id="QUEUE" name="QUEUE" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="SEMAPHORE" name="SEMAPHORE" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="SWTIMER" name="SWTIMER" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="EVENTGROUP" name="EVENTGROUP" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="STREAMBUFFER" name="STREAMBUFFER" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-                <allocatable id="MESSAGEBUFFER" name="MESSAGEBUFFER" type="">
-                    <option defaultValue="0" id="LinkNum" value=""/>
-                </allocatable>
-            </allocatable>
-            <component description="" detailDescription="" display="FreeRTOS Object" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.freertos.object" version="1.0.120"/>
-            <source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
-        </configuration>
-    </tool>
-    <tool id="System">
-        <section id="ocd">
-            <option enabled="true" id="debugIF" selection="fine">
-                <item enabled="true" id="unused"/>
-                <item enabled="true" id="fine"/>
-                <item enabled="true" id="jtag"/>
-                <item enabled="true" id="jtagTrace"/>
-            </option>
-        </section>
-    </tool>
-</smc>
diff --git a/Configuration/samples/common/ck-rx65n_ota/wifi/src/smc_gen/r_config/r_fwup_config.h b/Configuration/samples/common/ck-rx65n_ota/wifi/src/smc_gen/r_config/r_fwup_config.h
deleted file mode 100644
index 6a3598e0..00000000
--- a/Configuration/samples/common/ck-rx65n_ota/wifi/src/smc_gen/r_config/r_fwup_config.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/***********************************************************************************************************************
-* DISCLAIMER
-* This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
-* other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
-* applicable laws, including copyright laws.
-* THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
-* THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
-* EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
-* SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS
-* SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-* Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
-* this software. By using this software, you agree to the additional terms and conditions found by accessing the
-* following link:
-* http://www.renesas.com/disclaimer
-*
-* Copyright (C) 2023 Renesas Electronics Corporation. All rights reserved.
-***********************************************************************************************************************/
-/***********************************************************************************************************************
-* File Name     : r_fwup_config.h
-* Description   : Configures the Firmware update module.
-************************************************************************************************************************
-* History : DD.MM.YYYY Version Description
-*         : 20.07.2023 2.00    First Release
-*         : 29.09.2023 2.01    Fixed log messages.
-*                              Add parameter checking.
-*                              Added arguments to R_FWUP_WriteImageProgram API.
-***********************************************************************************************************************/
-#include "platform.h"
-
-#ifndef R_FWUP_CONFIG_H
-#define R_FWUP_CONFIG_H
-
-/***********************************************************************************************************************
-Configuration Options
-***********************************************************************************************************************/
-/* Select the update mode.
-    0 = Dual bank
-    1 = Single bank with buffer. (default)
-    2 = Single bank without buffer.
-    3 = Single bank with ext-buffer.
-*/
-#define FWUP_CFG_UPDATE_MODE                        (0)
-
-/* Select the function mode.
-    0 = use for Boot loader
-    1 = use for User program
-*/
-#define FWUP_CFG_FUNCTION_MODE                      (1)
-
-/* Area configuration */
-#define FWUP_CFG_MAIN_AREA_ADDR_L                   (0xFFF00000U)      /* Main area start address     */
-#define FWUP_CFG_BUF_AREA_ADDR_L                    (0xFFE00000U)      /* Buffer area start address   */
-#define FWUP_CFG_AREA_SIZE                          (0xF0000U)         /* Install area size           */
-
-/* Internal flash */
-#define FWUP_CFG_CF_BLK_SIZE                        (0x8000U)          /* Code flash block size       */
-#define FWUP_CFG_CF_W_UNIT_SIZE                     (128U)             /* Code flash write unit size  */
-
-/* External flash */
-#define FWUP_CFG_EXT_BUF_AREA_ADDR_L                (0x00000U)         /* External Buffer area Start address */
-#define FWUP_CFG_EXT_BUF_AREA_BLK_SIZE              (4096U)            /* Block(Sector) size  */
-
-/* Data flash */
-#define FWUP_CFG_DF_ADDR_L                          (0x00100000)       /* DF Start address    */
-#define FWUP_CFG_DF_BLK_SIZE                        (64U)              /* DF Block size       */
-#define FWUP_CFG_DF_NUM_BLKS                        (512U)             /* DF number of blocks */
-
-/* FWUP v1 compatible */
-#define FWUP_CFG_FWUPV1_COMPATIBLE                  (0)                /* 0:Disable, 1:Enable */
-
-/* Select the algorithm of signature verification.
-    0 = ECDSA. (default)
-    1 = SHA256
-*/
-#define FWUP_CFG_SIGNATURE_VERIFICATION             (0)
-
-/* Disable Printf Output Setting.
-    Disables the character output by printf to the terminal software.
-    0 = Enable (default)
-    1 = Disable.
- */
-#define FWUP_CFG_PRINTF_DISABLE                     (0)
-
-#endif /* R_FWUP_CONFIG_H */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/cellular/linker_section_sample.esi b/Configuration/samples/fleet_pso/ck-rx65n/cellular/linker_section_sample.esi
deleted file mode 100644
index 49300ec4..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/cellular/linker_section_sample.esi
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<com.renesas.linkersection.model:SectionContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:com.renesas.linkersection.model="http:///LinkerSection.ecore">
-  <sections name="SU">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4"/>
-  </sections>
-  <sections name="SI"/>
-  <sections name="R_1"/>
-  <sections name="B_2"/>
-  <sections name="R"/>
-  <sections name="RPFRAM2"/>
-  <sections name="C_LITTLEFS_MANAGEMENT_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1048576"/>
-  </sections>
-  <sections name="C_USER_APPLICATION_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1057536"/>
-  </sections>
-  <sections name="B">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="8388608"/>
-  </sections>
-  <sections name="B_1"/>
-  <sections name="R_2"/>
-  <sections name="PResetPRG">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4293919488"/>
-  </sections>
-  <sections name="C_1"/>
-  <sections name="C_2"/>
-  <sections name="C"/>
-  <sections name="C$*"/>
-  <sections name="D*"/>
-  <sections name="W*"/>
-  <sections name="L"/>
-  <sections name="P"/>
-  <sections name="PFRAM2"/>
-  <sections name="EXCEPTVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294901632"/>
-  </sections>
-  <sections name="RESETVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294901756"/>
-  </sections>
-</com.renesas.linkersection.model:SectionContainer>
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/FreeRTOSConfig.h b/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/FreeRTOSConfig.h
deleted file mode 100644
index 5662a8c2..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/FreeRTOSConfig.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * FreeRTOS Kernel V10.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * http://aws.amazon.com/freertos
- * http://www.FreeRTOS.org
- */
-
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
-
-
-/* Unity includes. */
-#if defined(FREERTOS_ENABLE_UNIT_TESTS)
-#include "unity_internals.h"
-#elif defined(ENABLE_UNIT_TESTS)
-#include "unity.h"
-#endif
-
-/*-----------------------------------------------------------
-* Application specific definitions.
-*
-* These definitions should be adjusted for your particular hardware and
-* application requirements.
-*
-* THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
-* FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
-* http://www.freertos.org/a00110.html
-*
-* The bottom of this file contains some constants specific to running the UDP
-* stack in this demo.  Constants specific to FreeRTOS+TCP itself (rather than
-* the demo) are contained in FreeRTOSIPConfig.h.
-*----------------------------------------------------------*/
-#define configENABLE_BACKWARD_COMPATIBILITY        1
-#define configUSE_PREEMPTION                       1
-#define configUSE_PORT_OPTIMISED_TASK_SELECTION    0
-#define configMAX_PRIORITIES                       (7)
-#define configTICK_RATE_HZ                         (( TickType_t ) 1000)
-#define configMINIMAL_STACK_SIZE                   (768)
-#define configTOTAL_HEAP_SIZE_N						(256)
-#define configTOTAL_HEAP_SIZE                      (( size_t ) ( configTOTAL_HEAP_SIZE_N * 1024 ))
-#define configMAX_TASK_NAME_LEN                    (12)
-#define configUSE_TRACE_FACILITY                   1
-#define configUSE_16_BIT_TICKS                     0
-#define configIDLE_SHOULD_YIELD                    1
-#define configUSE_CO_ROUTINES                      0
-#define configUSE_MUTEXES                          1
-#define configUSE_RECURSIVE_MUTEXES                1
-#define configQUEUE_REGISTRY_SIZE                  0
-#define configUSE_APPLICATION_TASK_TAG             0
-#define configUSE_COUNTING_SEMAPHORES              1
-#define configUSE_ALTERNATIVE_API                  0
-#define configNUM_THREAD_LOCAL_STORAGE_POINTERS    3      /* FreeRTOS+FAT requires 2 pointers if a CWD is supported. */
-#define configRECORD_STACK_HIGH_ADDRESS            1
-
-#define configUSE_DAEMON_TASK_STARTUP_HOOK 1
-
-#define configCPU_CLOCK_HZ				(BSP_ICLK_HZ)
-#define configPERIPHERAL_CLOCK_HZ		(BSP_PCLKB_HZ)
-#define configUSE_QUEUE_SETS			1
-
-/* Hook function related definitions. */
-#define configUSE_TICK_HOOK                        1
-#define configUSE_IDLE_HOOK                        1
-#define configUSE_MALLOC_FAILED_HOOK               1
-#define configCHECK_FOR_STACK_OVERFLOW             2      /* Not applicable to the Win32 port. */
-
-/* Software timer related definitions. */
-#define configUSE_TIMERS                           1
-#define configTIMER_TASK_PRIORITY                  (6)
-#define configTIMER_QUEUE_LENGTH                   5
-#define configTIMER_TASK_STACK_DEPTH               (configMINIMAL_STACK_SIZE)
-
-/* The interrupt priority used by the kernel itself for the tick interrupt and
-the pended interrupt.  This would normally be the lowest priority. */
-#define configKERNEL_INTERRUPT_PRIORITY         1
-
-/* The maximum interrupt priority from which FreeRTOS API calls can be made.
-Interrupts that use a priority above this will not be effected by anything the
-kernel is doing. */
-#define configMAX_SYSCALL_INTERRUPT_PRIORITY    4
-
-/* The peripheral used to generate the tick interrupt is configured as part of
-the application code.  This constant should be set to the vector number of the
-peripheral chosen.  As supplied this is CMT0. */
-#define configTICK_VECTOR						_CMT0_CMI0		//CMT0
-//#define configTICK_VECTOR						_CMT1_CMI1		//CMT1
-//#define configTICK_VECTOR						_CMT2_CMI2		//CMT2
-//#define configTICK_VECTOR						_CMT3_CMI3		//CMT3
-
-/* Event group related definitions. */
-#define configUSE_EVENT_GROUPS                     1
-
-/* Run time stats gathering definitions. */
-unsigned long ulGetRunTimeCounterValue( void );
-void vConfigureTimerForRunTimeStats( void );
-#define configGENERATE_RUN_TIME_STATS    0
-//#define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS()    vConfigureTimerForRunTimeStats()
-//#define portGET_RUN_TIME_COUNTER_VALUE()            ulGetRunTimeCounterValue()
-
-/* Co-routine definitions. */
-#define configUSE_CO_ROUTINES                   0
-#define configMAX_CO_ROUTINE_PRIORITIES         (2)
-
-/* Currently the TCP/IP stack is using dynamic allocation, and the MQTT task is
- * using static allocation. */
-#define configSUPPORT_DYNAMIC_ALLOCATION        1
-#define configSUPPORT_STATIC_ALLOCATION         1
-
-/* Set the following definitions to 1 to include the API function, or zero
- * to exclude the API function. */
-#define INCLUDE_vTaskPrioritySet                1
-#define INCLUDE_uxTaskPriorityGet               1
-#define INCLUDE_vTaskDelete                     1
-#define INCLUDE_vTaskCleanUpResources           0
-#define INCLUDE_vTaskSuspend                    1
-#define INCLUDE_vTaskDelayUntil                 1
-#define INCLUDE_vTaskDelay                      1
-#define INCLUDE_uxTaskGetStackHighWaterMark     1
-#define INCLUDE_xTaskGetSchedulerState          1
-#define INCLUDE_xTimerGetTimerTaskHandle        0
-#define INCLUDE_xTaskGetIdleTaskHandle          0
-#define INCLUDE_xQueueGetMutexHolder            1
-#define INCLUDE_eTaskGetState                   1
-#define INCLUDE_xEventGroupSetBitsFromISR       1
-#define INCLUDE_xTimerPendFunctionCall          1
-#define INCLUDE_xTaskGetCurrentTaskHandle       1
-#define INCLUDE_xTaskAbortDelay                 1
-
-/* This demo makes use of one or more example stats formatting functions.  These
- * format the raw data provided by the uxTaskGetSystemState() function in to human
- * readable ASCII form.  See the notes in the implementation of vTaskList() within
- * FreeRTOS/Source/tasks.c for limitations.  configUSE_STATS_FORMATTING_FUNCTIONS
- * is set to 2 so the formatting functions are included without the stdio.h being
- * included in tasks.c.  That is because this project defines its own sprintf()
- * functions. */
-#define configUSE_STATS_FORMATTING_FUNCTIONS    1
-
-#if defined(ENABLE_UNIT_TESTS) || defined(FREERTOS_ENABLE_UNIT_TESTS)
-/* unity testing */
-#define configASSERT( x ) do { if( ( x ) == 0 ) TEST_ABORT(); } while( 0 )
-#elif defined(CONFIG_FREERTOS_ASSERT_DISABLE) || defined(NDEBUG)
-/* Disable Assert call for release builds. */
-#define configASSERT( x ) ( ( void ) 0 )
-#else /* CONFIG_FREERTOS_ASSERT_FAIL_ABORT or nothing */
-/* Assert call defined for debug builds. */
-extern void vAssertCalled( void );
-#define configASSERT( x ) do { if( ( x ) == 0 ) vAssertCalled(); } while( 0 )
-#endif
-
-/* The function that implements FreeRTOS printf style output, and the macro
- * that maps the configPRINTF() macros to that function. */
-extern void vLoggingPrintf( const char * pcFormat, ... );
-#define configPRINTF( X )    vLoggingPrintf X
-
-/* Non-format version thread-safe print */
-extern void vLoggingPrint( const char * pcMessage );
-#define configPRINT( X )     vLoggingPrint( X )
-
-extern void vOutputString( const char * pcMessage );
-/* Map the logging task's printf to the board specific output function. */
-#define configPRINT_STRING( x )    vOutputString(x)
-
-/* Sets the length of the buffers into which logging messages are written - so
- * also defines the maximum length of each log message. */
-#define configLOGGING_MAX_MESSAGE_LENGTH            192
-
-/* Set to 1 to prepend each log message with a message number, the task name,
- * and a time stamp. */
-#define configLOGGING_INCLUDE_TIME_AND_TASK_NAME    1
-
-/* Application specific definitions follow. **********************************/
-
-/* If configINCLUDE_DEMO_DEBUG_STATS is set to one, then a few basic IP trace
- * macros are defined to gather some UDP stack statistics that can then be viewed
- * through the CLI interface. */
-#define configINCLUDE_DEMO_DEBUG_STATS       1
-
-/* The size of the global output buffer that is available for use when there
- * are multiple command interpreters running at once (for example, one on a UART
- * and one on TCP/IP).  This is done to prevent an output buffer being defined by
- * each implementation - which would waste RAM.  In this case, there is only one
- * command interpreter running, and it has its own local output buffer, so the
- * global buffer is just set to be one byte long as it is not used and should not
- * take up unnecessary RAM. */
-#define configCOMMAND_INT_MAX_OUTPUT_SIZE    850
-
-/* Only used when running in the FreeRTOS Windows simulator.  Defines the
- * priority of the task used to simulate Ethernet interrupts. */
-#define configMAC_ISR_SIMULATOR_PRIORITY     ( configMAX_PRIORITIES - 1 )
-
-/* This demo creates a virtual network connection by accessing the raw Ethernet
- * or WiFi data to and from a real network connection.  Many computers have more
- * than one real network port, and configNETWORK_INTERFACE_TO_USE is used to tell
- * the demo which real port should be used to create the virtual port.  The ports
- * available are displayed on the console when the application is executed.  For
- * example, on my development laptop setting configNETWORK_INTERFACE_TO_USE to 4
- * results in the wired network being used, while setting
- * configNETWORK_INTERFACE_TO_USE to 2 results in the wireless network being
- * used. */
-#define configNETWORK_INTERFACE_TO_USE       2L
-
-/* The address of an echo server that will be used by the two demo echo client
- * tasks:
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_Echo_Clients.html,
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/UDP_Echo_Clients.html. */
-#define configECHO_SERVER_ADDR0              192
-#define configECHO_SERVER_ADDR1              168
-#define configECHO_SERVER_ADDR2              1
-#define configECHO_SERVER_ADDR3              200
-#define configTCP_ECHO_CLIENT_PORT           9999
-
-/* Default MAC address configuration.  The demo creates a virtual network
- * connection that uses this MAC address by accessing the raw Ethernet/WiFi data
- * to and from a real network connection on the host PC.  See the
- * configNETWORK_INTERFACE_TO_USE definition above for information on how to
- * configure the real network connection to use. */
-#define configMAC_ADDR0                      0x74
-#define configMAC_ADDR1                      0x90
-#define configMAC_ADDR2                      0x50
-#define configMAC_ADDR3                      0x00
-#define configMAC_ADDR4                      0x79
-#define configMAC_ADDR5                      0x03
-
-/* Default IP address configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configIP_ADDR0                       192
-#define configIP_ADDR1                       168
-#define configIP_ADDR2                       11
-#define configIP_ADDR3                       12
-
-/* Default gateway IP address configuration.  Used in ipconfigUSE_DHCP is set to
- * 0, or ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configGATEWAY_ADDR0                  172
-#define configGATEWAY_ADDR1                  27
-#define configGATEWAY_ADDR2                  49
-#define configGATEWAY_ADDR3                  1
-
-/* Default DNS server configuration.  OpenDNS addresses are 208.67.222.222 and
- * 208.67.220.220.  Used in ipconfigUSE_DHCP is set to 0, or ipconfigUSE_DHCP is
- * set to 1 but a DNS server cannot be contacted.*/
-#define configDNS_SERVER_ADDR0               143
-#define configDNS_SERVER_ADDR1               103
-#define configDNS_SERVER_ADDR2               47
-#define configDNS_SERVER_ADDR3               193
-
-/* Default netmask configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configNET_MASK0                      255
-#define configNET_MASK1                      255
-#define configNET_MASK2                      255
-#define configNET_MASK3                      0
-
-/* The UDP port to which print messages are sent. */
-#define configPRINT_PORT                     ( 15000 )
-
-#define configPROFILING                      ( 0 )
-
-/* Pseudo random number generater used by some demo tasks. */
-uint32_t ulRand(void);
-#define configRAND32()    ulRand()
-
-/* The platform FreeRTOS is running on. */
-#define configPLATFORM_NAME    "RenesasRX65N"
-
-/* Header required for the tracealyzer recorder library. */
-//#include "trcRecorder.h"
-
-/* When the FIT configurator or the Smart Configurator is used, platform.h has to be used. */
-#define configINCLUDE_PLATFORM_H_INSTEAD_OF_IODEFINE_H  1
-
-#endif /* FREERTOS_CONFIG_H */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/core_http_config.h b/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/core_http_config.h
deleted file mode 100644
index 1a2c82e0..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/core_http_config.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * coreHTTP v3.0.0
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_HTTP_CONFIG_H_
-#define CORE_HTTP_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging config definition and header files inclusion are required in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for HTTP.
- * 3. Include the header file "logging_stack.h", if logging is enabled for HTTP.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the HTTP library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "HTTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_HTTP_CONFIG_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/core_mqtt_agent_config.h b/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/core_mqtt_agent_config.h
deleted file mode 100644
index 9cb54017..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/core_mqtt_agent_config.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * coreMQTT Agent v1.2.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_mqtt_agent_config.h
- * @brief This represents the default values for the configuration macros
- * for the MQTT-Agent library.
- */
-
-#ifndef CORE_MQTT_AGENT_CONFIG_H_
-#define CORE_MQTT_AGENT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT Agent.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT_Agent"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
- /**
- * @brief Maximum time MQTT agent waits in the queue for any pending MQTT
- * operations.
- *
- * The wait time is kept smallest possible to increase the responsiveness of
- * MQTT agent while processing  pending MQTT operations as well as receive
- * packets from network.
- */
-#define MQTT_AGENT_MAX_EVENT_QUEUE_WAIT_TIME    ( 50U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_AGENT_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/core_mqtt_config.h b/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/core_mqtt_config.h
deleted file mode 100644
index 6222626b..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/core_mqtt_config.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * coreMQTT v2.1.1
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_MQTT_CONFIG_H_
-#define CORE_MQTT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief The maximum duration between non-empty network reads while
-* receiving an MQTT packet via the #MQTT_ProcessLoop or #MQTT_ReceiveLoop
-* API functions.
-*
-* When an incoming MQTT packet is detected, the transport receive function
-* may be called multiple times until all of the expected number of bytes of the
-* packet are received. This timeout represents the maximum polling duration that
-* is allowed without any data reception from the network for the incoming packet.
-*
-* If the timeout expires, the #MQTT_ProcessLoop and #MQTT_ReceiveLoop functions
-* return #MQTTRecvFailed.
-*
-* @note If a dummy implementation of the #MQTTGetCurrentTimeFunc_t timer function,
-* is supplied to the library, then #MQTT_RECV_POLLING_TIMEOUT_MS MUST be set to 0.
-*
-* <b>Possible values:</b> Any positive 32 bit integer. Recommended to use a
-* small timeout value. <br>
-* <b>Default value:</b> `10`
-*
-*/
-#define MQTT_RECV_POLLING_TIMEOUT_MS    ( 1000U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/core_pkcs11_config.h b/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/core_pkcs11_config.h
deleted file mode 100644
index e18f347c..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/core_pkcs11_config.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * corePKCS11 v3.5.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_pkcs11_config.h
- * @brief List of configuration macros for the corePKCS11 library along with
- * their custom values.
- */
-
-#ifndef CORE_PKCS11_CONFIG_H_
-#define CORE_PKCS11_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for PKCS #11.
- * 3. Include the header file "logging_stack.h", if logging is enabled for PKCS #11.
- */
-#include "logging_levels.h"
-
-/* Logging configuration for the PKCS #11 library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "PKCS11"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_ERROR
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief Maximum number of sessions that can be stored
-* by the PKCS #11 module.
-*
-* @note The windows test port has an abnormally large value in order to have
-* enough sessions to successfully run all the model based PKCS #11 tests.
-*
-* <b>Possible values:</b> Any positive integer.<br>
-* <b>Default value:</b> 10
-*/
-#define pkcs11configMAX_NUM_OBJECTS    8
-
-/**
-* @brief Set to 1 if a PAL destroy object is implemented.
-*
-* If set to 0, no PAL destroy object is implemented, and this functionality
-* is implemented in the common PKCS #11 layer.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configPAL_DESTROY_SUPPORTED    1
-
-/**
-* @brief Set to 1 if OTA image verification via PKCS #11 module is supported.
-*
-* If set to 0, OTA code signing certificate is built in via
-* aws_ota_codesigner_certificate.h.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configOTA_SUPPORTED    1
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* CORE_PKCS11_CONFIG_H_ include guard. */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/core_sntp_config.h b/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/core_sntp_config.h
deleted file mode 100644
index a6303826..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/core_sntp_config.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * coreSNTP v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_sntp_config.h
- * @brief This file represents the custom values for the configuration macros
- * of the coreSNTP library.
- */
-
-#ifndef CORE_SNTP_CONFIG_H_
-#define CORE_SNTP_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for SNTP.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "SNTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef CORE_SNTP_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/defender_config.h b/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/defender_config.h
deleted file mode 100644
index d0b3d8e4..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/defender_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Defender Client v1.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file defender_config.h
- * @brief Custom config values for the AWS IoT Device Defender Client Library.
- */
-
-#ifndef DEFENDER_CONFIG_H_
-#define DEFENDER_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for Device Defender.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "Defender"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* DEFENDER_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/demo_config.h b/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/demo_config.h
deleted file mode 100644
index 1860e674..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/demo_config.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * FreeRTOS V202111.00
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * https://www.FreeRTOS.org
- * https://github.com/FreeRTOS
- *
- */
-
-#ifndef DEMO_CONFIG_H
-#define DEMO_CONFIG_H
-
-/* FreeRTOS include. */
-#include "FreeRTOS.h"
-#include "aws_clientcredential.h"
-#include "aws_clientcredential_keys.h"
-#include "iot_default_root_certificates.h"
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for DEMO.
- * 3. Include the header file "logging_stack.h", if logging is enabled for DEMO.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Demo. */
-#ifndef LIBRARY_LOG_NAME
-#define LIBRARY_LOG_NAME    "MQTTDemo"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-#define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "iot_logging_task.h"
-
-
-/* Select a combination of demos to run
- * These demo has not been evaluated outside of the combination of demos listed below.
- *
- *          PUBSUB demo only :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB and OTA over MQTT demo :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (1)
- *          PUBSUB and OTA over MQTT demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (1)
- */
-/* demo is configured for PUBSUB */
-/* Select demo combination to run. */
-
-/* Please select a provisioning method
- * (0) : Pre-provisioning
- * (1) : Fleet provisioning
- */
-#define ENABLE_FLEET_PROVISIONING_DEMO      (1)
-
-/* Please select whether to enable or disable the OTA demo
- * (0) : OTA demo is disabled
- * (1) : OTA over MQTT demo is enabled
- */
-#define ENABLE_OTA_UPDATE_DEMO              (1)
-
-#define democonfigROOT_CA_PEM               tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief Path of the file containing the provisioning claim certificate. This
- * certificate is used to connect to AWS IoT Core and use Fleet Provisioning
- * APIs to provision the client device. This is used for the "Provisioning by
- * Claim" provisioning workflow.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This certificate should be PEM-encoded. The certificate should be
- * registered on AWS IoT Core beforehand. It should have an AWS IoT policy to
- * allow it to access only the Fleet Provisioning APIs. An example policy for
- * the claim certificates for this demo is available in the
- * example_claim_policy.json file in the demo directory. In the example,
- * replace <aws-region> with your AWS region, <aws-account-id> with your
- * account ID, and <template-name> with the name of your provisioning template.
- *
- */
-#define democonfigCLAIM_CERT_PEM            "...insert here..."
-
-/**
- * @brief Path of the file containing the provisioning claim private key. This
- * key corresponds to the provisioning claim certificate and is used to
- * authenticate with AWS IoT for provisioning by claim.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This private key should be PEM-encoded.
- *
- */
-#define democonfigCLAIM_PRIVATE_KEY_PEM     "...insert here..."
-
-/**
- * @brief An option to disable Server Name Indication.
- *
- * @note When using a local Mosquitto server setup, SNI needs to be disabled
- * for an MQTT broker that only has an IP address but no hostname. However,
- * SNI should be enabled whenever possible.
- */
-#define democonfigDISABLE_SNI                ( pdFALSE )
-
-/**
- * @brief Configuration that indicates if the demo connection is made to the AWS IoT Core MQTT broker.
- *
- * If username/password based authentication is used, the demo will use appropriate TLS ALPN and
- * SNI configurations as required for the Custom Authentication feature of AWS IoT.
- * For more information, refer to the following documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/custom-auth.html#custom-auth-mqtt
- *
- * #define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
- */
-#define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
-
-/**
- * @brief The unique ID used by the demo to differentiate instances.
- *
- *!!! Please note a #defined constant is used for convenience of demonstration
- *!!! only.  Production devices can use something unique to the device that can
- *!!! be read by software, such as a production serial number, instead of a
- *!!! hard coded constant.
- */
-#define democonfigFP_DEMO_ID    "FPDemoID"
-
-/**
- * @brief The MQTT client identifier used in this example.  Each client identifier
- * must be unique so edit as required to ensure no two clients connecting to the
- * same broker use the same client identifier.
- *
- * @note Appending __TIME__ to the client id string will reduce the possibility of a
- * client id collision in the broker. Note that the appended time is the compilation
- * time. This client id can cause collision, if more than one instance of the same
- * binary is used at the same time to connect to the broker.
- */
-#ifndef democonfigCLIENT_IDENTIFIER
-#if (ENABLE_FLEET_PROVISIONING_DEMO == 1)
-    #define democonfigCLIENT_IDENTIFIER    "client"democonfigFP_DEMO_ID
-#else
-    #define democonfigCLIENT_IDENTIFIER    clientcredentialIOT_THING_NAME
-#endif
-#endif
-
-/**
- * @brief Details of the MQTT broker to connect to.
- *
- * This is the Claim's Rest API Endpoint for AWS IoT.
- *
- * @note Your AWS IoT Core endpoint can be found in the AWS IoT console under
- * Settings/Custom Endpoint, or using the describe-endpoint API.
- *
- */
-#define democonfigMQTT_BROKER_ENDPOINT     clientcredentialMQTT_BROKER_ENDPOINT
-
-/**
- * @brief AWS IoT MQTT broker port number.
- *
- * In general, port 8883 is for secured MQTT connections.
- *
- * @note Port 443 requires use of the ALPN TLS extension with the ALPN protocol
- * name. When using port 8883, ALPN is not required.
- */
-#define democonfigMQTT_BROKER_PORT    ( clientcredentialMQTT_BROKER_PORT )
-
-/**
- * @brief Name of the provisioning template to use for the RegisterThing
- * portion of the Fleet Provisioning workflow.
- *
- * For information about provisioning templates, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-template.html#fleet-provision-template
- *
- * The example template used for this demo is available in the
- * example_demo_template.json file in the DemoSetup directory. In the example,
- * replace <provisioned-thing-policy> with the policy provisioned devices
- * should have.  The demo template uses Fn::Join to construct the Thing name by
- * concatenating fp_demo_ and the serial number sent by the demo.
- *
- * @note The provisioning template MUST be created in AWS IoT before running the
- * demo.
- *
- * @note If you followed the manual setup steps on https://freertos.org/iot-fleet-provisioning/demo.html,
- * the provisioning template name is "FleetProvisioningDemoTemplate".
- * However, if you used CloudFormation to set up the demo, the template name is "CF_FleetProvisioningDemoTemplate"
- */
- #define democonfigPROVISIONING_TEMPLATE_NAME    "...insert here..."
-
-/**
- * @brief Subject name to use when creating the certificate signing request (CSR)
- * for provisioning the demo client with using the Fleet Provisioning
- * CreateCertificateFromCsr APIs.
- *
- * This is passed to MbedTLS; see https://tls.mbed.org/api/x509__csr_8h.html#a954eae166b125cea2115b7db8c896e90
- */
-#ifndef democonfigCSR_SUBJECT_NAME
-    #define democonfigCSR_SUBJECT_NAME    "CN="democonfigFP_DEMO_ID
-#endif
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_STACKSIZE        configMINIMAL_STACK_SIZE * 3
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_TASK_PRIORITY    ( tskIDLE_PRIORITY + 1 )
-
-#define democonfigNETWORK_BUFFER_SIZE    ( configMINIMAL_STACK_SIZE * 3 )
-
-#include "core_mqtt.h" /* Include coreMQTT header for MQTT_LIBRARY_VERSION macro. */
-#define democonfigMQTT_LIB    "core-mqtt@"MQTT_LIBRARY_VERSION
-
-#define democonfigDISABLE_SNI       ( pdFALSE )
-
-/**
- * @brief ALPN (Application-Layer Protocol Negotiation) protocol name for AWS IoT MQTT.
- *
- * This will be used if democonfigMQTT_BROKER_PORT is configured as 443 for the AWS IoT MQTT broker.
- * Please see more details about the ALPN protocol for AWS IoT MQTT endpoint
- * in the link below.
- * https://aws.amazon.com/blogs/iot/mqtt-with-tls-client-authentication-on-port-443-why-it-is-useful-and-how-it-works/
- */
-#define AWS_IOT_MQTT_ALPN           "\x0ex-amzn-mqtt-ca"
-
-/**
- * @brief This is the ALPN (Application-Layer Protocol Negotiation) string
- * required by AWS IoT for password-based authentication using TCP port 443.
- */
-#define AWS_IOT_CUSTOM_AUTH_ALPN    "\x04mqtt"
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-/**
- * @brief The name of the operating system that the application is running on.
- * The current value is given as an example. Please update for your specific
- * operating system.
- */
-#define democonfigOS_NAME       "FreeRTOS"
-
-/**
- * @brief The version of the operating system that the application is running
- * on. The current value is given as an example. Please update for your specific
- * operating system version.
- */
-#define democonfigOS_VERSION    "V10.4.3"
-
-/**
- * @brief The name of the hardware platform the application is running on. The
- * current value is given as an example. Please update for your specific
- * hardware platform.
- */
-#define democonfigHARDWARE_PLATFORM_NAME    "CK-RX65N"
-
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING                                 \
-    "?SDK=" democonfigOS_NAME "&Version=" democonfigOS_VERSION \
-    "&MQTTLib=" democonfigMQTT_LIB
-
-/**
- * @brief The length of the MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING_LENGTH    ( ( uint16_t ) ( sizeof( AWS_IOT_METRICS_STRING ) - 1 ) )
-
-
-#ifdef democonfigCLIENT_USERNAME
-
-/**
- * @brief Append the username with the metrics string if #democonfigCLIENT_USERNAME is defined.
- *
- * This is to support both metrics reporting and username/password based client
- * authentication by AWS IoT.
- */
-#define CLIENT_USERNAME_WITH_METRICS    democonfigCLIENT_USERNAME AWS_IOT_METRICS_STRING
-#endif
-
-/**
- * @brief Flag to enable or disable provisioning mode for the demo.
- * Enabling the flags starts a CLI task, so that user can perform provisioning of the device through
- * a serial terminal. Provisioning involves running commands to fetch or set the PKI and configuration
- * information for the device to connect to broker and perform OTA updates. Disabling the flag results
- * in disabling the CLI task and execution of the demo tasks in normal device operation mode.
- */
-#define appmainPROVISIONING_MODE                  ( 1 )
-
-/**
- * @brief Certificate used for validating code signing signatures in the OTA PAL.
- */
-#ifndef otapalconfigCODE_SIGNING_CERTIFICATE
-    #define otapalconfigCODE_SIGNING_CERTIFICATE    "Insert code signing certificate..."
-#endif
-
-/**
- * @brief Major version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MAJOR
-    #define APP_VERSION_MAJOR    0
-#endif
-
-/**
- * @brief Minor version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MINOR
-    #define APP_VERSION_MINOR    9
-#endif
-
-/**
- * @brief Build version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_BUILD
-    #define APP_VERSION_BUILD    2
-#endif
-
-/**
- * @brief Server's root CA certificate.
- *
- * This certificate is used to identify the AWS IoT server and is publicly
- * available. Refer to the AWS documentation available in the link below for
- * information about the Server Root CAs.
- * https://docs.aws.amazon.com/iot/latest/developerguide/server-authentication.html#server-authentication-certs
- *
- * @note The TI C3220 Launchpad board requires that the Root CA have its
- * certificate self-signed. As mentioned in the above link, the Amazon Root CAs
- * are cross-signed by the Starfield Root CA. Thus, ONLY the Starfield Root CA
- * can be used to connect to the ATS endpoints on AWS IoT for the TI board.
- *
- * @note This certificate should be PEM-encoded.
- *
- * Must include the PEM header and footer:
- * "-----BEGIN CERTIFICATE-----\n"\
- * "...base64 data...\n"\
- * "-----END CERTIFICATE-----\n"
- *
- */
-#define democonfigROOT_CA_PEM                   tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief The length of the queue used to hold commands for the agent.
- */
-#define MQTT_AGENT_COMMAND_QUEUE_LENGTH         ( 25 )
-
-/**
- * @brief Dimensions the buffer used to serialise and deserialise MQTT packets.
- * @note Specified in bytes.  Must be large enough to hold the maximum
- * anticipated MQTT payload.
- */
-#define MQTT_AGENT_NETWORK_BUFFER_SIZE          ( 5000 )
-
-#define MQTT_COMMAND_CONTEXTS_POOL_SIZE              ( 10 )
-
-#endif /* DEMO_CONFIG_H */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/fleet_provisioning_config.h b/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/fleet_provisioning_config.h
deleted file mode 100644
index 68b85d66..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/fleet_provisioning_config.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * AWS IoT Fleet Provisioning v1.1.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file fleet_provisioning_config.h
- * @brief Custom config values for the AWS IoT Fleet Provisioning Library.
- */
-
-#ifndef FLEET_PROVISIONING_CONFIG_H_
-#define FLEET_PROVISIONING_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for Fleet Provisioning.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Fleet Provisioning library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "FleetProvisioning"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-/************ End of logging configuration ****************/
-
-#endif /* ifndef FLEET_PROVISIONING_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/ota_config.h b/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/ota_config.h
deleted file mode 100644
index 38a3df57..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/ota_config.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * AWS IoT Over-the-air Update v3.4.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file ota_config.h
- * @brief This represents the custom values for the configuration macros
- * for the OTA library.
- */
-
-#ifndef OTA_CONFIG_H
-#define OTA_CONFIG_H
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for OTA.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "OTA"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-/**
- * @brief Log base 2 of the size of the file data block message (excluding the header).
- *
- * 10 bits yields a data block size of 1KB.
- */
-#define otaconfigLOG2_FILE_BLOCK_SIZE           12UL
-
-/**
- * @brief Size of the file data block message (excluding the header).
- *
- */
-#define otaconfigFILE_BLOCK_SIZE                ( 1UL << otaconfigLOG2_FILE_BLOCK_SIZE )
-
-/**
- * @brief Milliseconds to wait for the self test phase to succeed before we force reset.
- */
-#define otaconfigSELF_TEST_RESPONSE_WAIT_MS     16000U
-
-/**
- * @brief Milliseconds to wait before requesting data blocks from the OTA service if nothing is happening.
- *
- * The wait timer is reset whenever a data block is received from the OTA service so we will only send
- * the request message after being idle for this amount of time.
- */
-#define otaconfigFILE_REQUEST_WAIT_MS           360000U
-
-/**
- * @brief The maximum allowed length of the thing name used by the OTA agent.
- *
- * AWS IoT requires Thing names to be unique for each device that connects to the broker.
- * Likewise, the OTA agent requires the developer to construct and pass in the Thing name when
- * initializing the OTA agent. The agent uses this size to allocate static storage for the
- * Thing name used in all OTA base topics. Namely $aws/things/<thingName>
- */
-#define otaconfigMAX_THINGNAME_LEN              128U
-
-/**
- * @brief The maximum number of data blocks requested from OTA streaming service.
- *
- *  This configuration parameter is sent with data requests and represents the maximum number of
- *  data blocks the service will send in response. The maximum limit for this must be calculated
- *  from the maximum data response limit (128 KB from service) divided by the block size.
- *  For example if block size is set as 1 KB then the maximum number of data blocks that we can
- *  request is 128/1 = 128 blocks. Configure this parameter to this maximum limit or lower based on
- *  how many data blocks response is expected for each data requests.
- *  Please note that this must be set larger than zero.
- *
- */
-#define otaconfigMAX_NUM_BLOCKS_REQUEST         1U
-#if otaconfigMAX_NUM_BLOCKS_REQUEST > 1U
-#error "otaconfigMAX_NUM_BLOCKS_REQUEST > 1U is not supported in this release "
-#endif
-
-/**
- * @brief The maximum number of requests allowed to send without a response before we abort.
- *
- * This configuration parameter sets the maximum number of times the requests are made over
- * the selected communication channel before aborting and returning error.
- *
- */
-#define otaconfigMAX_NUM_REQUEST_MOMENTUM       1U
-
-/**
- * @brief The number of data buffers reserved by the OTA agent.
- *
- * This configurations parameter sets the maximum number of static data buffers used by
- * the OTA agent for job and file data blocks received.
- */
-#define otaconfigMAX_NUM_OTA_DATA_BUFFERS       otaconfigMAX_NUM_BLOCKS_REQUEST + 1U
-
-/**
- * @brief How frequently the device will report its OTA progress to the cloud.
- *
- * Device will update the job status with the number of blocks it has received every certain
- * number of blocks it receives. For example, 25 means device will update job status every 25 blocks
- * it receives.
- */
-#define otaconfigOTA_UPDATE_STATUS_FREQUENCY    25U
-
-/**
- * @brief Allow update to same or lower version.
- *
- * Set this to 1 to allow downgrade or same version update.This configurations parameter
- * disables version check and allows update to a same or lower version.This is provided for
- * testing purpose and it is recommended to always update to higher version and keep this
- * configuration disabled.
- */
-#define otaconfigAllowDowngrade           0U
-
-/**
- * @brief The protocol selected for OTA control operations.
- *
- * This configurations parameter sets the default protocol for all the OTA control
- * operations like requesting OTA job, updating the job status etc.
- *
- * Note - Only MQTT is supported at this time for control operations.
- */
-#define configENABLED_CONTROL_PROTOCOL    ( OTA_CONTROL_OVER_MQTT )
-
-/**
- * @brief The protocol selected for OTA data operations.
- *
- * This configurations parameter sets the protocols selected for the data operations
- * like requesting file blocks from the service.
- *
- * Note - Both MQTT and HTTP is supported for data transfer from service. This configuration parameter
- * can be set to following -
- * Enable data over MQTT - ( OTA_DATA_OVER_MQTT )
- * Enable data over HTTP - ( OTA_DATA_OVER_HTTP)
- *
- * Note - Please check the OTA over HTTP demo which has the HTTP data transfer functionality and
- * and this configuration is set to OTA_DATA_OVER_HTTP.
- */
-#define configENABLED_DATA_PROTOCOLS      ( OTA_DATA_OVER_MQTT )
-
-/**
- * @brief The preferred protocol selected for OTA data operations.
- *
- * Primary data protocol will be the protocol used for downloading file if more than
- * one protocol is selected while creating OTA job. Default primary data protocol is MQTT
- * and following update here to switch to HTTP as primary.
- *
- * Note - use OTA_DATA_OVER_HTTP for HTTP as primary data protocol.
- */
-
-#define configOTA_PRIMARY_DATA_PROTOCOL    ( OTA_DATA_OVER_MQTT )
-
-
-#endif /* ifndef OTA_CONFIG_H */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/rm_littlefs_flash_config.h b/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/rm_littlefs_flash_config.h
deleted file mode 100644
index 94207ffa..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/rm_littlefs_flash_config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/***********************************************************************************************************************
- * Copyright 2023 Renesas Electronics Corporation and/or its affiliates.  All Rights Reserved.
- *
- * This software and documentation are supplied by Renesas Electronics America Inc. and may only be used with products
- * of Renesas Electronics Corp. and its affiliates ("Renesas").  No other uses are authorized.  Renesas products are
- * sold pursuant to Renesas terms and conditions of sale.  Purchasers are solely responsible for the selection and use
- * of Renesas products and Renesas assumes no liability.  No license, express or implied, to any intellectual property
- * right is granted by Renesas. This software is protected under all applicable laws, including copyright laws. Renesas
- * reserves the right to change or discontinue this software and/or this documentation. THE SOFTWARE AND DOCUMENTATION
- * IS DELIVERED TO YOU "AS IS," AND RENESAS MAKES NO REPRESENTATIONS OR WARRANTIES, AND TO THE FULLEST EXTENT
- * PERMISSIBLE UNDER APPLICABLE LAW, DISCLAIMS ALL WARRANTIES, WHETHER EXPLICITLY OR IMPLICITLY, INCLUDING WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT, WITH RESPECT TO THE SOFTWARE OR
- * DOCUMENTATION.  RENESAS SHALL HAVE NO LIABILITY ARISING OUT OF ANY SECURITY VULNERABILITY OR BREACH.  TO THE MAXIMUM
- * EXTENT PERMITTED BY LAW, IN NO EVENT WILL RENESAS BE LIABLE TO YOU IN CONNECTION WITH THE SOFTWARE OR DOCUMENTATION
- * (OR ANY PERSON OR ENTITY CLAIMING RIGHTS DERIVED FROM YOU) FOR ANY LOSS, DAMAGES, OR CLAIMS WHATSOEVER, INCLUDING,
- * WITHOUT LIMITATION, ANY DIRECT, CONSEQUENTIAL, SPECIAL, INDIRECT, PUNITIVE, OR INCIDENTAL DAMAGES; ANY LOST PROFITS,
- * OTHER ECONOMIC DAMAGE, PROPERTY DAMAGE, OR PERSONAL INJURY; AND EVEN IF RENESAS HAS BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH LOSS, DAMAGES, CLAIMS OR COSTS.
- **********************************************************************************************************************/
-
-#ifndef FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-#define FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-
-/***********************************************************************************************************************
- * Includes
- **********************************************************************************************************************/
-#include "rm_littlefs_df_rx65n.h"
-
-#define LFS_FLASH_READ_SIZE				(1)
-#define LFS_FLASH_PROGRAM_SIZE			(4)
-#define LFS_FLASH_BLOCK_SIZE			(128)
-#define LFS_FLASH_BLOCK_COUNT			(70)
-#define RM_LITTLEFS_FLASH_DATA_START	FLASH_DF_BLOCK_0_MACRO
-
-#if LFS_FLASH_BLOCK_SIZE*LFS_FLASH_BLOCK_COUNT + (RM_LITTLEFS_FLASH_DATA_START - FLASH_DF_BLOCK_0_MACRO) > BSP_DATA_FLASH_SIZE_BYTES
-#error "Too many blocks"
-#endif
-
-#endif /* FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/shadow_config.h b/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/shadow_config.h
deleted file mode 100644
index aa948c12..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/shadow_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Shadow v1.3.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file shadow_config.h
- * @brief This represents the custom values for the configuration macros
- * for the Shadow library.
- */
-
-#ifndef SHADOW_CONFIG_H_
-#define SHADOW_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SHADOW"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef SHADOW_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/sigv4_config.h b/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/sigv4_config.h
deleted file mode 100644
index ba277a79..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/sigv4_config.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * SigV4 Library v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file sigv4_config.h
- * @brief The custom values for configuration macros used by the SigV4 Library.
- */
-
-#ifndef SIGV4_CONFIG_H_
-#define SIGV4_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SIGV4"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef SIGV4_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/user_tcp_hook_config.h b/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/user_tcp_hook_config.h
deleted file mode 100644
index 0c1308fe..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/cellular/src/frtos_config/user_tcp_hook_config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**********************************************************************************************************************
- * Copyright (C) 2023 Renesas Electronics Corporation. All rights reserved.
- *
- * DISCLAIMER
- * This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
- * other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
- * applicable laws, including copyright laws.
- * THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
- * THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
- * EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
- * SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS
- * SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
- * this software. By using this software, you agree to the additional terms and conditions found by accessing the
- * following link:
- * http://www.renesas.com/disclaimer
- *********************************************************************************************************************/
-
-#ifndef FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_
-#define FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_
-
-/* The limit of number for CELLULAR_ERR_MODULE_COM when it comes continuously.
- * If counter is over than this limit, hook the reset */
-#define USER_COMM_ERROR_TRIES		3
-
-/*Connection retry limit*/
-#define USER_RECONNECT_TRIES 		3
-
-/*Socket closing retry limit*/
-#define USER_CLOSE_SOCKET_TRIES		3
-
-/*Enable SocketErrorHook*/
-#define USER_TCP_HOOK_ENABLED   	1 /* Default */
-
-/* Reset cellular hardware*/
-#define USER_TCP_HOOK_FUNCTION     SocketErrorHook
-
-#endif /* FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/ether/linker_section_sample.esi b/Configuration/samples/fleet_pso/ck-rx65n/ether/linker_section_sample.esi
deleted file mode 100644
index dc7e6ce9..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/ether/linker_section_sample.esi
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<com.renesas.linkersection.model:SectionContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:com.renesas.linkersection.model="http:///LinkerSection.ecore">
-  <sections name="SU">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4"/>
-  </sections>
-  <sections name="SI"/>
-  <sections name="R_1"/>
-  <sections name="B_2"/>
-  <sections name="R"/>
-  <sections name="RPFRAM2"/>
-  <sections name="C_LITTLEFS_MANAGEMENT_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1048576"/>
-  </sections>
-  <sections name="C_USER_APPLICATION_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1057536"/>
-  </sections>
-  <sections name="B_ETHERNET_BUFFERS*">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="8388608"/>
-  </sections>
-  <sections name="B_RX_DESC*"/>
-  <sections name="B_TX_DESC*"/>
-  <sections name="B"/>
-  <sections name="B_1"/>
-  <sections name="R_2"/>
-  <sections name="PResetPRG">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4293919488"/>
-  </sections>
-  <sections name="C_1"/>
-  <sections name="C_2"/>
-  <sections name="C"/>
-  <sections name="C$*"/>
-  <sections name="D*"/>
-  <sections name="W*"/>
-  <sections name="L"/>
-  <sections name="P"/>
-  <sections name="PFRAM2"/>
-  <sections name="EXCEPTVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294901632"/>
-  </sections>
-  <sections name="RESETVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294901756"/>
-  </sections>
-</com.renesas.linkersection.model:SectionContainer>
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/FreeRTOSConfig.h b/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/FreeRTOSConfig.h
deleted file mode 100644
index 5662a8c2..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/FreeRTOSConfig.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * FreeRTOS Kernel V10.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * http://aws.amazon.com/freertos
- * http://www.FreeRTOS.org
- */
-
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
-
-
-/* Unity includes. */
-#if defined(FREERTOS_ENABLE_UNIT_TESTS)
-#include "unity_internals.h"
-#elif defined(ENABLE_UNIT_TESTS)
-#include "unity.h"
-#endif
-
-/*-----------------------------------------------------------
-* Application specific definitions.
-*
-* These definitions should be adjusted for your particular hardware and
-* application requirements.
-*
-* THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
-* FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
-* http://www.freertos.org/a00110.html
-*
-* The bottom of this file contains some constants specific to running the UDP
-* stack in this demo.  Constants specific to FreeRTOS+TCP itself (rather than
-* the demo) are contained in FreeRTOSIPConfig.h.
-*----------------------------------------------------------*/
-#define configENABLE_BACKWARD_COMPATIBILITY        1
-#define configUSE_PREEMPTION                       1
-#define configUSE_PORT_OPTIMISED_TASK_SELECTION    0
-#define configMAX_PRIORITIES                       (7)
-#define configTICK_RATE_HZ                         (( TickType_t ) 1000)
-#define configMINIMAL_STACK_SIZE                   (768)
-#define configTOTAL_HEAP_SIZE_N						(256)
-#define configTOTAL_HEAP_SIZE                      (( size_t ) ( configTOTAL_HEAP_SIZE_N * 1024 ))
-#define configMAX_TASK_NAME_LEN                    (12)
-#define configUSE_TRACE_FACILITY                   1
-#define configUSE_16_BIT_TICKS                     0
-#define configIDLE_SHOULD_YIELD                    1
-#define configUSE_CO_ROUTINES                      0
-#define configUSE_MUTEXES                          1
-#define configUSE_RECURSIVE_MUTEXES                1
-#define configQUEUE_REGISTRY_SIZE                  0
-#define configUSE_APPLICATION_TASK_TAG             0
-#define configUSE_COUNTING_SEMAPHORES              1
-#define configUSE_ALTERNATIVE_API                  0
-#define configNUM_THREAD_LOCAL_STORAGE_POINTERS    3      /* FreeRTOS+FAT requires 2 pointers if a CWD is supported. */
-#define configRECORD_STACK_HIGH_ADDRESS            1
-
-#define configUSE_DAEMON_TASK_STARTUP_HOOK 1
-
-#define configCPU_CLOCK_HZ				(BSP_ICLK_HZ)
-#define configPERIPHERAL_CLOCK_HZ		(BSP_PCLKB_HZ)
-#define configUSE_QUEUE_SETS			1
-
-/* Hook function related definitions. */
-#define configUSE_TICK_HOOK                        1
-#define configUSE_IDLE_HOOK                        1
-#define configUSE_MALLOC_FAILED_HOOK               1
-#define configCHECK_FOR_STACK_OVERFLOW             2      /* Not applicable to the Win32 port. */
-
-/* Software timer related definitions. */
-#define configUSE_TIMERS                           1
-#define configTIMER_TASK_PRIORITY                  (6)
-#define configTIMER_QUEUE_LENGTH                   5
-#define configTIMER_TASK_STACK_DEPTH               (configMINIMAL_STACK_SIZE)
-
-/* The interrupt priority used by the kernel itself for the tick interrupt and
-the pended interrupt.  This would normally be the lowest priority. */
-#define configKERNEL_INTERRUPT_PRIORITY         1
-
-/* The maximum interrupt priority from which FreeRTOS API calls can be made.
-Interrupts that use a priority above this will not be effected by anything the
-kernel is doing. */
-#define configMAX_SYSCALL_INTERRUPT_PRIORITY    4
-
-/* The peripheral used to generate the tick interrupt is configured as part of
-the application code.  This constant should be set to the vector number of the
-peripheral chosen.  As supplied this is CMT0. */
-#define configTICK_VECTOR						_CMT0_CMI0		//CMT0
-//#define configTICK_VECTOR						_CMT1_CMI1		//CMT1
-//#define configTICK_VECTOR						_CMT2_CMI2		//CMT2
-//#define configTICK_VECTOR						_CMT3_CMI3		//CMT3
-
-/* Event group related definitions. */
-#define configUSE_EVENT_GROUPS                     1
-
-/* Run time stats gathering definitions. */
-unsigned long ulGetRunTimeCounterValue( void );
-void vConfigureTimerForRunTimeStats( void );
-#define configGENERATE_RUN_TIME_STATS    0
-//#define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS()    vConfigureTimerForRunTimeStats()
-//#define portGET_RUN_TIME_COUNTER_VALUE()            ulGetRunTimeCounterValue()
-
-/* Co-routine definitions. */
-#define configUSE_CO_ROUTINES                   0
-#define configMAX_CO_ROUTINE_PRIORITIES         (2)
-
-/* Currently the TCP/IP stack is using dynamic allocation, and the MQTT task is
- * using static allocation. */
-#define configSUPPORT_DYNAMIC_ALLOCATION        1
-#define configSUPPORT_STATIC_ALLOCATION         1
-
-/* Set the following definitions to 1 to include the API function, or zero
- * to exclude the API function. */
-#define INCLUDE_vTaskPrioritySet                1
-#define INCLUDE_uxTaskPriorityGet               1
-#define INCLUDE_vTaskDelete                     1
-#define INCLUDE_vTaskCleanUpResources           0
-#define INCLUDE_vTaskSuspend                    1
-#define INCLUDE_vTaskDelayUntil                 1
-#define INCLUDE_vTaskDelay                      1
-#define INCLUDE_uxTaskGetStackHighWaterMark     1
-#define INCLUDE_xTaskGetSchedulerState          1
-#define INCLUDE_xTimerGetTimerTaskHandle        0
-#define INCLUDE_xTaskGetIdleTaskHandle          0
-#define INCLUDE_xQueueGetMutexHolder            1
-#define INCLUDE_eTaskGetState                   1
-#define INCLUDE_xEventGroupSetBitsFromISR       1
-#define INCLUDE_xTimerPendFunctionCall          1
-#define INCLUDE_xTaskGetCurrentTaskHandle       1
-#define INCLUDE_xTaskAbortDelay                 1
-
-/* This demo makes use of one or more example stats formatting functions.  These
- * format the raw data provided by the uxTaskGetSystemState() function in to human
- * readable ASCII form.  See the notes in the implementation of vTaskList() within
- * FreeRTOS/Source/tasks.c for limitations.  configUSE_STATS_FORMATTING_FUNCTIONS
- * is set to 2 so the formatting functions are included without the stdio.h being
- * included in tasks.c.  That is because this project defines its own sprintf()
- * functions. */
-#define configUSE_STATS_FORMATTING_FUNCTIONS    1
-
-#if defined(ENABLE_UNIT_TESTS) || defined(FREERTOS_ENABLE_UNIT_TESTS)
-/* unity testing */
-#define configASSERT( x ) do { if( ( x ) == 0 ) TEST_ABORT(); } while( 0 )
-#elif defined(CONFIG_FREERTOS_ASSERT_DISABLE) || defined(NDEBUG)
-/* Disable Assert call for release builds. */
-#define configASSERT( x ) ( ( void ) 0 )
-#else /* CONFIG_FREERTOS_ASSERT_FAIL_ABORT or nothing */
-/* Assert call defined for debug builds. */
-extern void vAssertCalled( void );
-#define configASSERT( x ) do { if( ( x ) == 0 ) vAssertCalled(); } while( 0 )
-#endif
-
-/* The function that implements FreeRTOS printf style output, and the macro
- * that maps the configPRINTF() macros to that function. */
-extern void vLoggingPrintf( const char * pcFormat, ... );
-#define configPRINTF( X )    vLoggingPrintf X
-
-/* Non-format version thread-safe print */
-extern void vLoggingPrint( const char * pcMessage );
-#define configPRINT( X )     vLoggingPrint( X )
-
-extern void vOutputString( const char * pcMessage );
-/* Map the logging task's printf to the board specific output function. */
-#define configPRINT_STRING( x )    vOutputString(x)
-
-/* Sets the length of the buffers into which logging messages are written - so
- * also defines the maximum length of each log message. */
-#define configLOGGING_MAX_MESSAGE_LENGTH            192
-
-/* Set to 1 to prepend each log message with a message number, the task name,
- * and a time stamp. */
-#define configLOGGING_INCLUDE_TIME_AND_TASK_NAME    1
-
-/* Application specific definitions follow. **********************************/
-
-/* If configINCLUDE_DEMO_DEBUG_STATS is set to one, then a few basic IP trace
- * macros are defined to gather some UDP stack statistics that can then be viewed
- * through the CLI interface. */
-#define configINCLUDE_DEMO_DEBUG_STATS       1
-
-/* The size of the global output buffer that is available for use when there
- * are multiple command interpreters running at once (for example, one on a UART
- * and one on TCP/IP).  This is done to prevent an output buffer being defined by
- * each implementation - which would waste RAM.  In this case, there is only one
- * command interpreter running, and it has its own local output buffer, so the
- * global buffer is just set to be one byte long as it is not used and should not
- * take up unnecessary RAM. */
-#define configCOMMAND_INT_MAX_OUTPUT_SIZE    850
-
-/* Only used when running in the FreeRTOS Windows simulator.  Defines the
- * priority of the task used to simulate Ethernet interrupts. */
-#define configMAC_ISR_SIMULATOR_PRIORITY     ( configMAX_PRIORITIES - 1 )
-
-/* This demo creates a virtual network connection by accessing the raw Ethernet
- * or WiFi data to and from a real network connection.  Many computers have more
- * than one real network port, and configNETWORK_INTERFACE_TO_USE is used to tell
- * the demo which real port should be used to create the virtual port.  The ports
- * available are displayed on the console when the application is executed.  For
- * example, on my development laptop setting configNETWORK_INTERFACE_TO_USE to 4
- * results in the wired network being used, while setting
- * configNETWORK_INTERFACE_TO_USE to 2 results in the wireless network being
- * used. */
-#define configNETWORK_INTERFACE_TO_USE       2L
-
-/* The address of an echo server that will be used by the two demo echo client
- * tasks:
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_Echo_Clients.html,
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/UDP_Echo_Clients.html. */
-#define configECHO_SERVER_ADDR0              192
-#define configECHO_SERVER_ADDR1              168
-#define configECHO_SERVER_ADDR2              1
-#define configECHO_SERVER_ADDR3              200
-#define configTCP_ECHO_CLIENT_PORT           9999
-
-/* Default MAC address configuration.  The demo creates a virtual network
- * connection that uses this MAC address by accessing the raw Ethernet/WiFi data
- * to and from a real network connection on the host PC.  See the
- * configNETWORK_INTERFACE_TO_USE definition above for information on how to
- * configure the real network connection to use. */
-#define configMAC_ADDR0                      0x74
-#define configMAC_ADDR1                      0x90
-#define configMAC_ADDR2                      0x50
-#define configMAC_ADDR3                      0x00
-#define configMAC_ADDR4                      0x79
-#define configMAC_ADDR5                      0x03
-
-/* Default IP address configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configIP_ADDR0                       192
-#define configIP_ADDR1                       168
-#define configIP_ADDR2                       11
-#define configIP_ADDR3                       12
-
-/* Default gateway IP address configuration.  Used in ipconfigUSE_DHCP is set to
- * 0, or ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configGATEWAY_ADDR0                  172
-#define configGATEWAY_ADDR1                  27
-#define configGATEWAY_ADDR2                  49
-#define configGATEWAY_ADDR3                  1
-
-/* Default DNS server configuration.  OpenDNS addresses are 208.67.222.222 and
- * 208.67.220.220.  Used in ipconfigUSE_DHCP is set to 0, or ipconfigUSE_DHCP is
- * set to 1 but a DNS server cannot be contacted.*/
-#define configDNS_SERVER_ADDR0               143
-#define configDNS_SERVER_ADDR1               103
-#define configDNS_SERVER_ADDR2               47
-#define configDNS_SERVER_ADDR3               193
-
-/* Default netmask configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configNET_MASK0                      255
-#define configNET_MASK1                      255
-#define configNET_MASK2                      255
-#define configNET_MASK3                      0
-
-/* The UDP port to which print messages are sent. */
-#define configPRINT_PORT                     ( 15000 )
-
-#define configPROFILING                      ( 0 )
-
-/* Pseudo random number generater used by some demo tasks. */
-uint32_t ulRand(void);
-#define configRAND32()    ulRand()
-
-/* The platform FreeRTOS is running on. */
-#define configPLATFORM_NAME    "RenesasRX65N"
-
-/* Header required for the tracealyzer recorder library. */
-//#include "trcRecorder.h"
-
-/* When the FIT configurator or the Smart Configurator is used, platform.h has to be used. */
-#define configINCLUDE_PLATFORM_H_INSTEAD_OF_IODEFINE_H  1
-
-#endif /* FREERTOS_CONFIG_H */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/FreeRTOSIPConfig.h b/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/FreeRTOSIPConfig.h
deleted file mode 100644
index 413f8d38..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/FreeRTOSIPConfig.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * FreeRTOS+TCP V3.1.0
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * http://aws.amazon.com/freertos
- * http://www.FreeRTOS.org
- */
-
-
-/*****************************************************************************
-*
-* See the following URL for configuration information.
-* http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_IP_Configuration.html
-*
-*****************************************************************************/
-#include "r_ether_rx_config.h"
-
-#ifndef FREERTOS_IP_CONFIG_H
-#define FREERTOS_IP_CONFIG_H
-
-/* Define the byte order of the target MCU (the MCU FreeRTOS+TCP is executing
- * on).  Valid options are pdFREERTOS_BIG_ENDIAN and pdFREERTOS_LITTLE_ENDIAN. */
-#define ipconfigBYTE_ORDER                         pdFREERTOS_LITTLE_ENDIAN
-
-/*
- * FreeRTOS debug logging routines.
- * The macro will be called with a printf() format as a parameter.  Users
- * can define their own logging routine as:
- *
- * The FreeRTOS_debug_printf() must be thread-safe but does not have to be
- * interrupt-safe.
- */
-#define FreeRTOS_debug_printf( MSG )    configPRINTF( MSG )
-#define ipconfigHAS_PRINTF    1
-#define FreeRTOS_printf( MSG )    configPRINTF( MSG )
-
-/* 'ipconfigUSE_NETWORK_EVENT_HOOK' indicates if an application hook is available
- * called 'vApplicationIPNetworkEventHook()'.  This function will be called when
- * the network goes up and when it goes down.  See also FREERTOS_IP.h for further
- * explanation. */
-#define ipconfigUSE_NETWORK_EVENT_HOOK    1
-
-/* Define the number of entries in the ARP cache table. */
-#define ipconfigARP_CACHE_ENTRIES    6
-
-/* 'ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS' is an important macro: it
- * determines the number of network buffers that are available in the
- * entire application.
- * Note that the default of 45 may be pretty high for smaller
- * applications.
- * Also note that when the network interface uses zero-copy reception
- * ( ipconfigZERO_COPY_RX_DRIVER ), it will reserve a set of network
- * buffers permanently.
- * For zero-copy transmission, no network buffers are permanently
- * "reserved" for transmission.
- */
-#define ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS    ETHER_CFG_EMAC_TX_DESCRIPTORS
-
-/* Related to the macro 'ipconfigEVENT_QUEUE_LENGTH' here above:
- * when developing a new networking application, it can be helpful
- * to monitor the length of the message queue of the IP-task.
- * This code is only enabled when 'ipconfigCHECK_IP_QUEUE_SPACE'
- * is set to 1.  See also the function 'uxGetMinimumIPQueueSpace()'.
- */
-#define ipconfigCHECK_IP_QUEUE_SPACE    1
-
-/* Set ipconfigUSE_LLMNR to 1 to include LLMNR. */
-#define ipconfigUSE_LLMNR    0
-
-/* Set ipconfigUSE_NBNS to 1 to include NBNS. */
-#define ipconfigUSE_NBNS    0
-
-/* DHCP servers have a table with information about each clients.  One
- * of the fields in this table contains the host name of the DHCP clients.
- * When 'ipconfigDHCP_REGISTER_HOSTNAME' is defined as non-zero, the DHCP
- * driver will call 'pcApplicationHostnameHook()' to obtain the name of
- * the embedded device.
- */
-#define ipconfigDHCP_REGISTER_HOSTNAME    1
-
-/* The results of DNS lookup's can be stored in a cache table. */
-#define ipconfigUSE_DNS_CACHE    1
-
-/* When ipconfigDRIVER_INCLUDED_RX_IP_CHECKSUM is enabled,
- * the network interface is responsible for checking the checksums
- * of the incoming packets.
- * This can be either done in hardware, or by calling the checksum
- * functions.
- */
-#define ipconfigDRIVER_INCLUDED_RX_IP_CHECKSUM    1
-
-/* The macro 'ipconfigSOCKET_HAS_USER_WAKE_CALLBACK' allows to use a call-back
- * function that will be called at the moment one of the above events occurs.
- * Use the socket option 'FREERTOS_SO_WAKEUP_CALLBACK' to install a function
- * of the type 'void callback( Socket_t pxSocket )'.
- * Note that the call-back function runs in the IP-task, so very little things
- * can be done.  Better not to call any networking API, because that could
- * easily lead to a deadlock situation.
- */
-#define ipconfigSOCKET_HAS_USER_WAKE_CALLBACK    1
-
-/* TCP only: if the 'ipconfigTCP_KEEP_ALIVE' macro is defined as 1,
- * sockets in state "ESTABLISHED" can be protected using keep-alive packets.
- * These packets will be sent as soon as there hasn't been any activity
- * for a while.
- * The macro 'ipconfigTCP_KEEP_ALIVE_INTERVAL' determines the interval at
- * which keep-alive packets are sent.
- */
-#define ipconfigTCP_KEEP_ALIVE    1
-
-#endif /* FREERTOS_IP_CONFIG_H */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/core_http_config.h b/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/core_http_config.h
deleted file mode 100644
index 1a2c82e0..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/core_http_config.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * coreHTTP v3.0.0
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_HTTP_CONFIG_H_
-#define CORE_HTTP_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging config definition and header files inclusion are required in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for HTTP.
- * 3. Include the header file "logging_stack.h", if logging is enabled for HTTP.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the HTTP library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "HTTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_HTTP_CONFIG_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/core_mqtt_agent_config.h b/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/core_mqtt_agent_config.h
deleted file mode 100644
index 9cb54017..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/core_mqtt_agent_config.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * coreMQTT Agent v1.2.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_mqtt_agent_config.h
- * @brief This represents the default values for the configuration macros
- * for the MQTT-Agent library.
- */
-
-#ifndef CORE_MQTT_AGENT_CONFIG_H_
-#define CORE_MQTT_AGENT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT Agent.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT_Agent"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
- /**
- * @brief Maximum time MQTT agent waits in the queue for any pending MQTT
- * operations.
- *
- * The wait time is kept smallest possible to increase the responsiveness of
- * MQTT agent while processing  pending MQTT operations as well as receive
- * packets from network.
- */
-#define MQTT_AGENT_MAX_EVENT_QUEUE_WAIT_TIME    ( 50U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_AGENT_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/core_mqtt_config.h b/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/core_mqtt_config.h
deleted file mode 100644
index 6222626b..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/core_mqtt_config.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * coreMQTT v2.1.1
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_MQTT_CONFIG_H_
-#define CORE_MQTT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief The maximum duration between non-empty network reads while
-* receiving an MQTT packet via the #MQTT_ProcessLoop or #MQTT_ReceiveLoop
-* API functions.
-*
-* When an incoming MQTT packet is detected, the transport receive function
-* may be called multiple times until all of the expected number of bytes of the
-* packet are received. This timeout represents the maximum polling duration that
-* is allowed without any data reception from the network for the incoming packet.
-*
-* If the timeout expires, the #MQTT_ProcessLoop and #MQTT_ReceiveLoop functions
-* return #MQTTRecvFailed.
-*
-* @note If a dummy implementation of the #MQTTGetCurrentTimeFunc_t timer function,
-* is supplied to the library, then #MQTT_RECV_POLLING_TIMEOUT_MS MUST be set to 0.
-*
-* <b>Possible values:</b> Any positive 32 bit integer. Recommended to use a
-* small timeout value. <br>
-* <b>Default value:</b> `10`
-*
-*/
-#define MQTT_RECV_POLLING_TIMEOUT_MS    ( 1000U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/core_pkcs11_config.h b/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/core_pkcs11_config.h
deleted file mode 100644
index e18f347c..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/core_pkcs11_config.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * corePKCS11 v3.5.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_pkcs11_config.h
- * @brief List of configuration macros for the corePKCS11 library along with
- * their custom values.
- */
-
-#ifndef CORE_PKCS11_CONFIG_H_
-#define CORE_PKCS11_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for PKCS #11.
- * 3. Include the header file "logging_stack.h", if logging is enabled for PKCS #11.
- */
-#include "logging_levels.h"
-
-/* Logging configuration for the PKCS #11 library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "PKCS11"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_ERROR
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief Maximum number of sessions that can be stored
-* by the PKCS #11 module.
-*
-* @note The windows test port has an abnormally large value in order to have
-* enough sessions to successfully run all the model based PKCS #11 tests.
-*
-* <b>Possible values:</b> Any positive integer.<br>
-* <b>Default value:</b> 10
-*/
-#define pkcs11configMAX_NUM_OBJECTS    8
-
-/**
-* @brief Set to 1 if a PAL destroy object is implemented.
-*
-* If set to 0, no PAL destroy object is implemented, and this functionality
-* is implemented in the common PKCS #11 layer.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configPAL_DESTROY_SUPPORTED    1
-
-/**
-* @brief Set to 1 if OTA image verification via PKCS #11 module is supported.
-*
-* If set to 0, OTA code signing certificate is built in via
-* aws_ota_codesigner_certificate.h.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configOTA_SUPPORTED    1
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* CORE_PKCS11_CONFIG_H_ include guard. */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/core_sntp_config.h b/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/core_sntp_config.h
deleted file mode 100644
index a6303826..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/core_sntp_config.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * coreSNTP v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_sntp_config.h
- * @brief This file represents the custom values for the configuration macros
- * of the coreSNTP library.
- */
-
-#ifndef CORE_SNTP_CONFIG_H_
-#define CORE_SNTP_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for SNTP.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "SNTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef CORE_SNTP_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/defender_config.h b/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/defender_config.h
deleted file mode 100644
index d0b3d8e4..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/defender_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Defender Client v1.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file defender_config.h
- * @brief Custom config values for the AWS IoT Device Defender Client Library.
- */
-
-#ifndef DEFENDER_CONFIG_H_
-#define DEFENDER_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for Device Defender.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "Defender"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* DEFENDER_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/demo_config.h b/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/demo_config.h
deleted file mode 100644
index 1860e674..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/demo_config.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * FreeRTOS V202111.00
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * https://www.FreeRTOS.org
- * https://github.com/FreeRTOS
- *
- */
-
-#ifndef DEMO_CONFIG_H
-#define DEMO_CONFIG_H
-
-/* FreeRTOS include. */
-#include "FreeRTOS.h"
-#include "aws_clientcredential.h"
-#include "aws_clientcredential_keys.h"
-#include "iot_default_root_certificates.h"
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for DEMO.
- * 3. Include the header file "logging_stack.h", if logging is enabled for DEMO.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Demo. */
-#ifndef LIBRARY_LOG_NAME
-#define LIBRARY_LOG_NAME    "MQTTDemo"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-#define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "iot_logging_task.h"
-
-
-/* Select a combination of demos to run
- * These demo has not been evaluated outside of the combination of demos listed below.
- *
- *          PUBSUB demo only :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB and OTA over MQTT demo :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (1)
- *          PUBSUB and OTA over MQTT demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (1)
- */
-/* demo is configured for PUBSUB */
-/* Select demo combination to run. */
-
-/* Please select a provisioning method
- * (0) : Pre-provisioning
- * (1) : Fleet provisioning
- */
-#define ENABLE_FLEET_PROVISIONING_DEMO      (1)
-
-/* Please select whether to enable or disable the OTA demo
- * (0) : OTA demo is disabled
- * (1) : OTA over MQTT demo is enabled
- */
-#define ENABLE_OTA_UPDATE_DEMO              (1)
-
-#define democonfigROOT_CA_PEM               tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief Path of the file containing the provisioning claim certificate. This
- * certificate is used to connect to AWS IoT Core and use Fleet Provisioning
- * APIs to provision the client device. This is used for the "Provisioning by
- * Claim" provisioning workflow.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This certificate should be PEM-encoded. The certificate should be
- * registered on AWS IoT Core beforehand. It should have an AWS IoT policy to
- * allow it to access only the Fleet Provisioning APIs. An example policy for
- * the claim certificates for this demo is available in the
- * example_claim_policy.json file in the demo directory. In the example,
- * replace <aws-region> with your AWS region, <aws-account-id> with your
- * account ID, and <template-name> with the name of your provisioning template.
- *
- */
-#define democonfigCLAIM_CERT_PEM            "...insert here..."
-
-/**
- * @brief Path of the file containing the provisioning claim private key. This
- * key corresponds to the provisioning claim certificate and is used to
- * authenticate with AWS IoT for provisioning by claim.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This private key should be PEM-encoded.
- *
- */
-#define democonfigCLAIM_PRIVATE_KEY_PEM     "...insert here..."
-
-/**
- * @brief An option to disable Server Name Indication.
- *
- * @note When using a local Mosquitto server setup, SNI needs to be disabled
- * for an MQTT broker that only has an IP address but no hostname. However,
- * SNI should be enabled whenever possible.
- */
-#define democonfigDISABLE_SNI                ( pdFALSE )
-
-/**
- * @brief Configuration that indicates if the demo connection is made to the AWS IoT Core MQTT broker.
- *
- * If username/password based authentication is used, the demo will use appropriate TLS ALPN and
- * SNI configurations as required for the Custom Authentication feature of AWS IoT.
- * For more information, refer to the following documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/custom-auth.html#custom-auth-mqtt
- *
- * #define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
- */
-#define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
-
-/**
- * @brief The unique ID used by the demo to differentiate instances.
- *
- *!!! Please note a #defined constant is used for convenience of demonstration
- *!!! only.  Production devices can use something unique to the device that can
- *!!! be read by software, such as a production serial number, instead of a
- *!!! hard coded constant.
- */
-#define democonfigFP_DEMO_ID    "FPDemoID"
-
-/**
- * @brief The MQTT client identifier used in this example.  Each client identifier
- * must be unique so edit as required to ensure no two clients connecting to the
- * same broker use the same client identifier.
- *
- * @note Appending __TIME__ to the client id string will reduce the possibility of a
- * client id collision in the broker. Note that the appended time is the compilation
- * time. This client id can cause collision, if more than one instance of the same
- * binary is used at the same time to connect to the broker.
- */
-#ifndef democonfigCLIENT_IDENTIFIER
-#if (ENABLE_FLEET_PROVISIONING_DEMO == 1)
-    #define democonfigCLIENT_IDENTIFIER    "client"democonfigFP_DEMO_ID
-#else
-    #define democonfigCLIENT_IDENTIFIER    clientcredentialIOT_THING_NAME
-#endif
-#endif
-
-/**
- * @brief Details of the MQTT broker to connect to.
- *
- * This is the Claim's Rest API Endpoint for AWS IoT.
- *
- * @note Your AWS IoT Core endpoint can be found in the AWS IoT console under
- * Settings/Custom Endpoint, or using the describe-endpoint API.
- *
- */
-#define democonfigMQTT_BROKER_ENDPOINT     clientcredentialMQTT_BROKER_ENDPOINT
-
-/**
- * @brief AWS IoT MQTT broker port number.
- *
- * In general, port 8883 is for secured MQTT connections.
- *
- * @note Port 443 requires use of the ALPN TLS extension with the ALPN protocol
- * name. When using port 8883, ALPN is not required.
- */
-#define democonfigMQTT_BROKER_PORT    ( clientcredentialMQTT_BROKER_PORT )
-
-/**
- * @brief Name of the provisioning template to use for the RegisterThing
- * portion of the Fleet Provisioning workflow.
- *
- * For information about provisioning templates, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-template.html#fleet-provision-template
- *
- * The example template used for this demo is available in the
- * example_demo_template.json file in the DemoSetup directory. In the example,
- * replace <provisioned-thing-policy> with the policy provisioned devices
- * should have.  The demo template uses Fn::Join to construct the Thing name by
- * concatenating fp_demo_ and the serial number sent by the demo.
- *
- * @note The provisioning template MUST be created in AWS IoT before running the
- * demo.
- *
- * @note If you followed the manual setup steps on https://freertos.org/iot-fleet-provisioning/demo.html,
- * the provisioning template name is "FleetProvisioningDemoTemplate".
- * However, if you used CloudFormation to set up the demo, the template name is "CF_FleetProvisioningDemoTemplate"
- */
- #define democonfigPROVISIONING_TEMPLATE_NAME    "...insert here..."
-
-/**
- * @brief Subject name to use when creating the certificate signing request (CSR)
- * for provisioning the demo client with using the Fleet Provisioning
- * CreateCertificateFromCsr APIs.
- *
- * This is passed to MbedTLS; see https://tls.mbed.org/api/x509__csr_8h.html#a954eae166b125cea2115b7db8c896e90
- */
-#ifndef democonfigCSR_SUBJECT_NAME
-    #define democonfigCSR_SUBJECT_NAME    "CN="democonfigFP_DEMO_ID
-#endif
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_STACKSIZE        configMINIMAL_STACK_SIZE * 3
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_TASK_PRIORITY    ( tskIDLE_PRIORITY + 1 )
-
-#define democonfigNETWORK_BUFFER_SIZE    ( configMINIMAL_STACK_SIZE * 3 )
-
-#include "core_mqtt.h" /* Include coreMQTT header for MQTT_LIBRARY_VERSION macro. */
-#define democonfigMQTT_LIB    "core-mqtt@"MQTT_LIBRARY_VERSION
-
-#define democonfigDISABLE_SNI       ( pdFALSE )
-
-/**
- * @brief ALPN (Application-Layer Protocol Negotiation) protocol name for AWS IoT MQTT.
- *
- * This will be used if democonfigMQTT_BROKER_PORT is configured as 443 for the AWS IoT MQTT broker.
- * Please see more details about the ALPN protocol for AWS IoT MQTT endpoint
- * in the link below.
- * https://aws.amazon.com/blogs/iot/mqtt-with-tls-client-authentication-on-port-443-why-it-is-useful-and-how-it-works/
- */
-#define AWS_IOT_MQTT_ALPN           "\x0ex-amzn-mqtt-ca"
-
-/**
- * @brief This is the ALPN (Application-Layer Protocol Negotiation) string
- * required by AWS IoT for password-based authentication using TCP port 443.
- */
-#define AWS_IOT_CUSTOM_AUTH_ALPN    "\x04mqtt"
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-/**
- * @brief The name of the operating system that the application is running on.
- * The current value is given as an example. Please update for your specific
- * operating system.
- */
-#define democonfigOS_NAME       "FreeRTOS"
-
-/**
- * @brief The version of the operating system that the application is running
- * on. The current value is given as an example. Please update for your specific
- * operating system version.
- */
-#define democonfigOS_VERSION    "V10.4.3"
-
-/**
- * @brief The name of the hardware platform the application is running on. The
- * current value is given as an example. Please update for your specific
- * hardware platform.
- */
-#define democonfigHARDWARE_PLATFORM_NAME    "CK-RX65N"
-
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING                                 \
-    "?SDK=" democonfigOS_NAME "&Version=" democonfigOS_VERSION \
-    "&MQTTLib=" democonfigMQTT_LIB
-
-/**
- * @brief The length of the MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING_LENGTH    ( ( uint16_t ) ( sizeof( AWS_IOT_METRICS_STRING ) - 1 ) )
-
-
-#ifdef democonfigCLIENT_USERNAME
-
-/**
- * @brief Append the username with the metrics string if #democonfigCLIENT_USERNAME is defined.
- *
- * This is to support both metrics reporting and username/password based client
- * authentication by AWS IoT.
- */
-#define CLIENT_USERNAME_WITH_METRICS    democonfigCLIENT_USERNAME AWS_IOT_METRICS_STRING
-#endif
-
-/**
- * @brief Flag to enable or disable provisioning mode for the demo.
- * Enabling the flags starts a CLI task, so that user can perform provisioning of the device through
- * a serial terminal. Provisioning involves running commands to fetch or set the PKI and configuration
- * information for the device to connect to broker and perform OTA updates. Disabling the flag results
- * in disabling the CLI task and execution of the demo tasks in normal device operation mode.
- */
-#define appmainPROVISIONING_MODE                  ( 1 )
-
-/**
- * @brief Certificate used for validating code signing signatures in the OTA PAL.
- */
-#ifndef otapalconfigCODE_SIGNING_CERTIFICATE
-    #define otapalconfigCODE_SIGNING_CERTIFICATE    "Insert code signing certificate..."
-#endif
-
-/**
- * @brief Major version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MAJOR
-    #define APP_VERSION_MAJOR    0
-#endif
-
-/**
- * @brief Minor version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MINOR
-    #define APP_VERSION_MINOR    9
-#endif
-
-/**
- * @brief Build version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_BUILD
-    #define APP_VERSION_BUILD    2
-#endif
-
-/**
- * @brief Server's root CA certificate.
- *
- * This certificate is used to identify the AWS IoT server and is publicly
- * available. Refer to the AWS documentation available in the link below for
- * information about the Server Root CAs.
- * https://docs.aws.amazon.com/iot/latest/developerguide/server-authentication.html#server-authentication-certs
- *
- * @note The TI C3220 Launchpad board requires that the Root CA have its
- * certificate self-signed. As mentioned in the above link, the Amazon Root CAs
- * are cross-signed by the Starfield Root CA. Thus, ONLY the Starfield Root CA
- * can be used to connect to the ATS endpoints on AWS IoT for the TI board.
- *
- * @note This certificate should be PEM-encoded.
- *
- * Must include the PEM header and footer:
- * "-----BEGIN CERTIFICATE-----\n"\
- * "...base64 data...\n"\
- * "-----END CERTIFICATE-----\n"
- *
- */
-#define democonfigROOT_CA_PEM                   tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief The length of the queue used to hold commands for the agent.
- */
-#define MQTT_AGENT_COMMAND_QUEUE_LENGTH         ( 25 )
-
-/**
- * @brief Dimensions the buffer used to serialise and deserialise MQTT packets.
- * @note Specified in bytes.  Must be large enough to hold the maximum
- * anticipated MQTT payload.
- */
-#define MQTT_AGENT_NETWORK_BUFFER_SIZE          ( 5000 )
-
-#define MQTT_COMMAND_CONTEXTS_POOL_SIZE              ( 10 )
-
-#endif /* DEMO_CONFIG_H */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/fleet_provisioning_config.h b/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/fleet_provisioning_config.h
deleted file mode 100644
index 68b85d66..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/fleet_provisioning_config.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * AWS IoT Fleet Provisioning v1.1.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file fleet_provisioning_config.h
- * @brief Custom config values for the AWS IoT Fleet Provisioning Library.
- */
-
-#ifndef FLEET_PROVISIONING_CONFIG_H_
-#define FLEET_PROVISIONING_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for Fleet Provisioning.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Fleet Provisioning library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "FleetProvisioning"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-/************ End of logging configuration ****************/
-
-#endif /* ifndef FLEET_PROVISIONING_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/ota_config.h b/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/ota_config.h
deleted file mode 100644
index 49389beb..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/ota_config.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * AWS IoT Over-the-air Update v3.4.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file ota_config.h
- * @brief This represents the custom values for the configuration macros
- * for the OTA library.
- */
-
-#ifndef OTA_CONFIG_H
-#define OTA_CONFIG_H
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for OTA.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "OTA"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-/**
- * @brief Log base 2 of the size of the file data block message (excluding the header).
- *
- * 10 bits yields a data block size of 1KB.
- */
-#define otaconfigLOG2_FILE_BLOCK_SIZE           12UL
-
-/**
- * @brief Size of the file data block message (excluding the header).
- *
- */
-#define otaconfigFILE_BLOCK_SIZE                ( 1UL << otaconfigLOG2_FILE_BLOCK_SIZE )
-
-/**
- * @brief Milliseconds to wait for the self test phase to succeed before we force reset.
- */
-#define otaconfigSELF_TEST_RESPONSE_WAIT_MS     16000U
-
-/**
- * @brief Milliseconds to wait before requesting data blocks from the OTA service if nothing is happening.
- *
- * The wait timer is reset whenever a data block is received from the OTA service so we will only send
- * the request message after being idle for this amount of time.
- */
-#define otaconfigFILE_REQUEST_WAIT_MS           360000U
-
-/**
- * @brief The maximum allowed length of the thing name used by the OTA agent.
- *
- * AWS IoT requires Thing names to be unique for each device that connects to the broker.
- * Likewise, the OTA agent requires the developer to construct and pass in the Thing name when
- * initializing the OTA agent. The agent uses this size to allocate static storage for the
- * Thing name used in all OTA base topics. Namely $aws/things/<thingName>
- */
-#define otaconfigMAX_THINGNAME_LEN              128U
-
-/**
- * @brief The maximum number of data blocks requested from OTA streaming service.
- *
- *  This configuration parameter is sent with data requests and represents the maximum number of
- *  data blocks the service will send in response. The maximum limit for this must be calculated
- *  from the maximum data response limit (128 KB from service) divided by the block size.
- *  For example if block size is set as 1 KB then the maximum number of data blocks that we can
- *  request is 128/1 = 128 blocks. Configure this parameter to this maximum limit or lower based on
- *  how many data blocks response is expected for each data requests.
- *  Please note that this must be set larger than zero.
- *
- */
-#define otaconfigMAX_NUM_BLOCKS_REQUEST         1U
-#if otaconfigMAX_NUM_BLOCKS_REQUEST > 1U
-#error "otaconfigMAX_NUM_BLOCKS_REQUEST > 1U is not supported in this release "
-#endif
-
-/**
- * @brief The maximum number of requests allowed to send without a response before we abort.
- *
- * This configuration parameter sets the maximum number of times the requests are made over
- * the selected communication channel before aborting and returning error.
- *
- */
-#define otaconfigMAX_NUM_REQUEST_MOMENTUM       1U
-
-/**
- * @brief The number of data buffers reserved by the OTA agent.
- *
- * This configurations parameter sets the maximum number of static data buffers used by
- * the OTA agent for job and file data blocks received.
- */
-#define otaconfigMAX_NUM_OTA_DATA_BUFFERS       otaconfigMAX_NUM_BLOCKS_REQUEST + 2U
-
-/**
- * @brief How frequently the device will report its OTA progress to the cloud.
- *
- * Device will update the job status with the number of blocks it has received every certain
- * number of blocks it receives. For example, 25 means device will update job status every 25 blocks
- * it receives.
- */
-#define otaconfigOTA_UPDATE_STATUS_FREQUENCY    25U
-
-/**
- * @brief Allow update to same or lower version.
- *
- * Set this to 1 to allow downgrade or same version update.This configurations parameter
- * disables version check and allows update to a same or lower version.This is provided for
- * testing purpose and it is recommended to always update to higher version and keep this
- * configuration disabled.
- */
-#define otaconfigAllowDowngrade           0U
-
-/**
- * @brief The protocol selected for OTA control operations.
- *
- * This configurations parameter sets the default protocol for all the OTA control
- * operations like requesting OTA job, updating the job status etc.
- *
- * Note - Only MQTT is supported at this time for control operations.
- */
-#define configENABLED_CONTROL_PROTOCOL    ( OTA_CONTROL_OVER_MQTT )
-
-/**
- * @brief The protocol selected for OTA data operations.
- *
- * This configurations parameter sets the protocols selected for the data operations
- * like requesting file blocks from the service.
- *
- * Note - Both MQTT and HTTP is supported for data transfer from service. This configuration parameter
- * can be set to following -
- * Enable data over MQTT - ( OTA_DATA_OVER_MQTT )
- * Enable data over HTTP - ( OTA_DATA_OVER_HTTP)
- *
- * Note - Please check the OTA over HTTP demo which has the HTTP data transfer functionality and
- * and this configuration is set to OTA_DATA_OVER_HTTP.
- */
-#define configENABLED_DATA_PROTOCOLS      ( OTA_DATA_OVER_MQTT )
-
-/**
- * @brief The preferred protocol selected for OTA data operations.
- *
- * Primary data protocol will be the protocol used for downloading file if more than
- * one protocol is selected while creating OTA job. Default primary data protocol is MQTT
- * and following update here to switch to HTTP as primary.
- *
- * Note - use OTA_DATA_OVER_HTTP for HTTP as primary data protocol.
- */
-
-#define configOTA_PRIMARY_DATA_PROTOCOL    ( OTA_DATA_OVER_MQTT )
-
-
-#endif /* ifndef OTA_CONFIG_H */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/rm_littlefs_flash_config.h b/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/rm_littlefs_flash_config.h
deleted file mode 100644
index 94207ffa..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/rm_littlefs_flash_config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/***********************************************************************************************************************
- * Copyright 2023 Renesas Electronics Corporation and/or its affiliates.  All Rights Reserved.
- *
- * This software and documentation are supplied by Renesas Electronics America Inc. and may only be used with products
- * of Renesas Electronics Corp. and its affiliates ("Renesas").  No other uses are authorized.  Renesas products are
- * sold pursuant to Renesas terms and conditions of sale.  Purchasers are solely responsible for the selection and use
- * of Renesas products and Renesas assumes no liability.  No license, express or implied, to any intellectual property
- * right is granted by Renesas. This software is protected under all applicable laws, including copyright laws. Renesas
- * reserves the right to change or discontinue this software and/or this documentation. THE SOFTWARE AND DOCUMENTATION
- * IS DELIVERED TO YOU "AS IS," AND RENESAS MAKES NO REPRESENTATIONS OR WARRANTIES, AND TO THE FULLEST EXTENT
- * PERMISSIBLE UNDER APPLICABLE LAW, DISCLAIMS ALL WARRANTIES, WHETHER EXPLICITLY OR IMPLICITLY, INCLUDING WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT, WITH RESPECT TO THE SOFTWARE OR
- * DOCUMENTATION.  RENESAS SHALL HAVE NO LIABILITY ARISING OUT OF ANY SECURITY VULNERABILITY OR BREACH.  TO THE MAXIMUM
- * EXTENT PERMITTED BY LAW, IN NO EVENT WILL RENESAS BE LIABLE TO YOU IN CONNECTION WITH THE SOFTWARE OR DOCUMENTATION
- * (OR ANY PERSON OR ENTITY CLAIMING RIGHTS DERIVED FROM YOU) FOR ANY LOSS, DAMAGES, OR CLAIMS WHATSOEVER, INCLUDING,
- * WITHOUT LIMITATION, ANY DIRECT, CONSEQUENTIAL, SPECIAL, INDIRECT, PUNITIVE, OR INCIDENTAL DAMAGES; ANY LOST PROFITS,
- * OTHER ECONOMIC DAMAGE, PROPERTY DAMAGE, OR PERSONAL INJURY; AND EVEN IF RENESAS HAS BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH LOSS, DAMAGES, CLAIMS OR COSTS.
- **********************************************************************************************************************/
-
-#ifndef FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-#define FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-
-/***********************************************************************************************************************
- * Includes
- **********************************************************************************************************************/
-#include "rm_littlefs_df_rx65n.h"
-
-#define LFS_FLASH_READ_SIZE				(1)
-#define LFS_FLASH_PROGRAM_SIZE			(4)
-#define LFS_FLASH_BLOCK_SIZE			(128)
-#define LFS_FLASH_BLOCK_COUNT			(70)
-#define RM_LITTLEFS_FLASH_DATA_START	FLASH_DF_BLOCK_0_MACRO
-
-#if LFS_FLASH_BLOCK_SIZE*LFS_FLASH_BLOCK_COUNT + (RM_LITTLEFS_FLASH_DATA_START - FLASH_DF_BLOCK_0_MACRO) > BSP_DATA_FLASH_SIZE_BYTES
-#error "Too many blocks"
-#endif
-
-#endif /* FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/shadow_config.h b/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/shadow_config.h
deleted file mode 100644
index aa948c12..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/shadow_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Shadow v1.3.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file shadow_config.h
- * @brief This represents the custom values for the configuration macros
- * for the Shadow library.
- */
-
-#ifndef SHADOW_CONFIG_H_
-#define SHADOW_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SHADOW"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef SHADOW_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/sigv4_config.h b/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/sigv4_config.h
deleted file mode 100644
index ba277a79..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/ether/src/frtos_config/sigv4_config.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * SigV4 Library v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file sigv4_config.h
- * @brief The custom values for configuration macros used by the SigV4 Library.
- */
-
-#ifndef SIGV4_CONFIG_H_
-#define SIGV4_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SIGV4"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef SIGV4_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/wifi/linker_section_sample.esi b/Configuration/samples/fleet_pso/ck-rx65n/wifi/linker_section_sample.esi
deleted file mode 100644
index 49300ec4..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/wifi/linker_section_sample.esi
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<com.renesas.linkersection.model:SectionContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:com.renesas.linkersection.model="http:///LinkerSection.ecore">
-  <sections name="SU">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4"/>
-  </sections>
-  <sections name="SI"/>
-  <sections name="R_1"/>
-  <sections name="B_2"/>
-  <sections name="R"/>
-  <sections name="RPFRAM2"/>
-  <sections name="C_LITTLEFS_MANAGEMENT_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1048576"/>
-  </sections>
-  <sections name="C_USER_APPLICATION_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1057536"/>
-  </sections>
-  <sections name="B">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="8388608"/>
-  </sections>
-  <sections name="B_1"/>
-  <sections name="R_2"/>
-  <sections name="PResetPRG">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4293919488"/>
-  </sections>
-  <sections name="C_1"/>
-  <sections name="C_2"/>
-  <sections name="C"/>
-  <sections name="C$*"/>
-  <sections name="D*"/>
-  <sections name="W*"/>
-  <sections name="L"/>
-  <sections name="P"/>
-  <sections name="PFRAM2"/>
-  <sections name="EXCEPTVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294901632"/>
-  </sections>
-  <sections name="RESETVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294901756"/>
-  </sections>
-</com.renesas.linkersection.model:SectionContainer>
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/FreeRTOSConfig.h b/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/FreeRTOSConfig.h
deleted file mode 100644
index 5662a8c2..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/FreeRTOSConfig.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * FreeRTOS Kernel V10.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * http://aws.amazon.com/freertos
- * http://www.FreeRTOS.org
- */
-
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
-
-
-/* Unity includes. */
-#if defined(FREERTOS_ENABLE_UNIT_TESTS)
-#include "unity_internals.h"
-#elif defined(ENABLE_UNIT_TESTS)
-#include "unity.h"
-#endif
-
-/*-----------------------------------------------------------
-* Application specific definitions.
-*
-* These definitions should be adjusted for your particular hardware and
-* application requirements.
-*
-* THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
-* FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
-* http://www.freertos.org/a00110.html
-*
-* The bottom of this file contains some constants specific to running the UDP
-* stack in this demo.  Constants specific to FreeRTOS+TCP itself (rather than
-* the demo) are contained in FreeRTOSIPConfig.h.
-*----------------------------------------------------------*/
-#define configENABLE_BACKWARD_COMPATIBILITY        1
-#define configUSE_PREEMPTION                       1
-#define configUSE_PORT_OPTIMISED_TASK_SELECTION    0
-#define configMAX_PRIORITIES                       (7)
-#define configTICK_RATE_HZ                         (( TickType_t ) 1000)
-#define configMINIMAL_STACK_SIZE                   (768)
-#define configTOTAL_HEAP_SIZE_N						(256)
-#define configTOTAL_HEAP_SIZE                      (( size_t ) ( configTOTAL_HEAP_SIZE_N * 1024 ))
-#define configMAX_TASK_NAME_LEN                    (12)
-#define configUSE_TRACE_FACILITY                   1
-#define configUSE_16_BIT_TICKS                     0
-#define configIDLE_SHOULD_YIELD                    1
-#define configUSE_CO_ROUTINES                      0
-#define configUSE_MUTEXES                          1
-#define configUSE_RECURSIVE_MUTEXES                1
-#define configQUEUE_REGISTRY_SIZE                  0
-#define configUSE_APPLICATION_TASK_TAG             0
-#define configUSE_COUNTING_SEMAPHORES              1
-#define configUSE_ALTERNATIVE_API                  0
-#define configNUM_THREAD_LOCAL_STORAGE_POINTERS    3      /* FreeRTOS+FAT requires 2 pointers if a CWD is supported. */
-#define configRECORD_STACK_HIGH_ADDRESS            1
-
-#define configUSE_DAEMON_TASK_STARTUP_HOOK 1
-
-#define configCPU_CLOCK_HZ				(BSP_ICLK_HZ)
-#define configPERIPHERAL_CLOCK_HZ		(BSP_PCLKB_HZ)
-#define configUSE_QUEUE_SETS			1
-
-/* Hook function related definitions. */
-#define configUSE_TICK_HOOK                        1
-#define configUSE_IDLE_HOOK                        1
-#define configUSE_MALLOC_FAILED_HOOK               1
-#define configCHECK_FOR_STACK_OVERFLOW             2      /* Not applicable to the Win32 port. */
-
-/* Software timer related definitions. */
-#define configUSE_TIMERS                           1
-#define configTIMER_TASK_PRIORITY                  (6)
-#define configTIMER_QUEUE_LENGTH                   5
-#define configTIMER_TASK_STACK_DEPTH               (configMINIMAL_STACK_SIZE)
-
-/* The interrupt priority used by the kernel itself for the tick interrupt and
-the pended interrupt.  This would normally be the lowest priority. */
-#define configKERNEL_INTERRUPT_PRIORITY         1
-
-/* The maximum interrupt priority from which FreeRTOS API calls can be made.
-Interrupts that use a priority above this will not be effected by anything the
-kernel is doing. */
-#define configMAX_SYSCALL_INTERRUPT_PRIORITY    4
-
-/* The peripheral used to generate the tick interrupt is configured as part of
-the application code.  This constant should be set to the vector number of the
-peripheral chosen.  As supplied this is CMT0. */
-#define configTICK_VECTOR						_CMT0_CMI0		//CMT0
-//#define configTICK_VECTOR						_CMT1_CMI1		//CMT1
-//#define configTICK_VECTOR						_CMT2_CMI2		//CMT2
-//#define configTICK_VECTOR						_CMT3_CMI3		//CMT3
-
-/* Event group related definitions. */
-#define configUSE_EVENT_GROUPS                     1
-
-/* Run time stats gathering definitions. */
-unsigned long ulGetRunTimeCounterValue( void );
-void vConfigureTimerForRunTimeStats( void );
-#define configGENERATE_RUN_TIME_STATS    0
-//#define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS()    vConfigureTimerForRunTimeStats()
-//#define portGET_RUN_TIME_COUNTER_VALUE()            ulGetRunTimeCounterValue()
-
-/* Co-routine definitions. */
-#define configUSE_CO_ROUTINES                   0
-#define configMAX_CO_ROUTINE_PRIORITIES         (2)
-
-/* Currently the TCP/IP stack is using dynamic allocation, and the MQTT task is
- * using static allocation. */
-#define configSUPPORT_DYNAMIC_ALLOCATION        1
-#define configSUPPORT_STATIC_ALLOCATION         1
-
-/* Set the following definitions to 1 to include the API function, or zero
- * to exclude the API function. */
-#define INCLUDE_vTaskPrioritySet                1
-#define INCLUDE_uxTaskPriorityGet               1
-#define INCLUDE_vTaskDelete                     1
-#define INCLUDE_vTaskCleanUpResources           0
-#define INCLUDE_vTaskSuspend                    1
-#define INCLUDE_vTaskDelayUntil                 1
-#define INCLUDE_vTaskDelay                      1
-#define INCLUDE_uxTaskGetStackHighWaterMark     1
-#define INCLUDE_xTaskGetSchedulerState          1
-#define INCLUDE_xTimerGetTimerTaskHandle        0
-#define INCLUDE_xTaskGetIdleTaskHandle          0
-#define INCLUDE_xQueueGetMutexHolder            1
-#define INCLUDE_eTaskGetState                   1
-#define INCLUDE_xEventGroupSetBitsFromISR       1
-#define INCLUDE_xTimerPendFunctionCall          1
-#define INCLUDE_xTaskGetCurrentTaskHandle       1
-#define INCLUDE_xTaskAbortDelay                 1
-
-/* This demo makes use of one or more example stats formatting functions.  These
- * format the raw data provided by the uxTaskGetSystemState() function in to human
- * readable ASCII form.  See the notes in the implementation of vTaskList() within
- * FreeRTOS/Source/tasks.c for limitations.  configUSE_STATS_FORMATTING_FUNCTIONS
- * is set to 2 so the formatting functions are included without the stdio.h being
- * included in tasks.c.  That is because this project defines its own sprintf()
- * functions. */
-#define configUSE_STATS_FORMATTING_FUNCTIONS    1
-
-#if defined(ENABLE_UNIT_TESTS) || defined(FREERTOS_ENABLE_UNIT_TESTS)
-/* unity testing */
-#define configASSERT( x ) do { if( ( x ) == 0 ) TEST_ABORT(); } while( 0 )
-#elif defined(CONFIG_FREERTOS_ASSERT_DISABLE) || defined(NDEBUG)
-/* Disable Assert call for release builds. */
-#define configASSERT( x ) ( ( void ) 0 )
-#else /* CONFIG_FREERTOS_ASSERT_FAIL_ABORT or nothing */
-/* Assert call defined for debug builds. */
-extern void vAssertCalled( void );
-#define configASSERT( x ) do { if( ( x ) == 0 ) vAssertCalled(); } while( 0 )
-#endif
-
-/* The function that implements FreeRTOS printf style output, and the macro
- * that maps the configPRINTF() macros to that function. */
-extern void vLoggingPrintf( const char * pcFormat, ... );
-#define configPRINTF( X )    vLoggingPrintf X
-
-/* Non-format version thread-safe print */
-extern void vLoggingPrint( const char * pcMessage );
-#define configPRINT( X )     vLoggingPrint( X )
-
-extern void vOutputString( const char * pcMessage );
-/* Map the logging task's printf to the board specific output function. */
-#define configPRINT_STRING( x )    vOutputString(x)
-
-/* Sets the length of the buffers into which logging messages are written - so
- * also defines the maximum length of each log message. */
-#define configLOGGING_MAX_MESSAGE_LENGTH            192
-
-/* Set to 1 to prepend each log message with a message number, the task name,
- * and a time stamp. */
-#define configLOGGING_INCLUDE_TIME_AND_TASK_NAME    1
-
-/* Application specific definitions follow. **********************************/
-
-/* If configINCLUDE_DEMO_DEBUG_STATS is set to one, then a few basic IP trace
- * macros are defined to gather some UDP stack statistics that can then be viewed
- * through the CLI interface. */
-#define configINCLUDE_DEMO_DEBUG_STATS       1
-
-/* The size of the global output buffer that is available for use when there
- * are multiple command interpreters running at once (for example, one on a UART
- * and one on TCP/IP).  This is done to prevent an output buffer being defined by
- * each implementation - which would waste RAM.  In this case, there is only one
- * command interpreter running, and it has its own local output buffer, so the
- * global buffer is just set to be one byte long as it is not used and should not
- * take up unnecessary RAM. */
-#define configCOMMAND_INT_MAX_OUTPUT_SIZE    850
-
-/* Only used when running in the FreeRTOS Windows simulator.  Defines the
- * priority of the task used to simulate Ethernet interrupts. */
-#define configMAC_ISR_SIMULATOR_PRIORITY     ( configMAX_PRIORITIES - 1 )
-
-/* This demo creates a virtual network connection by accessing the raw Ethernet
- * or WiFi data to and from a real network connection.  Many computers have more
- * than one real network port, and configNETWORK_INTERFACE_TO_USE is used to tell
- * the demo which real port should be used to create the virtual port.  The ports
- * available are displayed on the console when the application is executed.  For
- * example, on my development laptop setting configNETWORK_INTERFACE_TO_USE to 4
- * results in the wired network being used, while setting
- * configNETWORK_INTERFACE_TO_USE to 2 results in the wireless network being
- * used. */
-#define configNETWORK_INTERFACE_TO_USE       2L
-
-/* The address of an echo server that will be used by the two demo echo client
- * tasks:
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_Echo_Clients.html,
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/UDP_Echo_Clients.html. */
-#define configECHO_SERVER_ADDR0              192
-#define configECHO_SERVER_ADDR1              168
-#define configECHO_SERVER_ADDR2              1
-#define configECHO_SERVER_ADDR3              200
-#define configTCP_ECHO_CLIENT_PORT           9999
-
-/* Default MAC address configuration.  The demo creates a virtual network
- * connection that uses this MAC address by accessing the raw Ethernet/WiFi data
- * to and from a real network connection on the host PC.  See the
- * configNETWORK_INTERFACE_TO_USE definition above for information on how to
- * configure the real network connection to use. */
-#define configMAC_ADDR0                      0x74
-#define configMAC_ADDR1                      0x90
-#define configMAC_ADDR2                      0x50
-#define configMAC_ADDR3                      0x00
-#define configMAC_ADDR4                      0x79
-#define configMAC_ADDR5                      0x03
-
-/* Default IP address configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configIP_ADDR0                       192
-#define configIP_ADDR1                       168
-#define configIP_ADDR2                       11
-#define configIP_ADDR3                       12
-
-/* Default gateway IP address configuration.  Used in ipconfigUSE_DHCP is set to
- * 0, or ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configGATEWAY_ADDR0                  172
-#define configGATEWAY_ADDR1                  27
-#define configGATEWAY_ADDR2                  49
-#define configGATEWAY_ADDR3                  1
-
-/* Default DNS server configuration.  OpenDNS addresses are 208.67.222.222 and
- * 208.67.220.220.  Used in ipconfigUSE_DHCP is set to 0, or ipconfigUSE_DHCP is
- * set to 1 but a DNS server cannot be contacted.*/
-#define configDNS_SERVER_ADDR0               143
-#define configDNS_SERVER_ADDR1               103
-#define configDNS_SERVER_ADDR2               47
-#define configDNS_SERVER_ADDR3               193
-
-/* Default netmask configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configNET_MASK0                      255
-#define configNET_MASK1                      255
-#define configNET_MASK2                      255
-#define configNET_MASK3                      0
-
-/* The UDP port to which print messages are sent. */
-#define configPRINT_PORT                     ( 15000 )
-
-#define configPROFILING                      ( 0 )
-
-/* Pseudo random number generater used by some demo tasks. */
-uint32_t ulRand(void);
-#define configRAND32()    ulRand()
-
-/* The platform FreeRTOS is running on. */
-#define configPLATFORM_NAME    "RenesasRX65N"
-
-/* Header required for the tracealyzer recorder library. */
-//#include "trcRecorder.h"
-
-/* When the FIT configurator or the Smart Configurator is used, platform.h has to be used. */
-#define configINCLUDE_PLATFORM_H_INSTEAD_OF_IODEFINE_H  1
-
-#endif /* FREERTOS_CONFIG_H */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/core_http_config.h b/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/core_http_config.h
deleted file mode 100644
index 1a2c82e0..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/core_http_config.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * coreHTTP v3.0.0
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_HTTP_CONFIG_H_
-#define CORE_HTTP_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging config definition and header files inclusion are required in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for HTTP.
- * 3. Include the header file "logging_stack.h", if logging is enabled for HTTP.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the HTTP library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "HTTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_HTTP_CONFIG_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/core_mqtt_agent_config.h b/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/core_mqtt_agent_config.h
deleted file mode 100644
index 9cb54017..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/core_mqtt_agent_config.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * coreMQTT Agent v1.2.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_mqtt_agent_config.h
- * @brief This represents the default values for the configuration macros
- * for the MQTT-Agent library.
- */
-
-#ifndef CORE_MQTT_AGENT_CONFIG_H_
-#define CORE_MQTT_AGENT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT Agent.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT_Agent"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
- /**
- * @brief Maximum time MQTT agent waits in the queue for any pending MQTT
- * operations.
- *
- * The wait time is kept smallest possible to increase the responsiveness of
- * MQTT agent while processing  pending MQTT operations as well as receive
- * packets from network.
- */
-#define MQTT_AGENT_MAX_EVENT_QUEUE_WAIT_TIME    ( 50U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_AGENT_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/core_mqtt_config.h b/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/core_mqtt_config.h
deleted file mode 100644
index 6222626b..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/core_mqtt_config.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * coreMQTT v2.1.1
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_MQTT_CONFIG_H_
-#define CORE_MQTT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief The maximum duration between non-empty network reads while
-* receiving an MQTT packet via the #MQTT_ProcessLoop or #MQTT_ReceiveLoop
-* API functions.
-*
-* When an incoming MQTT packet is detected, the transport receive function
-* may be called multiple times until all of the expected number of bytes of the
-* packet are received. This timeout represents the maximum polling duration that
-* is allowed without any data reception from the network for the incoming packet.
-*
-* If the timeout expires, the #MQTT_ProcessLoop and #MQTT_ReceiveLoop functions
-* return #MQTTRecvFailed.
-*
-* @note If a dummy implementation of the #MQTTGetCurrentTimeFunc_t timer function,
-* is supplied to the library, then #MQTT_RECV_POLLING_TIMEOUT_MS MUST be set to 0.
-*
-* <b>Possible values:</b> Any positive 32 bit integer. Recommended to use a
-* small timeout value. <br>
-* <b>Default value:</b> `10`
-*
-*/
-#define MQTT_RECV_POLLING_TIMEOUT_MS    ( 1000U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/core_pkcs11_config.h b/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/core_pkcs11_config.h
deleted file mode 100644
index e18f347c..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/core_pkcs11_config.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * corePKCS11 v3.5.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_pkcs11_config.h
- * @brief List of configuration macros for the corePKCS11 library along with
- * their custom values.
- */
-
-#ifndef CORE_PKCS11_CONFIG_H_
-#define CORE_PKCS11_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for PKCS #11.
- * 3. Include the header file "logging_stack.h", if logging is enabled for PKCS #11.
- */
-#include "logging_levels.h"
-
-/* Logging configuration for the PKCS #11 library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "PKCS11"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_ERROR
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief Maximum number of sessions that can be stored
-* by the PKCS #11 module.
-*
-* @note The windows test port has an abnormally large value in order to have
-* enough sessions to successfully run all the model based PKCS #11 tests.
-*
-* <b>Possible values:</b> Any positive integer.<br>
-* <b>Default value:</b> 10
-*/
-#define pkcs11configMAX_NUM_OBJECTS    8
-
-/**
-* @brief Set to 1 if a PAL destroy object is implemented.
-*
-* If set to 0, no PAL destroy object is implemented, and this functionality
-* is implemented in the common PKCS #11 layer.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configPAL_DESTROY_SUPPORTED    1
-
-/**
-* @brief Set to 1 if OTA image verification via PKCS #11 module is supported.
-*
-* If set to 0, OTA code signing certificate is built in via
-* aws_ota_codesigner_certificate.h.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configOTA_SUPPORTED    1
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* CORE_PKCS11_CONFIG_H_ include guard. */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/core_sntp_config.h b/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/core_sntp_config.h
deleted file mode 100644
index a6303826..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/core_sntp_config.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * coreSNTP v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_sntp_config.h
- * @brief This file represents the custom values for the configuration macros
- * of the coreSNTP library.
- */
-
-#ifndef CORE_SNTP_CONFIG_H_
-#define CORE_SNTP_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for SNTP.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "SNTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef CORE_SNTP_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/defender_config.h b/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/defender_config.h
deleted file mode 100644
index d0b3d8e4..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/defender_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Defender Client v1.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file defender_config.h
- * @brief Custom config values for the AWS IoT Device Defender Client Library.
- */
-
-#ifndef DEFENDER_CONFIG_H_
-#define DEFENDER_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for Device Defender.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "Defender"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* DEFENDER_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/demo_config.h b/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/demo_config.h
deleted file mode 100644
index 1860e674..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/demo_config.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * FreeRTOS V202111.00
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * https://www.FreeRTOS.org
- * https://github.com/FreeRTOS
- *
- */
-
-#ifndef DEMO_CONFIG_H
-#define DEMO_CONFIG_H
-
-/* FreeRTOS include. */
-#include "FreeRTOS.h"
-#include "aws_clientcredential.h"
-#include "aws_clientcredential_keys.h"
-#include "iot_default_root_certificates.h"
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for DEMO.
- * 3. Include the header file "logging_stack.h", if logging is enabled for DEMO.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Demo. */
-#ifndef LIBRARY_LOG_NAME
-#define LIBRARY_LOG_NAME    "MQTTDemo"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-#define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "iot_logging_task.h"
-
-
-/* Select a combination of demos to run
- * These demo has not been evaluated outside of the combination of demos listed below.
- *
- *          PUBSUB demo only :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB and OTA over MQTT demo :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (1)
- *          PUBSUB and OTA over MQTT demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (1)
- */
-/* demo is configured for PUBSUB */
-/* Select demo combination to run. */
-
-/* Please select a provisioning method
- * (0) : Pre-provisioning
- * (1) : Fleet provisioning
- */
-#define ENABLE_FLEET_PROVISIONING_DEMO      (1)
-
-/* Please select whether to enable or disable the OTA demo
- * (0) : OTA demo is disabled
- * (1) : OTA over MQTT demo is enabled
- */
-#define ENABLE_OTA_UPDATE_DEMO              (1)
-
-#define democonfigROOT_CA_PEM               tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief Path of the file containing the provisioning claim certificate. This
- * certificate is used to connect to AWS IoT Core and use Fleet Provisioning
- * APIs to provision the client device. This is used for the "Provisioning by
- * Claim" provisioning workflow.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This certificate should be PEM-encoded. The certificate should be
- * registered on AWS IoT Core beforehand. It should have an AWS IoT policy to
- * allow it to access only the Fleet Provisioning APIs. An example policy for
- * the claim certificates for this demo is available in the
- * example_claim_policy.json file in the demo directory. In the example,
- * replace <aws-region> with your AWS region, <aws-account-id> with your
- * account ID, and <template-name> with the name of your provisioning template.
- *
- */
-#define democonfigCLAIM_CERT_PEM            "...insert here..."
-
-/**
- * @brief Path of the file containing the provisioning claim private key. This
- * key corresponds to the provisioning claim certificate and is used to
- * authenticate with AWS IoT for provisioning by claim.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This private key should be PEM-encoded.
- *
- */
-#define democonfigCLAIM_PRIVATE_KEY_PEM     "...insert here..."
-
-/**
- * @brief An option to disable Server Name Indication.
- *
- * @note When using a local Mosquitto server setup, SNI needs to be disabled
- * for an MQTT broker that only has an IP address but no hostname. However,
- * SNI should be enabled whenever possible.
- */
-#define democonfigDISABLE_SNI                ( pdFALSE )
-
-/**
- * @brief Configuration that indicates if the demo connection is made to the AWS IoT Core MQTT broker.
- *
- * If username/password based authentication is used, the demo will use appropriate TLS ALPN and
- * SNI configurations as required for the Custom Authentication feature of AWS IoT.
- * For more information, refer to the following documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/custom-auth.html#custom-auth-mqtt
- *
- * #define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
- */
-#define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
-
-/**
- * @brief The unique ID used by the demo to differentiate instances.
- *
- *!!! Please note a #defined constant is used for convenience of demonstration
- *!!! only.  Production devices can use something unique to the device that can
- *!!! be read by software, such as a production serial number, instead of a
- *!!! hard coded constant.
- */
-#define democonfigFP_DEMO_ID    "FPDemoID"
-
-/**
- * @brief The MQTT client identifier used in this example.  Each client identifier
- * must be unique so edit as required to ensure no two clients connecting to the
- * same broker use the same client identifier.
- *
- * @note Appending __TIME__ to the client id string will reduce the possibility of a
- * client id collision in the broker. Note that the appended time is the compilation
- * time. This client id can cause collision, if more than one instance of the same
- * binary is used at the same time to connect to the broker.
- */
-#ifndef democonfigCLIENT_IDENTIFIER
-#if (ENABLE_FLEET_PROVISIONING_DEMO == 1)
-    #define democonfigCLIENT_IDENTIFIER    "client"democonfigFP_DEMO_ID
-#else
-    #define democonfigCLIENT_IDENTIFIER    clientcredentialIOT_THING_NAME
-#endif
-#endif
-
-/**
- * @brief Details of the MQTT broker to connect to.
- *
- * This is the Claim's Rest API Endpoint for AWS IoT.
- *
- * @note Your AWS IoT Core endpoint can be found in the AWS IoT console under
- * Settings/Custom Endpoint, or using the describe-endpoint API.
- *
- */
-#define democonfigMQTT_BROKER_ENDPOINT     clientcredentialMQTT_BROKER_ENDPOINT
-
-/**
- * @brief AWS IoT MQTT broker port number.
- *
- * In general, port 8883 is for secured MQTT connections.
- *
- * @note Port 443 requires use of the ALPN TLS extension with the ALPN protocol
- * name. When using port 8883, ALPN is not required.
- */
-#define democonfigMQTT_BROKER_PORT    ( clientcredentialMQTT_BROKER_PORT )
-
-/**
- * @brief Name of the provisioning template to use for the RegisterThing
- * portion of the Fleet Provisioning workflow.
- *
- * For information about provisioning templates, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-template.html#fleet-provision-template
- *
- * The example template used for this demo is available in the
- * example_demo_template.json file in the DemoSetup directory. In the example,
- * replace <provisioned-thing-policy> with the policy provisioned devices
- * should have.  The demo template uses Fn::Join to construct the Thing name by
- * concatenating fp_demo_ and the serial number sent by the demo.
- *
- * @note The provisioning template MUST be created in AWS IoT before running the
- * demo.
- *
- * @note If you followed the manual setup steps on https://freertos.org/iot-fleet-provisioning/demo.html,
- * the provisioning template name is "FleetProvisioningDemoTemplate".
- * However, if you used CloudFormation to set up the demo, the template name is "CF_FleetProvisioningDemoTemplate"
- */
- #define democonfigPROVISIONING_TEMPLATE_NAME    "...insert here..."
-
-/**
- * @brief Subject name to use when creating the certificate signing request (CSR)
- * for provisioning the demo client with using the Fleet Provisioning
- * CreateCertificateFromCsr APIs.
- *
- * This is passed to MbedTLS; see https://tls.mbed.org/api/x509__csr_8h.html#a954eae166b125cea2115b7db8c896e90
- */
-#ifndef democonfigCSR_SUBJECT_NAME
-    #define democonfigCSR_SUBJECT_NAME    "CN="democonfigFP_DEMO_ID
-#endif
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_STACKSIZE        configMINIMAL_STACK_SIZE * 3
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_TASK_PRIORITY    ( tskIDLE_PRIORITY + 1 )
-
-#define democonfigNETWORK_BUFFER_SIZE    ( configMINIMAL_STACK_SIZE * 3 )
-
-#include "core_mqtt.h" /* Include coreMQTT header for MQTT_LIBRARY_VERSION macro. */
-#define democonfigMQTT_LIB    "core-mqtt@"MQTT_LIBRARY_VERSION
-
-#define democonfigDISABLE_SNI       ( pdFALSE )
-
-/**
- * @brief ALPN (Application-Layer Protocol Negotiation) protocol name for AWS IoT MQTT.
- *
- * This will be used if democonfigMQTT_BROKER_PORT is configured as 443 for the AWS IoT MQTT broker.
- * Please see more details about the ALPN protocol for AWS IoT MQTT endpoint
- * in the link below.
- * https://aws.amazon.com/blogs/iot/mqtt-with-tls-client-authentication-on-port-443-why-it-is-useful-and-how-it-works/
- */
-#define AWS_IOT_MQTT_ALPN           "\x0ex-amzn-mqtt-ca"
-
-/**
- * @brief This is the ALPN (Application-Layer Protocol Negotiation) string
- * required by AWS IoT for password-based authentication using TCP port 443.
- */
-#define AWS_IOT_CUSTOM_AUTH_ALPN    "\x04mqtt"
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-/**
- * @brief The name of the operating system that the application is running on.
- * The current value is given as an example. Please update for your specific
- * operating system.
- */
-#define democonfigOS_NAME       "FreeRTOS"
-
-/**
- * @brief The version of the operating system that the application is running
- * on. The current value is given as an example. Please update for your specific
- * operating system version.
- */
-#define democonfigOS_VERSION    "V10.4.3"
-
-/**
- * @brief The name of the hardware platform the application is running on. The
- * current value is given as an example. Please update for your specific
- * hardware platform.
- */
-#define democonfigHARDWARE_PLATFORM_NAME    "CK-RX65N"
-
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING                                 \
-    "?SDK=" democonfigOS_NAME "&Version=" democonfigOS_VERSION \
-    "&MQTTLib=" democonfigMQTT_LIB
-
-/**
- * @brief The length of the MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING_LENGTH    ( ( uint16_t ) ( sizeof( AWS_IOT_METRICS_STRING ) - 1 ) )
-
-
-#ifdef democonfigCLIENT_USERNAME
-
-/**
- * @brief Append the username with the metrics string if #democonfigCLIENT_USERNAME is defined.
- *
- * This is to support both metrics reporting and username/password based client
- * authentication by AWS IoT.
- */
-#define CLIENT_USERNAME_WITH_METRICS    democonfigCLIENT_USERNAME AWS_IOT_METRICS_STRING
-#endif
-
-/**
- * @brief Flag to enable or disable provisioning mode for the demo.
- * Enabling the flags starts a CLI task, so that user can perform provisioning of the device through
- * a serial terminal. Provisioning involves running commands to fetch or set the PKI and configuration
- * information for the device to connect to broker and perform OTA updates. Disabling the flag results
- * in disabling the CLI task and execution of the demo tasks in normal device operation mode.
- */
-#define appmainPROVISIONING_MODE                  ( 1 )
-
-/**
- * @brief Certificate used for validating code signing signatures in the OTA PAL.
- */
-#ifndef otapalconfigCODE_SIGNING_CERTIFICATE
-    #define otapalconfigCODE_SIGNING_CERTIFICATE    "Insert code signing certificate..."
-#endif
-
-/**
- * @brief Major version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MAJOR
-    #define APP_VERSION_MAJOR    0
-#endif
-
-/**
- * @brief Minor version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MINOR
-    #define APP_VERSION_MINOR    9
-#endif
-
-/**
- * @brief Build version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_BUILD
-    #define APP_VERSION_BUILD    2
-#endif
-
-/**
- * @brief Server's root CA certificate.
- *
- * This certificate is used to identify the AWS IoT server and is publicly
- * available. Refer to the AWS documentation available in the link below for
- * information about the Server Root CAs.
- * https://docs.aws.amazon.com/iot/latest/developerguide/server-authentication.html#server-authentication-certs
- *
- * @note The TI C3220 Launchpad board requires that the Root CA have its
- * certificate self-signed. As mentioned in the above link, the Amazon Root CAs
- * are cross-signed by the Starfield Root CA. Thus, ONLY the Starfield Root CA
- * can be used to connect to the ATS endpoints on AWS IoT for the TI board.
- *
- * @note This certificate should be PEM-encoded.
- *
- * Must include the PEM header and footer:
- * "-----BEGIN CERTIFICATE-----\n"\
- * "...base64 data...\n"\
- * "-----END CERTIFICATE-----\n"
- *
- */
-#define democonfigROOT_CA_PEM                   tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief The length of the queue used to hold commands for the agent.
- */
-#define MQTT_AGENT_COMMAND_QUEUE_LENGTH         ( 25 )
-
-/**
- * @brief Dimensions the buffer used to serialise and deserialise MQTT packets.
- * @note Specified in bytes.  Must be large enough to hold the maximum
- * anticipated MQTT payload.
- */
-#define MQTT_AGENT_NETWORK_BUFFER_SIZE          ( 5000 )
-
-#define MQTT_COMMAND_CONTEXTS_POOL_SIZE              ( 10 )
-
-#endif /* DEMO_CONFIG_H */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/fleet_provisioning_config.h b/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/fleet_provisioning_config.h
deleted file mode 100644
index 68b85d66..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/fleet_provisioning_config.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * AWS IoT Fleet Provisioning v1.1.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file fleet_provisioning_config.h
- * @brief Custom config values for the AWS IoT Fleet Provisioning Library.
- */
-
-#ifndef FLEET_PROVISIONING_CONFIG_H_
-#define FLEET_PROVISIONING_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for Fleet Provisioning.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Fleet Provisioning library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "FleetProvisioning"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-/************ End of logging configuration ****************/
-
-#endif /* ifndef FLEET_PROVISIONING_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/ota_config.h b/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/ota_config.h
deleted file mode 100644
index 38a3df57..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/ota_config.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * AWS IoT Over-the-air Update v3.4.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file ota_config.h
- * @brief This represents the custom values for the configuration macros
- * for the OTA library.
- */
-
-#ifndef OTA_CONFIG_H
-#define OTA_CONFIG_H
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for OTA.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "OTA"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-/**
- * @brief Log base 2 of the size of the file data block message (excluding the header).
- *
- * 10 bits yields a data block size of 1KB.
- */
-#define otaconfigLOG2_FILE_BLOCK_SIZE           12UL
-
-/**
- * @brief Size of the file data block message (excluding the header).
- *
- */
-#define otaconfigFILE_BLOCK_SIZE                ( 1UL << otaconfigLOG2_FILE_BLOCK_SIZE )
-
-/**
- * @brief Milliseconds to wait for the self test phase to succeed before we force reset.
- */
-#define otaconfigSELF_TEST_RESPONSE_WAIT_MS     16000U
-
-/**
- * @brief Milliseconds to wait before requesting data blocks from the OTA service if nothing is happening.
- *
- * The wait timer is reset whenever a data block is received from the OTA service so we will only send
- * the request message after being idle for this amount of time.
- */
-#define otaconfigFILE_REQUEST_WAIT_MS           360000U
-
-/**
- * @brief The maximum allowed length of the thing name used by the OTA agent.
- *
- * AWS IoT requires Thing names to be unique for each device that connects to the broker.
- * Likewise, the OTA agent requires the developer to construct and pass in the Thing name when
- * initializing the OTA agent. The agent uses this size to allocate static storage for the
- * Thing name used in all OTA base topics. Namely $aws/things/<thingName>
- */
-#define otaconfigMAX_THINGNAME_LEN              128U
-
-/**
- * @brief The maximum number of data blocks requested from OTA streaming service.
- *
- *  This configuration parameter is sent with data requests and represents the maximum number of
- *  data blocks the service will send in response. The maximum limit for this must be calculated
- *  from the maximum data response limit (128 KB from service) divided by the block size.
- *  For example if block size is set as 1 KB then the maximum number of data blocks that we can
- *  request is 128/1 = 128 blocks. Configure this parameter to this maximum limit or lower based on
- *  how many data blocks response is expected for each data requests.
- *  Please note that this must be set larger than zero.
- *
- */
-#define otaconfigMAX_NUM_BLOCKS_REQUEST         1U
-#if otaconfigMAX_NUM_BLOCKS_REQUEST > 1U
-#error "otaconfigMAX_NUM_BLOCKS_REQUEST > 1U is not supported in this release "
-#endif
-
-/**
- * @brief The maximum number of requests allowed to send without a response before we abort.
- *
- * This configuration parameter sets the maximum number of times the requests are made over
- * the selected communication channel before aborting and returning error.
- *
- */
-#define otaconfigMAX_NUM_REQUEST_MOMENTUM       1U
-
-/**
- * @brief The number of data buffers reserved by the OTA agent.
- *
- * This configurations parameter sets the maximum number of static data buffers used by
- * the OTA agent for job and file data blocks received.
- */
-#define otaconfigMAX_NUM_OTA_DATA_BUFFERS       otaconfigMAX_NUM_BLOCKS_REQUEST + 1U
-
-/**
- * @brief How frequently the device will report its OTA progress to the cloud.
- *
- * Device will update the job status with the number of blocks it has received every certain
- * number of blocks it receives. For example, 25 means device will update job status every 25 blocks
- * it receives.
- */
-#define otaconfigOTA_UPDATE_STATUS_FREQUENCY    25U
-
-/**
- * @brief Allow update to same or lower version.
- *
- * Set this to 1 to allow downgrade or same version update.This configurations parameter
- * disables version check and allows update to a same or lower version.This is provided for
- * testing purpose and it is recommended to always update to higher version and keep this
- * configuration disabled.
- */
-#define otaconfigAllowDowngrade           0U
-
-/**
- * @brief The protocol selected for OTA control operations.
- *
- * This configurations parameter sets the default protocol for all the OTA control
- * operations like requesting OTA job, updating the job status etc.
- *
- * Note - Only MQTT is supported at this time for control operations.
- */
-#define configENABLED_CONTROL_PROTOCOL    ( OTA_CONTROL_OVER_MQTT )
-
-/**
- * @brief The protocol selected for OTA data operations.
- *
- * This configurations parameter sets the protocols selected for the data operations
- * like requesting file blocks from the service.
- *
- * Note - Both MQTT and HTTP is supported for data transfer from service. This configuration parameter
- * can be set to following -
- * Enable data over MQTT - ( OTA_DATA_OVER_MQTT )
- * Enable data over HTTP - ( OTA_DATA_OVER_HTTP)
- *
- * Note - Please check the OTA over HTTP demo which has the HTTP data transfer functionality and
- * and this configuration is set to OTA_DATA_OVER_HTTP.
- */
-#define configENABLED_DATA_PROTOCOLS      ( OTA_DATA_OVER_MQTT )
-
-/**
- * @brief The preferred protocol selected for OTA data operations.
- *
- * Primary data protocol will be the protocol used for downloading file if more than
- * one protocol is selected while creating OTA job. Default primary data protocol is MQTT
- * and following update here to switch to HTTP as primary.
- *
- * Note - use OTA_DATA_OVER_HTTP for HTTP as primary data protocol.
- */
-
-#define configOTA_PRIMARY_DATA_PROTOCOL    ( OTA_DATA_OVER_MQTT )
-
-
-#endif /* ifndef OTA_CONFIG_H */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/rm_littlefs_flash_config.h b/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/rm_littlefs_flash_config.h
deleted file mode 100644
index 94207ffa..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/rm_littlefs_flash_config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/***********************************************************************************************************************
- * Copyright 2023 Renesas Electronics Corporation and/or its affiliates.  All Rights Reserved.
- *
- * This software and documentation are supplied by Renesas Electronics America Inc. and may only be used with products
- * of Renesas Electronics Corp. and its affiliates ("Renesas").  No other uses are authorized.  Renesas products are
- * sold pursuant to Renesas terms and conditions of sale.  Purchasers are solely responsible for the selection and use
- * of Renesas products and Renesas assumes no liability.  No license, express or implied, to any intellectual property
- * right is granted by Renesas. This software is protected under all applicable laws, including copyright laws. Renesas
- * reserves the right to change or discontinue this software and/or this documentation. THE SOFTWARE AND DOCUMENTATION
- * IS DELIVERED TO YOU "AS IS," AND RENESAS MAKES NO REPRESENTATIONS OR WARRANTIES, AND TO THE FULLEST EXTENT
- * PERMISSIBLE UNDER APPLICABLE LAW, DISCLAIMS ALL WARRANTIES, WHETHER EXPLICITLY OR IMPLICITLY, INCLUDING WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT, WITH RESPECT TO THE SOFTWARE OR
- * DOCUMENTATION.  RENESAS SHALL HAVE NO LIABILITY ARISING OUT OF ANY SECURITY VULNERABILITY OR BREACH.  TO THE MAXIMUM
- * EXTENT PERMITTED BY LAW, IN NO EVENT WILL RENESAS BE LIABLE TO YOU IN CONNECTION WITH THE SOFTWARE OR DOCUMENTATION
- * (OR ANY PERSON OR ENTITY CLAIMING RIGHTS DERIVED FROM YOU) FOR ANY LOSS, DAMAGES, OR CLAIMS WHATSOEVER, INCLUDING,
- * WITHOUT LIMITATION, ANY DIRECT, CONSEQUENTIAL, SPECIAL, INDIRECT, PUNITIVE, OR INCIDENTAL DAMAGES; ANY LOST PROFITS,
- * OTHER ECONOMIC DAMAGE, PROPERTY DAMAGE, OR PERSONAL INJURY; AND EVEN IF RENESAS HAS BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH LOSS, DAMAGES, CLAIMS OR COSTS.
- **********************************************************************************************************************/
-
-#ifndef FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-#define FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-
-/***********************************************************************************************************************
- * Includes
- **********************************************************************************************************************/
-#include "rm_littlefs_df_rx65n.h"
-
-#define LFS_FLASH_READ_SIZE				(1)
-#define LFS_FLASH_PROGRAM_SIZE			(4)
-#define LFS_FLASH_BLOCK_SIZE			(128)
-#define LFS_FLASH_BLOCK_COUNT			(70)
-#define RM_LITTLEFS_FLASH_DATA_START	FLASH_DF_BLOCK_0_MACRO
-
-#if LFS_FLASH_BLOCK_SIZE*LFS_FLASH_BLOCK_COUNT + (RM_LITTLEFS_FLASH_DATA_START - FLASH_DF_BLOCK_0_MACRO) > BSP_DATA_FLASH_SIZE_BYTES
-#error "Too many blocks"
-#endif
-
-#endif /* FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/shadow_config.h b/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/shadow_config.h
deleted file mode 100644
index aa948c12..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/shadow_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Shadow v1.3.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file shadow_config.h
- * @brief This represents the custom values for the configuration macros
- * for the Shadow library.
- */
-
-#ifndef SHADOW_CONFIG_H_
-#define SHADOW_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SHADOW"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef SHADOW_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/sigv4_config.h b/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/sigv4_config.h
deleted file mode 100644
index ba277a79..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/sigv4_config.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * SigV4 Library v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file sigv4_config.h
- * @brief The custom values for configuration macros used by the SigV4 Library.
- */
-
-#ifndef SIGV4_CONFIG_H_
-#define SIGV4_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SIGV4"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef SIGV4_CONFIG_H_ */
diff --git a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/user_tcp_hook_config.h b/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/user_tcp_hook_config.h
deleted file mode 100644
index abe7b80b..00000000
--- a/Configuration/samples/fleet_pso/ck-rx65n/wifi/src/frtos_config/user_tcp_hook_config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**********************************************************************************************************************
- * Copyright (C) 2023 Renesas Electronics Corporation. All rights reserved.
- *
- * DISCLAIMER
- * This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
- * other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
- * applicable laws, including copyright laws.
- * THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
- * THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
- * EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
- * SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS
- * SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
- * this software. By using this software, you agree to the additional terms and conditions found by accessing the
- * following link:
- * http://www.renesas.com/disclaimer
- *********************************************************************************************************************/
-
-#ifndef FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_
-#define FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_
-
-/* The limit of number for WIFI_ERR_MODULE_COM when it comes continuously.
- * If counter is over than this limit, hook the reset */
-#define USER_COMM_ERROR_TRIES		3
-
-/*Connection retry limit*/
-#define USER_RECONNECT_TRIES 		3
-
-/*Socket closing retry limit*/
-#define USER_CLOSE_SOCKET_TRIES		3
-
-/*Enable SocketErrorHook*/
-#define USER_TCP_HOOK_ENABLED   	1 /* Default */
-
-#endif /* FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/cellular/linker_section_sample.esi b/Configuration/samples/fleetps/ck-rx65n/cellular/linker_section_sample.esi
deleted file mode 100644
index 3371ded6..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/cellular/linker_section_sample.esi
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<com.renesas.linkersection.model:SectionContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:com.renesas.linkersection.model="http:///LinkerSection.ecore">
-  <sections name="SU">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4"/>
-  </sections>
-  <sections name="SI"/>
-  <sections name="R_1"/>
-  <sections name="B_2"/>
-  <sections name="R"/>
-  <sections name="RPFRAM2"/>
-  <sections name="C_LITTLEFS_MANAGEMENT_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1048576"/>
-  </sections>
-  <sections name="C_USER_APPLICATION_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1057536"/>
-  </sections>
-  <sections name="B">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="8388608"/>
-  </sections>
-  <sections name="B_1"/>
-  <sections name="R_2"/>
-  <sections name="PResetPRG">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4293919488"/>
-  </sections>
-  <sections name="C_1"/>
-  <sections name="C_2"/>
-  <sections name="C"/>
-  <sections name="C$*"/>
-  <sections name="D*"/>
-  <sections name="W*"/>
-  <sections name="L"/>
-  <sections name="P"/>
-  <sections name="PFRAM2"/>
-  <sections name="EXCEPTVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294967168"/>
-  </sections>
-  <sections name="RESETVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294967292"/>
-  </sections>
-</com.renesas.linkersection.model:SectionContainer>
diff --git a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/FreeRTOSConfig.h b/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/FreeRTOSConfig.h
deleted file mode 100644
index 5662a8c2..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/FreeRTOSConfig.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * FreeRTOS Kernel V10.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * http://aws.amazon.com/freertos
- * http://www.FreeRTOS.org
- */
-
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
-
-
-/* Unity includes. */
-#if defined(FREERTOS_ENABLE_UNIT_TESTS)
-#include "unity_internals.h"
-#elif defined(ENABLE_UNIT_TESTS)
-#include "unity.h"
-#endif
-
-/*-----------------------------------------------------------
-* Application specific definitions.
-*
-* These definitions should be adjusted for your particular hardware and
-* application requirements.
-*
-* THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
-* FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
-* http://www.freertos.org/a00110.html
-*
-* The bottom of this file contains some constants specific to running the UDP
-* stack in this demo.  Constants specific to FreeRTOS+TCP itself (rather than
-* the demo) are contained in FreeRTOSIPConfig.h.
-*----------------------------------------------------------*/
-#define configENABLE_BACKWARD_COMPATIBILITY        1
-#define configUSE_PREEMPTION                       1
-#define configUSE_PORT_OPTIMISED_TASK_SELECTION    0
-#define configMAX_PRIORITIES                       (7)
-#define configTICK_RATE_HZ                         (( TickType_t ) 1000)
-#define configMINIMAL_STACK_SIZE                   (768)
-#define configTOTAL_HEAP_SIZE_N						(256)
-#define configTOTAL_HEAP_SIZE                      (( size_t ) ( configTOTAL_HEAP_SIZE_N * 1024 ))
-#define configMAX_TASK_NAME_LEN                    (12)
-#define configUSE_TRACE_FACILITY                   1
-#define configUSE_16_BIT_TICKS                     0
-#define configIDLE_SHOULD_YIELD                    1
-#define configUSE_CO_ROUTINES                      0
-#define configUSE_MUTEXES                          1
-#define configUSE_RECURSIVE_MUTEXES                1
-#define configQUEUE_REGISTRY_SIZE                  0
-#define configUSE_APPLICATION_TASK_TAG             0
-#define configUSE_COUNTING_SEMAPHORES              1
-#define configUSE_ALTERNATIVE_API                  0
-#define configNUM_THREAD_LOCAL_STORAGE_POINTERS    3      /* FreeRTOS+FAT requires 2 pointers if a CWD is supported. */
-#define configRECORD_STACK_HIGH_ADDRESS            1
-
-#define configUSE_DAEMON_TASK_STARTUP_HOOK 1
-
-#define configCPU_CLOCK_HZ				(BSP_ICLK_HZ)
-#define configPERIPHERAL_CLOCK_HZ		(BSP_PCLKB_HZ)
-#define configUSE_QUEUE_SETS			1
-
-/* Hook function related definitions. */
-#define configUSE_TICK_HOOK                        1
-#define configUSE_IDLE_HOOK                        1
-#define configUSE_MALLOC_FAILED_HOOK               1
-#define configCHECK_FOR_STACK_OVERFLOW             2      /* Not applicable to the Win32 port. */
-
-/* Software timer related definitions. */
-#define configUSE_TIMERS                           1
-#define configTIMER_TASK_PRIORITY                  (6)
-#define configTIMER_QUEUE_LENGTH                   5
-#define configTIMER_TASK_STACK_DEPTH               (configMINIMAL_STACK_SIZE)
-
-/* The interrupt priority used by the kernel itself for the tick interrupt and
-the pended interrupt.  This would normally be the lowest priority. */
-#define configKERNEL_INTERRUPT_PRIORITY         1
-
-/* The maximum interrupt priority from which FreeRTOS API calls can be made.
-Interrupts that use a priority above this will not be effected by anything the
-kernel is doing. */
-#define configMAX_SYSCALL_INTERRUPT_PRIORITY    4
-
-/* The peripheral used to generate the tick interrupt is configured as part of
-the application code.  This constant should be set to the vector number of the
-peripheral chosen.  As supplied this is CMT0. */
-#define configTICK_VECTOR						_CMT0_CMI0		//CMT0
-//#define configTICK_VECTOR						_CMT1_CMI1		//CMT1
-//#define configTICK_VECTOR						_CMT2_CMI2		//CMT2
-//#define configTICK_VECTOR						_CMT3_CMI3		//CMT3
-
-/* Event group related definitions. */
-#define configUSE_EVENT_GROUPS                     1
-
-/* Run time stats gathering definitions. */
-unsigned long ulGetRunTimeCounterValue( void );
-void vConfigureTimerForRunTimeStats( void );
-#define configGENERATE_RUN_TIME_STATS    0
-//#define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS()    vConfigureTimerForRunTimeStats()
-//#define portGET_RUN_TIME_COUNTER_VALUE()            ulGetRunTimeCounterValue()
-
-/* Co-routine definitions. */
-#define configUSE_CO_ROUTINES                   0
-#define configMAX_CO_ROUTINE_PRIORITIES         (2)
-
-/* Currently the TCP/IP stack is using dynamic allocation, and the MQTT task is
- * using static allocation. */
-#define configSUPPORT_DYNAMIC_ALLOCATION        1
-#define configSUPPORT_STATIC_ALLOCATION         1
-
-/* Set the following definitions to 1 to include the API function, or zero
- * to exclude the API function. */
-#define INCLUDE_vTaskPrioritySet                1
-#define INCLUDE_uxTaskPriorityGet               1
-#define INCLUDE_vTaskDelete                     1
-#define INCLUDE_vTaskCleanUpResources           0
-#define INCLUDE_vTaskSuspend                    1
-#define INCLUDE_vTaskDelayUntil                 1
-#define INCLUDE_vTaskDelay                      1
-#define INCLUDE_uxTaskGetStackHighWaterMark     1
-#define INCLUDE_xTaskGetSchedulerState          1
-#define INCLUDE_xTimerGetTimerTaskHandle        0
-#define INCLUDE_xTaskGetIdleTaskHandle          0
-#define INCLUDE_xQueueGetMutexHolder            1
-#define INCLUDE_eTaskGetState                   1
-#define INCLUDE_xEventGroupSetBitsFromISR       1
-#define INCLUDE_xTimerPendFunctionCall          1
-#define INCLUDE_xTaskGetCurrentTaskHandle       1
-#define INCLUDE_xTaskAbortDelay                 1
-
-/* This demo makes use of one or more example stats formatting functions.  These
- * format the raw data provided by the uxTaskGetSystemState() function in to human
- * readable ASCII form.  See the notes in the implementation of vTaskList() within
- * FreeRTOS/Source/tasks.c for limitations.  configUSE_STATS_FORMATTING_FUNCTIONS
- * is set to 2 so the formatting functions are included without the stdio.h being
- * included in tasks.c.  That is because this project defines its own sprintf()
- * functions. */
-#define configUSE_STATS_FORMATTING_FUNCTIONS    1
-
-#if defined(ENABLE_UNIT_TESTS) || defined(FREERTOS_ENABLE_UNIT_TESTS)
-/* unity testing */
-#define configASSERT( x ) do { if( ( x ) == 0 ) TEST_ABORT(); } while( 0 )
-#elif defined(CONFIG_FREERTOS_ASSERT_DISABLE) || defined(NDEBUG)
-/* Disable Assert call for release builds. */
-#define configASSERT( x ) ( ( void ) 0 )
-#else /* CONFIG_FREERTOS_ASSERT_FAIL_ABORT or nothing */
-/* Assert call defined for debug builds. */
-extern void vAssertCalled( void );
-#define configASSERT( x ) do { if( ( x ) == 0 ) vAssertCalled(); } while( 0 )
-#endif
-
-/* The function that implements FreeRTOS printf style output, and the macro
- * that maps the configPRINTF() macros to that function. */
-extern void vLoggingPrintf( const char * pcFormat, ... );
-#define configPRINTF( X )    vLoggingPrintf X
-
-/* Non-format version thread-safe print */
-extern void vLoggingPrint( const char * pcMessage );
-#define configPRINT( X )     vLoggingPrint( X )
-
-extern void vOutputString( const char * pcMessage );
-/* Map the logging task's printf to the board specific output function. */
-#define configPRINT_STRING( x )    vOutputString(x)
-
-/* Sets the length of the buffers into which logging messages are written - so
- * also defines the maximum length of each log message. */
-#define configLOGGING_MAX_MESSAGE_LENGTH            192
-
-/* Set to 1 to prepend each log message with a message number, the task name,
- * and a time stamp. */
-#define configLOGGING_INCLUDE_TIME_AND_TASK_NAME    1
-
-/* Application specific definitions follow. **********************************/
-
-/* If configINCLUDE_DEMO_DEBUG_STATS is set to one, then a few basic IP trace
- * macros are defined to gather some UDP stack statistics that can then be viewed
- * through the CLI interface. */
-#define configINCLUDE_DEMO_DEBUG_STATS       1
-
-/* The size of the global output buffer that is available for use when there
- * are multiple command interpreters running at once (for example, one on a UART
- * and one on TCP/IP).  This is done to prevent an output buffer being defined by
- * each implementation - which would waste RAM.  In this case, there is only one
- * command interpreter running, and it has its own local output buffer, so the
- * global buffer is just set to be one byte long as it is not used and should not
- * take up unnecessary RAM. */
-#define configCOMMAND_INT_MAX_OUTPUT_SIZE    850
-
-/* Only used when running in the FreeRTOS Windows simulator.  Defines the
- * priority of the task used to simulate Ethernet interrupts. */
-#define configMAC_ISR_SIMULATOR_PRIORITY     ( configMAX_PRIORITIES - 1 )
-
-/* This demo creates a virtual network connection by accessing the raw Ethernet
- * or WiFi data to and from a real network connection.  Many computers have more
- * than one real network port, and configNETWORK_INTERFACE_TO_USE is used to tell
- * the demo which real port should be used to create the virtual port.  The ports
- * available are displayed on the console when the application is executed.  For
- * example, on my development laptop setting configNETWORK_INTERFACE_TO_USE to 4
- * results in the wired network being used, while setting
- * configNETWORK_INTERFACE_TO_USE to 2 results in the wireless network being
- * used. */
-#define configNETWORK_INTERFACE_TO_USE       2L
-
-/* The address of an echo server that will be used by the two demo echo client
- * tasks:
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_Echo_Clients.html,
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/UDP_Echo_Clients.html. */
-#define configECHO_SERVER_ADDR0              192
-#define configECHO_SERVER_ADDR1              168
-#define configECHO_SERVER_ADDR2              1
-#define configECHO_SERVER_ADDR3              200
-#define configTCP_ECHO_CLIENT_PORT           9999
-
-/* Default MAC address configuration.  The demo creates a virtual network
- * connection that uses this MAC address by accessing the raw Ethernet/WiFi data
- * to and from a real network connection on the host PC.  See the
- * configNETWORK_INTERFACE_TO_USE definition above for information on how to
- * configure the real network connection to use. */
-#define configMAC_ADDR0                      0x74
-#define configMAC_ADDR1                      0x90
-#define configMAC_ADDR2                      0x50
-#define configMAC_ADDR3                      0x00
-#define configMAC_ADDR4                      0x79
-#define configMAC_ADDR5                      0x03
-
-/* Default IP address configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configIP_ADDR0                       192
-#define configIP_ADDR1                       168
-#define configIP_ADDR2                       11
-#define configIP_ADDR3                       12
-
-/* Default gateway IP address configuration.  Used in ipconfigUSE_DHCP is set to
- * 0, or ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configGATEWAY_ADDR0                  172
-#define configGATEWAY_ADDR1                  27
-#define configGATEWAY_ADDR2                  49
-#define configGATEWAY_ADDR3                  1
-
-/* Default DNS server configuration.  OpenDNS addresses are 208.67.222.222 and
- * 208.67.220.220.  Used in ipconfigUSE_DHCP is set to 0, or ipconfigUSE_DHCP is
- * set to 1 but a DNS server cannot be contacted.*/
-#define configDNS_SERVER_ADDR0               143
-#define configDNS_SERVER_ADDR1               103
-#define configDNS_SERVER_ADDR2               47
-#define configDNS_SERVER_ADDR3               193
-
-/* Default netmask configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configNET_MASK0                      255
-#define configNET_MASK1                      255
-#define configNET_MASK2                      255
-#define configNET_MASK3                      0
-
-/* The UDP port to which print messages are sent. */
-#define configPRINT_PORT                     ( 15000 )
-
-#define configPROFILING                      ( 0 )
-
-/* Pseudo random number generater used by some demo tasks. */
-uint32_t ulRand(void);
-#define configRAND32()    ulRand()
-
-/* The platform FreeRTOS is running on. */
-#define configPLATFORM_NAME    "RenesasRX65N"
-
-/* Header required for the tracealyzer recorder library. */
-//#include "trcRecorder.h"
-
-/* When the FIT configurator or the Smart Configurator is used, platform.h has to be used. */
-#define configINCLUDE_PLATFORM_H_INSTEAD_OF_IODEFINE_H  1
-
-#endif /* FREERTOS_CONFIG_H */
diff --git a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/core_http_config.h b/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/core_http_config.h
deleted file mode 100644
index 679a119d..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/core_http_config.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * coreHTTP v3.0.0
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_HTTP_CONFIG_H_
-#define CORE_HTTP_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging config definition and header files inclusion are required in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for HTTP.
- * 3. Include the header file "logging_stack.h", if logging is enabled for HTTP.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the HTTP library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "HTTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_HTTP_CONFIG_ */
\ No newline at end of file
diff --git a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/core_mqtt_agent_config.h b/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/core_mqtt_agent_config.h
deleted file mode 100644
index 9cb54017..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/core_mqtt_agent_config.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * coreMQTT Agent v1.2.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_mqtt_agent_config.h
- * @brief This represents the default values for the configuration macros
- * for the MQTT-Agent library.
- */
-
-#ifndef CORE_MQTT_AGENT_CONFIG_H_
-#define CORE_MQTT_AGENT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT Agent.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT_Agent"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
- /**
- * @brief Maximum time MQTT agent waits in the queue for any pending MQTT
- * operations.
- *
- * The wait time is kept smallest possible to increase the responsiveness of
- * MQTT agent while processing  pending MQTT operations as well as receive
- * packets from network.
- */
-#define MQTT_AGENT_MAX_EVENT_QUEUE_WAIT_TIME    ( 50U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_AGENT_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/core_mqtt_config.h b/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/core_mqtt_config.h
deleted file mode 100644
index 6222626b..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/core_mqtt_config.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * coreMQTT v2.1.1
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_MQTT_CONFIG_H_
-#define CORE_MQTT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief The maximum duration between non-empty network reads while
-* receiving an MQTT packet via the #MQTT_ProcessLoop or #MQTT_ReceiveLoop
-* API functions.
-*
-* When an incoming MQTT packet is detected, the transport receive function
-* may be called multiple times until all of the expected number of bytes of the
-* packet are received. This timeout represents the maximum polling duration that
-* is allowed without any data reception from the network for the incoming packet.
-*
-* If the timeout expires, the #MQTT_ProcessLoop and #MQTT_ReceiveLoop functions
-* return #MQTTRecvFailed.
-*
-* @note If a dummy implementation of the #MQTTGetCurrentTimeFunc_t timer function,
-* is supplied to the library, then #MQTT_RECV_POLLING_TIMEOUT_MS MUST be set to 0.
-*
-* <b>Possible values:</b> Any positive 32 bit integer. Recommended to use a
-* small timeout value. <br>
-* <b>Default value:</b> `10`
-*
-*/
-#define MQTT_RECV_POLLING_TIMEOUT_MS    ( 1000U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/core_pkcs11_config.h b/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/core_pkcs11_config.h
deleted file mode 100644
index e18f347c..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/core_pkcs11_config.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * corePKCS11 v3.5.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_pkcs11_config.h
- * @brief List of configuration macros for the corePKCS11 library along with
- * their custom values.
- */
-
-#ifndef CORE_PKCS11_CONFIG_H_
-#define CORE_PKCS11_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for PKCS #11.
- * 3. Include the header file "logging_stack.h", if logging is enabled for PKCS #11.
- */
-#include "logging_levels.h"
-
-/* Logging configuration for the PKCS #11 library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "PKCS11"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_ERROR
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief Maximum number of sessions that can be stored
-* by the PKCS #11 module.
-*
-* @note The windows test port has an abnormally large value in order to have
-* enough sessions to successfully run all the model based PKCS #11 tests.
-*
-* <b>Possible values:</b> Any positive integer.<br>
-* <b>Default value:</b> 10
-*/
-#define pkcs11configMAX_NUM_OBJECTS    8
-
-/**
-* @brief Set to 1 if a PAL destroy object is implemented.
-*
-* If set to 0, no PAL destroy object is implemented, and this functionality
-* is implemented in the common PKCS #11 layer.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configPAL_DESTROY_SUPPORTED    1
-
-/**
-* @brief Set to 1 if OTA image verification via PKCS #11 module is supported.
-*
-* If set to 0, OTA code signing certificate is built in via
-* aws_ota_codesigner_certificate.h.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configOTA_SUPPORTED    1
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* CORE_PKCS11_CONFIG_H_ include guard. */
diff --git a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/core_sntp_config.h b/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/core_sntp_config.h
deleted file mode 100644
index a6303826..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/core_sntp_config.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * coreSNTP v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_sntp_config.h
- * @brief This file represents the custom values for the configuration macros
- * of the coreSNTP library.
- */
-
-#ifndef CORE_SNTP_CONFIG_H_
-#define CORE_SNTP_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for SNTP.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "SNTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef CORE_SNTP_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/defender_config.h b/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/defender_config.h
deleted file mode 100644
index d0b3d8e4..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/defender_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Defender Client v1.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file defender_config.h
- * @brief Custom config values for the AWS IoT Device Defender Client Library.
- */
-
-#ifndef DEFENDER_CONFIG_H_
-#define DEFENDER_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for Device Defender.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "Defender"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* DEFENDER_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/demo_config.h b/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/demo_config.h
deleted file mode 100644
index a8c8de2d..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/demo_config.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * FreeRTOS V202111.00
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * https://www.FreeRTOS.org
- * https://github.com/FreeRTOS
- *
- */
-
-#ifndef DEMO_CONFIG_H
-#define DEMO_CONFIG_H
-
-/* FreeRTOS include. */
-#include "FreeRTOS.h"
-#include "aws_clientcredential.h"
-#include "aws_clientcredential_keys.h"
-#include "iot_default_root_certificates.h"
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for DEMO.
- * 3. Include the header file "logging_stack.h", if logging is enabled for DEMO.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Demo. */
-#ifndef LIBRARY_LOG_NAME
-#define LIBRARY_LOG_NAME    "MQTTDemo"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-#define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "iot_logging_task.h"
-
-
-/* Select a combination of demos to run
- * These demo has not been evaluated outside of the combination of demos listed below.
- *
- *          PUBSUB demo only :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB and OTA over MQTT demo :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (1)
- *          PUBSUB and OTA over MQTT demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (1)
- */
-/* demo is configured for PUBSUB */
-/* Select demo combination to run. */
-
-/* Please select a provisioning method
- * (0) : Pre-provisioning
- * (1) : Fleet provisioning
- */
-#define ENABLE_FLEET_PROVISIONING_DEMO      (1)
-
-/* Please select whether to enable or disable the OTA demo
- * (0) : OTA demo is disabled
- * (1) : OTA over MQTT demo is enabled
- */
-#define ENABLE_OTA_UPDATE_DEMO              (0)
-
-#define democonfigROOT_CA_PEM               tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief Path of the file containing the provisioning claim certificate. This
- * certificate is used to connect to AWS IoT Core and use Fleet Provisioning
- * APIs to provision the client device. This is used for the "Provisioning by
- * Claim" provisioning workflow.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This certificate should be PEM-encoded. The certificate should be
- * registered on AWS IoT Core beforehand. It should have an AWS IoT policy to
- * allow it to access only the Fleet Provisioning APIs. An example policy for
- * the claim certificates for this demo is available in the
- * example_claim_policy.json file in the demo directory. In the example,
- * replace <aws-region> with your AWS region, <aws-account-id> with your
- * account ID, and <template-name> with the name of your provisioning template.
- *
- */
-#define democonfigCLAIM_CERT_PEM            "...insert here..."
-
-/**
- * @brief Path of the file containing the provisioning claim private key. This
- * key corresponds to the provisioning claim certificate and is used to
- * authenticate with AWS IoT for provisioning by claim.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This private key should be PEM-encoded.
- *
- */
-#define democonfigCLAIM_PRIVATE_KEY_PEM     "...insert here..."
-
-/**
- * @brief An option to disable Server Name Indication.
- *
- * @note When using a local Mosquitto server setup, SNI needs to be disabled
- * for an MQTT broker that only has an IP address but no hostname. However,
- * SNI should be enabled whenever possible.
- */
-#define democonfigDISABLE_SNI                ( pdFALSE )
-
-/**
- * @brief Configuration that indicates if the demo connection is made to the AWS IoT Core MQTT broker.
- *
- * If username/password based authentication is used, the demo will use appropriate TLS ALPN and
- * SNI configurations as required for the Custom Authentication feature of AWS IoT.
- * For more information, refer to the following documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/custom-auth.html#custom-auth-mqtt
- *
- * #define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
- */
-#define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
-
-/**
- * @brief The unique ID used by the demo to differentiate instances.
- *
- *!!! Please note a #defined constant is used for convenience of demonstration
- *!!! only.  Production devices can use something unique to the device that can
- *!!! be read by software, such as a production serial number, instead of a
- *!!! hard coded constant.
- */
-#define democonfigFP_DEMO_ID    "FPDemoID"
-
-/**
- * @brief The MQTT client identifier used in this example.  Each client identifier
- * must be unique so edit as required to ensure no two clients connecting to the
- * same broker use the same client identifier.
- *
- * @note Appending __TIME__ to the client id string will reduce the possibility of a
- * client id collision in the broker. Note that the appended time is the compilation
- * time. This client id can cause collision, if more than one instance of the same
- * binary is used at the same time to connect to the broker.
- */
-#ifndef democonfigCLIENT_IDENTIFIER
-#if (ENABLE_FLEET_PROVISIONING_DEMO == 1)
-    #define democonfigCLIENT_IDENTIFIER    "client"democonfigFP_DEMO_ID
-#else
-    #define democonfigCLIENT_IDENTIFIER    clientcredentialIOT_THING_NAME
-#endif
-#endif
-
-/**
- * @brief Details of the MQTT broker to connect to.
- *
- * This is the Claim's Rest API Endpoint for AWS IoT.
- *
- * @note Your AWS IoT Core endpoint can be found in the AWS IoT console under
- * Settings/Custom Endpoint, or using the describe-endpoint API.
- *
- */
-#define democonfigMQTT_BROKER_ENDPOINT     clientcredentialMQTT_BROKER_ENDPOINT
-
-/**
- * @brief AWS IoT MQTT broker port number.
- *
- * In general, port 8883 is for secured MQTT connections.
- *
- * @note Port 443 requires use of the ALPN TLS extension with the ALPN protocol
- * name. When using port 8883, ALPN is not required.
- */
-#define democonfigMQTT_BROKER_PORT    ( clientcredentialMQTT_BROKER_PORT )
-
-/**
- * @brief Name of the provisioning template to use for the RegisterThing
- * portion of the Fleet Provisioning workflow.
- *
- * For information about provisioning templates, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-template.html#fleet-provision-template
- *
- * The example template used for this demo is available in the
- * example_demo_template.json file in the DemoSetup directory. In the example,
- * replace <provisioned-thing-policy> with the policy provisioned devices
- * should have.  The demo template uses Fn::Join to construct the Thing name by
- * concatenating fp_demo_ and the serial number sent by the demo.
- *
- * @note The provisioning template MUST be created in AWS IoT before running the
- * demo.
- *
- * @note If you followed the manual setup steps on https://freertos.org/iot-fleet-provisioning/demo.html,
- * the provisioning template name is "FleetProvisioningDemoTemplate".
- * However, if you used CloudFormation to set up the demo, the template name is "CF_FleetProvisioningDemoTemplate"
- */
- #define democonfigPROVISIONING_TEMPLATE_NAME    "...insert here..."
-
-/**
- * @brief Subject name to use when creating the certificate signing request (CSR)
- * for provisioning the demo client with using the Fleet Provisioning
- * CreateCertificateFromCsr APIs.
- *
- * This is passed to MbedTLS; see https://tls.mbed.org/api/x509__csr_8h.html#a954eae166b125cea2115b7db8c896e90
- */
-#ifndef democonfigCSR_SUBJECT_NAME
-    #define democonfigCSR_SUBJECT_NAME    "CN="democonfigFP_DEMO_ID
-#endif
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_STACKSIZE        configMINIMAL_STACK_SIZE * 3
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_TASK_PRIORITY    ( tskIDLE_PRIORITY + 1 )
-
-#define democonfigNETWORK_BUFFER_SIZE    ( configMINIMAL_STACK_SIZE * 3 )
-
-#include "core_mqtt.h" /* Include coreMQTT header for MQTT_LIBRARY_VERSION macro. */
-#define democonfigMQTT_LIB    "core-mqtt@"MQTT_LIBRARY_VERSION
-
-#define democonfigDISABLE_SNI       ( pdFALSE )
-
-/**
- * @brief ALPN (Application-Layer Protocol Negotiation) protocol name for AWS IoT MQTT.
- *
- * This will be used if democonfigMQTT_BROKER_PORT is configured as 443 for the AWS IoT MQTT broker.
- * Please see more details about the ALPN protocol for AWS IoT MQTT endpoint
- * in the link below.
- * https://aws.amazon.com/blogs/iot/mqtt-with-tls-client-authentication-on-port-443-why-it-is-useful-and-how-it-works/
- */
-#define AWS_IOT_MQTT_ALPN           "\x0ex-amzn-mqtt-ca"
-
-/**
- * @brief This is the ALPN (Application-Layer Protocol Negotiation) string
- * required by AWS IoT for password-based authentication using TCP port 443.
- */
-#define AWS_IOT_CUSTOM_AUTH_ALPN    "\x04mqtt"
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-/**
- * @brief The name of the operating system that the application is running on.
- * The current value is given as an example. Please update for your specific
- * operating system.
- */
-#define democonfigOS_NAME       "FreeRTOS"
-
-/**
- * @brief The version of the operating system that the application is running
- * on. The current value is given as an example. Please update for your specific
- * operating system version.
- */
-#define democonfigOS_VERSION    "V10.4.3"
-
-/**
- * @brief The name of the hardware platform the application is running on. The
- * current value is given as an example. Please update for your specific
- * hardware platform.
- */
-#define democonfigHARDWARE_PLATFORM_NAME    "CK-RX65N"
-
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING                                 \
-    "?SDK=" democonfigOS_NAME "&Version=" democonfigOS_VERSION \
-    "&MQTTLib=" democonfigMQTT_LIB
-
-/**
- * @brief The length of the MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING_LENGTH    ( ( uint16_t ) ( sizeof( AWS_IOT_METRICS_STRING ) - 1 ) )
-
-
-#ifdef democonfigCLIENT_USERNAME
-
-/**
- * @brief Append the username with the metrics string if #democonfigCLIENT_USERNAME is defined.
- *
- * This is to support both metrics reporting and username/password based client
- * authentication by AWS IoT.
- */
-#define CLIENT_USERNAME_WITH_METRICS    democonfigCLIENT_USERNAME AWS_IOT_METRICS_STRING
-#endif
-
-/**
- * @brief Flag to enable or disable provisioning mode for the demo.
- * Enabling the flags starts a CLI task, so that user can perform provisioning of the device through
- * a serial terminal. Provisioning involves running commands to fetch or set the PKI and configuration
- * information for the device to connect to broker and perform OTA updates. Disabling the flag results
- * in disabling the CLI task and execution of the demo tasks in normal device operation mode.
- */
-#define appmainPROVISIONING_MODE                  ( 1 )
-
-/**
- * @brief Certificate used for validating code signing signatures in the OTA PAL.
- */
-#ifndef otapalconfigCODE_SIGNING_CERTIFICATE
-    #define otapalconfigCODE_SIGNING_CERTIFICATE    "Insert code signing certificate..."
-#endif
-
-/**
- * @brief Major version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MAJOR
-    #define APP_VERSION_MAJOR    0
-#endif
-
-/**
- * @brief Minor version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MINOR
-    #define APP_VERSION_MINOR    9
-#endif
-
-/**
- * @brief Build version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_BUILD
-    #define APP_VERSION_BUILD    2
-#endif
-
-/**
- * @brief Server's root CA certificate.
- *
- * This certificate is used to identify the AWS IoT server and is publicly
- * available. Refer to the AWS documentation available in the link below for
- * information about the Server Root CAs.
- * https://docs.aws.amazon.com/iot/latest/developerguide/server-authentication.html#server-authentication-certs
- *
- * @note The TI C3220 Launchpad board requires that the Root CA have its
- * certificate self-signed. As mentioned in the above link, the Amazon Root CAs
- * are cross-signed by the Starfield Root CA. Thus, ONLY the Starfield Root CA
- * can be used to connect to the ATS endpoints on AWS IoT for the TI board.
- *
- * @note This certificate should be PEM-encoded.
- *
- * Must include the PEM header and footer:
- * "-----BEGIN CERTIFICATE-----\n"\
- * "...base64 data...\n"\
- * "-----END CERTIFICATE-----\n"
- *
- */
-#define democonfigROOT_CA_PEM                   tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief The length of the queue used to hold commands for the agent.
- */
-#define MQTT_AGENT_COMMAND_QUEUE_LENGTH         ( 25 )
-
-/**
- * @brief Dimensions the buffer used to serialise and deserialise MQTT packets.
- * @note Specified in bytes.  Must be large enough to hold the maximum
- * anticipated MQTT payload.
- */
-#define MQTT_AGENT_NETWORK_BUFFER_SIZE          ( 5000 )
-
-#define MQTT_COMMAND_CONTEXTS_POOL_SIZE              ( 10 )
-
-#endif /* DEMO_CONFIG_H */
diff --git a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/fleet_provisioning_config.h b/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/fleet_provisioning_config.h
deleted file mode 100644
index 68b85d66..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/fleet_provisioning_config.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * AWS IoT Fleet Provisioning v1.1.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file fleet_provisioning_config.h
- * @brief Custom config values for the AWS IoT Fleet Provisioning Library.
- */
-
-#ifndef FLEET_PROVISIONING_CONFIG_H_
-#define FLEET_PROVISIONING_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for Fleet Provisioning.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Fleet Provisioning library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "FleetProvisioning"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-/************ End of logging configuration ****************/
-
-#endif /* ifndef FLEET_PROVISIONING_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/rm_littlefs_flash_config.h b/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/rm_littlefs_flash_config.h
deleted file mode 100644
index 94207ffa..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/rm_littlefs_flash_config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/***********************************************************************************************************************
- * Copyright 2023 Renesas Electronics Corporation and/or its affiliates.  All Rights Reserved.
- *
- * This software and documentation are supplied by Renesas Electronics America Inc. and may only be used with products
- * of Renesas Electronics Corp. and its affiliates ("Renesas").  No other uses are authorized.  Renesas products are
- * sold pursuant to Renesas terms and conditions of sale.  Purchasers are solely responsible for the selection and use
- * of Renesas products and Renesas assumes no liability.  No license, express or implied, to any intellectual property
- * right is granted by Renesas. This software is protected under all applicable laws, including copyright laws. Renesas
- * reserves the right to change or discontinue this software and/or this documentation. THE SOFTWARE AND DOCUMENTATION
- * IS DELIVERED TO YOU "AS IS," AND RENESAS MAKES NO REPRESENTATIONS OR WARRANTIES, AND TO THE FULLEST EXTENT
- * PERMISSIBLE UNDER APPLICABLE LAW, DISCLAIMS ALL WARRANTIES, WHETHER EXPLICITLY OR IMPLICITLY, INCLUDING WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT, WITH RESPECT TO THE SOFTWARE OR
- * DOCUMENTATION.  RENESAS SHALL HAVE NO LIABILITY ARISING OUT OF ANY SECURITY VULNERABILITY OR BREACH.  TO THE MAXIMUM
- * EXTENT PERMITTED BY LAW, IN NO EVENT WILL RENESAS BE LIABLE TO YOU IN CONNECTION WITH THE SOFTWARE OR DOCUMENTATION
- * (OR ANY PERSON OR ENTITY CLAIMING RIGHTS DERIVED FROM YOU) FOR ANY LOSS, DAMAGES, OR CLAIMS WHATSOEVER, INCLUDING,
- * WITHOUT LIMITATION, ANY DIRECT, CONSEQUENTIAL, SPECIAL, INDIRECT, PUNITIVE, OR INCIDENTAL DAMAGES; ANY LOST PROFITS,
- * OTHER ECONOMIC DAMAGE, PROPERTY DAMAGE, OR PERSONAL INJURY; AND EVEN IF RENESAS HAS BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH LOSS, DAMAGES, CLAIMS OR COSTS.
- **********************************************************************************************************************/
-
-#ifndef FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-#define FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-
-/***********************************************************************************************************************
- * Includes
- **********************************************************************************************************************/
-#include "rm_littlefs_df_rx65n.h"
-
-#define LFS_FLASH_READ_SIZE				(1)
-#define LFS_FLASH_PROGRAM_SIZE			(4)
-#define LFS_FLASH_BLOCK_SIZE			(128)
-#define LFS_FLASH_BLOCK_COUNT			(70)
-#define RM_LITTLEFS_FLASH_DATA_START	FLASH_DF_BLOCK_0_MACRO
-
-#if LFS_FLASH_BLOCK_SIZE*LFS_FLASH_BLOCK_COUNT + (RM_LITTLEFS_FLASH_DATA_START - FLASH_DF_BLOCK_0_MACRO) > BSP_DATA_FLASH_SIZE_BYTES
-#error "Too many blocks"
-#endif
-
-#endif /* FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/shadow_config.h b/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/shadow_config.h
deleted file mode 100644
index aa948c12..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/shadow_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Shadow v1.3.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file shadow_config.h
- * @brief This represents the custom values for the configuration macros
- * for the Shadow library.
- */
-
-#ifndef SHADOW_CONFIG_H_
-#define SHADOW_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SHADOW"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef SHADOW_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/sigv4_config.h b/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/sigv4_config.h
deleted file mode 100644
index ba277a79..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/sigv4_config.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * SigV4 Library v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file sigv4_config.h
- * @brief The custom values for configuration macros used by the SigV4 Library.
- */
-
-#ifndef SIGV4_CONFIG_H_
-#define SIGV4_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SIGV4"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef SIGV4_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/user_tcp_hook_config.h b/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/user_tcp_hook_config.h
deleted file mode 100644
index 0c1308fe..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/cellular/src/frtos_config/user_tcp_hook_config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**********************************************************************************************************************
- * Copyright (C) 2023 Renesas Electronics Corporation. All rights reserved.
- *
- * DISCLAIMER
- * This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
- * other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
- * applicable laws, including copyright laws.
- * THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
- * THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
- * EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
- * SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS
- * SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
- * this software. By using this software, you agree to the additional terms and conditions found by accessing the
- * following link:
- * http://www.renesas.com/disclaimer
- *********************************************************************************************************************/
-
-#ifndef FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_
-#define FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_
-
-/* The limit of number for CELLULAR_ERR_MODULE_COM when it comes continuously.
- * If counter is over than this limit, hook the reset */
-#define USER_COMM_ERROR_TRIES		3
-
-/*Connection retry limit*/
-#define USER_RECONNECT_TRIES 		3
-
-/*Socket closing retry limit*/
-#define USER_CLOSE_SOCKET_TRIES		3
-
-/*Enable SocketErrorHook*/
-#define USER_TCP_HOOK_ENABLED   	1 /* Default */
-
-/* Reset cellular hardware*/
-#define USER_TCP_HOOK_FUNCTION     SocketErrorHook
-
-#endif /* FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/ether/linker_section_sample.esi b/Configuration/samples/fleetps/ck-rx65n/ether/linker_section_sample.esi
deleted file mode 100644
index fff6ca13..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/ether/linker_section_sample.esi
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<com.renesas.linkersection.model:SectionContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:com.renesas.linkersection.model="http:///LinkerSection.ecore">
-  <sections name="SU">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4"/>
-  </sections>
-  <sections name="SI"/>
-  <sections name="R_1"/>
-  <sections name="B_2"/>
-  <sections name="R"/>
-  <sections name="RPFRAM2"/>
-  <sections name="C_LITTLEFS_MANAGEMENT_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1048576"/>
-  </sections>
-  <sections name="C_USER_APPLICATION_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1057536"/>
-  </sections>
-  <sections name="B_ETHERNET_BUFFERS*">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="8388608"/>
-  </sections>
-  <sections name="B_RX_DESC*"/>
-  <sections name="B_TX_DESC*"/>
-  <sections name="B"/>
-  <sections name="B_1"/>
-  <sections name="R_2"/>
-  <sections name="PResetPRG">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4293919488"/>
-  </sections>
-  <sections name="C_1"/>
-  <sections name="C_2"/>
-  <sections name="C"/>
-  <sections name="C$*"/>
-  <sections name="D*"/>
-  <sections name="W*"/>
-  <sections name="L"/>
-  <sections name="P"/>
-  <sections name="PFRAM2"/>
-  <sections name="EXCEPTVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294967168"/>
-  </sections>
-  <sections name="RESETVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294967292"/>
-  </sections>
-</com.renesas.linkersection.model:SectionContainer>
diff --git a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/FreeRTOSConfig.h b/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/FreeRTOSConfig.h
deleted file mode 100644
index 5662a8c2..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/FreeRTOSConfig.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * FreeRTOS Kernel V10.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * http://aws.amazon.com/freertos
- * http://www.FreeRTOS.org
- */
-
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
-
-
-/* Unity includes. */
-#if defined(FREERTOS_ENABLE_UNIT_TESTS)
-#include "unity_internals.h"
-#elif defined(ENABLE_UNIT_TESTS)
-#include "unity.h"
-#endif
-
-/*-----------------------------------------------------------
-* Application specific definitions.
-*
-* These definitions should be adjusted for your particular hardware and
-* application requirements.
-*
-* THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
-* FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
-* http://www.freertos.org/a00110.html
-*
-* The bottom of this file contains some constants specific to running the UDP
-* stack in this demo.  Constants specific to FreeRTOS+TCP itself (rather than
-* the demo) are contained in FreeRTOSIPConfig.h.
-*----------------------------------------------------------*/
-#define configENABLE_BACKWARD_COMPATIBILITY        1
-#define configUSE_PREEMPTION                       1
-#define configUSE_PORT_OPTIMISED_TASK_SELECTION    0
-#define configMAX_PRIORITIES                       (7)
-#define configTICK_RATE_HZ                         (( TickType_t ) 1000)
-#define configMINIMAL_STACK_SIZE                   (768)
-#define configTOTAL_HEAP_SIZE_N						(256)
-#define configTOTAL_HEAP_SIZE                      (( size_t ) ( configTOTAL_HEAP_SIZE_N * 1024 ))
-#define configMAX_TASK_NAME_LEN                    (12)
-#define configUSE_TRACE_FACILITY                   1
-#define configUSE_16_BIT_TICKS                     0
-#define configIDLE_SHOULD_YIELD                    1
-#define configUSE_CO_ROUTINES                      0
-#define configUSE_MUTEXES                          1
-#define configUSE_RECURSIVE_MUTEXES                1
-#define configQUEUE_REGISTRY_SIZE                  0
-#define configUSE_APPLICATION_TASK_TAG             0
-#define configUSE_COUNTING_SEMAPHORES              1
-#define configUSE_ALTERNATIVE_API                  0
-#define configNUM_THREAD_LOCAL_STORAGE_POINTERS    3      /* FreeRTOS+FAT requires 2 pointers if a CWD is supported. */
-#define configRECORD_STACK_HIGH_ADDRESS            1
-
-#define configUSE_DAEMON_TASK_STARTUP_HOOK 1
-
-#define configCPU_CLOCK_HZ				(BSP_ICLK_HZ)
-#define configPERIPHERAL_CLOCK_HZ		(BSP_PCLKB_HZ)
-#define configUSE_QUEUE_SETS			1
-
-/* Hook function related definitions. */
-#define configUSE_TICK_HOOK                        1
-#define configUSE_IDLE_HOOK                        1
-#define configUSE_MALLOC_FAILED_HOOK               1
-#define configCHECK_FOR_STACK_OVERFLOW             2      /* Not applicable to the Win32 port. */
-
-/* Software timer related definitions. */
-#define configUSE_TIMERS                           1
-#define configTIMER_TASK_PRIORITY                  (6)
-#define configTIMER_QUEUE_LENGTH                   5
-#define configTIMER_TASK_STACK_DEPTH               (configMINIMAL_STACK_SIZE)
-
-/* The interrupt priority used by the kernel itself for the tick interrupt and
-the pended interrupt.  This would normally be the lowest priority. */
-#define configKERNEL_INTERRUPT_PRIORITY         1
-
-/* The maximum interrupt priority from which FreeRTOS API calls can be made.
-Interrupts that use a priority above this will not be effected by anything the
-kernel is doing. */
-#define configMAX_SYSCALL_INTERRUPT_PRIORITY    4
-
-/* The peripheral used to generate the tick interrupt is configured as part of
-the application code.  This constant should be set to the vector number of the
-peripheral chosen.  As supplied this is CMT0. */
-#define configTICK_VECTOR						_CMT0_CMI0		//CMT0
-//#define configTICK_VECTOR						_CMT1_CMI1		//CMT1
-//#define configTICK_VECTOR						_CMT2_CMI2		//CMT2
-//#define configTICK_VECTOR						_CMT3_CMI3		//CMT3
-
-/* Event group related definitions. */
-#define configUSE_EVENT_GROUPS                     1
-
-/* Run time stats gathering definitions. */
-unsigned long ulGetRunTimeCounterValue( void );
-void vConfigureTimerForRunTimeStats( void );
-#define configGENERATE_RUN_TIME_STATS    0
-//#define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS()    vConfigureTimerForRunTimeStats()
-//#define portGET_RUN_TIME_COUNTER_VALUE()            ulGetRunTimeCounterValue()
-
-/* Co-routine definitions. */
-#define configUSE_CO_ROUTINES                   0
-#define configMAX_CO_ROUTINE_PRIORITIES         (2)
-
-/* Currently the TCP/IP stack is using dynamic allocation, and the MQTT task is
- * using static allocation. */
-#define configSUPPORT_DYNAMIC_ALLOCATION        1
-#define configSUPPORT_STATIC_ALLOCATION         1
-
-/* Set the following definitions to 1 to include the API function, or zero
- * to exclude the API function. */
-#define INCLUDE_vTaskPrioritySet                1
-#define INCLUDE_uxTaskPriorityGet               1
-#define INCLUDE_vTaskDelete                     1
-#define INCLUDE_vTaskCleanUpResources           0
-#define INCLUDE_vTaskSuspend                    1
-#define INCLUDE_vTaskDelayUntil                 1
-#define INCLUDE_vTaskDelay                      1
-#define INCLUDE_uxTaskGetStackHighWaterMark     1
-#define INCLUDE_xTaskGetSchedulerState          1
-#define INCLUDE_xTimerGetTimerTaskHandle        0
-#define INCLUDE_xTaskGetIdleTaskHandle          0
-#define INCLUDE_xQueueGetMutexHolder            1
-#define INCLUDE_eTaskGetState                   1
-#define INCLUDE_xEventGroupSetBitsFromISR       1
-#define INCLUDE_xTimerPendFunctionCall          1
-#define INCLUDE_xTaskGetCurrentTaskHandle       1
-#define INCLUDE_xTaskAbortDelay                 1
-
-/* This demo makes use of one or more example stats formatting functions.  These
- * format the raw data provided by the uxTaskGetSystemState() function in to human
- * readable ASCII form.  See the notes in the implementation of vTaskList() within
- * FreeRTOS/Source/tasks.c for limitations.  configUSE_STATS_FORMATTING_FUNCTIONS
- * is set to 2 so the formatting functions are included without the stdio.h being
- * included in tasks.c.  That is because this project defines its own sprintf()
- * functions. */
-#define configUSE_STATS_FORMATTING_FUNCTIONS    1
-
-#if defined(ENABLE_UNIT_TESTS) || defined(FREERTOS_ENABLE_UNIT_TESTS)
-/* unity testing */
-#define configASSERT( x ) do { if( ( x ) == 0 ) TEST_ABORT(); } while( 0 )
-#elif defined(CONFIG_FREERTOS_ASSERT_DISABLE) || defined(NDEBUG)
-/* Disable Assert call for release builds. */
-#define configASSERT( x ) ( ( void ) 0 )
-#else /* CONFIG_FREERTOS_ASSERT_FAIL_ABORT or nothing */
-/* Assert call defined for debug builds. */
-extern void vAssertCalled( void );
-#define configASSERT( x ) do { if( ( x ) == 0 ) vAssertCalled(); } while( 0 )
-#endif
-
-/* The function that implements FreeRTOS printf style output, and the macro
- * that maps the configPRINTF() macros to that function. */
-extern void vLoggingPrintf( const char * pcFormat, ... );
-#define configPRINTF( X )    vLoggingPrintf X
-
-/* Non-format version thread-safe print */
-extern void vLoggingPrint( const char * pcMessage );
-#define configPRINT( X )     vLoggingPrint( X )
-
-extern void vOutputString( const char * pcMessage );
-/* Map the logging task's printf to the board specific output function. */
-#define configPRINT_STRING( x )    vOutputString(x)
-
-/* Sets the length of the buffers into which logging messages are written - so
- * also defines the maximum length of each log message. */
-#define configLOGGING_MAX_MESSAGE_LENGTH            192
-
-/* Set to 1 to prepend each log message with a message number, the task name,
- * and a time stamp. */
-#define configLOGGING_INCLUDE_TIME_AND_TASK_NAME    1
-
-/* Application specific definitions follow. **********************************/
-
-/* If configINCLUDE_DEMO_DEBUG_STATS is set to one, then a few basic IP trace
- * macros are defined to gather some UDP stack statistics that can then be viewed
- * through the CLI interface. */
-#define configINCLUDE_DEMO_DEBUG_STATS       1
-
-/* The size of the global output buffer that is available for use when there
- * are multiple command interpreters running at once (for example, one on a UART
- * and one on TCP/IP).  This is done to prevent an output buffer being defined by
- * each implementation - which would waste RAM.  In this case, there is only one
- * command interpreter running, and it has its own local output buffer, so the
- * global buffer is just set to be one byte long as it is not used and should not
- * take up unnecessary RAM. */
-#define configCOMMAND_INT_MAX_OUTPUT_SIZE    850
-
-/* Only used when running in the FreeRTOS Windows simulator.  Defines the
- * priority of the task used to simulate Ethernet interrupts. */
-#define configMAC_ISR_SIMULATOR_PRIORITY     ( configMAX_PRIORITIES - 1 )
-
-/* This demo creates a virtual network connection by accessing the raw Ethernet
- * or WiFi data to and from a real network connection.  Many computers have more
- * than one real network port, and configNETWORK_INTERFACE_TO_USE is used to tell
- * the demo which real port should be used to create the virtual port.  The ports
- * available are displayed on the console when the application is executed.  For
- * example, on my development laptop setting configNETWORK_INTERFACE_TO_USE to 4
- * results in the wired network being used, while setting
- * configNETWORK_INTERFACE_TO_USE to 2 results in the wireless network being
- * used. */
-#define configNETWORK_INTERFACE_TO_USE       2L
-
-/* The address of an echo server that will be used by the two demo echo client
- * tasks:
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_Echo_Clients.html,
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/UDP_Echo_Clients.html. */
-#define configECHO_SERVER_ADDR0              192
-#define configECHO_SERVER_ADDR1              168
-#define configECHO_SERVER_ADDR2              1
-#define configECHO_SERVER_ADDR3              200
-#define configTCP_ECHO_CLIENT_PORT           9999
-
-/* Default MAC address configuration.  The demo creates a virtual network
- * connection that uses this MAC address by accessing the raw Ethernet/WiFi data
- * to and from a real network connection on the host PC.  See the
- * configNETWORK_INTERFACE_TO_USE definition above for information on how to
- * configure the real network connection to use. */
-#define configMAC_ADDR0                      0x74
-#define configMAC_ADDR1                      0x90
-#define configMAC_ADDR2                      0x50
-#define configMAC_ADDR3                      0x00
-#define configMAC_ADDR4                      0x79
-#define configMAC_ADDR5                      0x03
-
-/* Default IP address configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configIP_ADDR0                       192
-#define configIP_ADDR1                       168
-#define configIP_ADDR2                       11
-#define configIP_ADDR3                       12
-
-/* Default gateway IP address configuration.  Used in ipconfigUSE_DHCP is set to
- * 0, or ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configGATEWAY_ADDR0                  172
-#define configGATEWAY_ADDR1                  27
-#define configGATEWAY_ADDR2                  49
-#define configGATEWAY_ADDR3                  1
-
-/* Default DNS server configuration.  OpenDNS addresses are 208.67.222.222 and
- * 208.67.220.220.  Used in ipconfigUSE_DHCP is set to 0, or ipconfigUSE_DHCP is
- * set to 1 but a DNS server cannot be contacted.*/
-#define configDNS_SERVER_ADDR0               143
-#define configDNS_SERVER_ADDR1               103
-#define configDNS_SERVER_ADDR2               47
-#define configDNS_SERVER_ADDR3               193
-
-/* Default netmask configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configNET_MASK0                      255
-#define configNET_MASK1                      255
-#define configNET_MASK2                      255
-#define configNET_MASK3                      0
-
-/* The UDP port to which print messages are sent. */
-#define configPRINT_PORT                     ( 15000 )
-
-#define configPROFILING                      ( 0 )
-
-/* Pseudo random number generater used by some demo tasks. */
-uint32_t ulRand(void);
-#define configRAND32()    ulRand()
-
-/* The platform FreeRTOS is running on. */
-#define configPLATFORM_NAME    "RenesasRX65N"
-
-/* Header required for the tracealyzer recorder library. */
-//#include "trcRecorder.h"
-
-/* When the FIT configurator or the Smart Configurator is used, platform.h has to be used. */
-#define configINCLUDE_PLATFORM_H_INSTEAD_OF_IODEFINE_H  1
-
-#endif /* FREERTOS_CONFIG_H */
diff --git a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/FreeRTOSIPConfig.h b/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/FreeRTOSIPConfig.h
deleted file mode 100644
index 413f8d38..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/FreeRTOSIPConfig.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * FreeRTOS+TCP V3.1.0
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * http://aws.amazon.com/freertos
- * http://www.FreeRTOS.org
- */
-
-
-/*****************************************************************************
-*
-* See the following URL for configuration information.
-* http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_IP_Configuration.html
-*
-*****************************************************************************/
-#include "r_ether_rx_config.h"
-
-#ifndef FREERTOS_IP_CONFIG_H
-#define FREERTOS_IP_CONFIG_H
-
-/* Define the byte order of the target MCU (the MCU FreeRTOS+TCP is executing
- * on).  Valid options are pdFREERTOS_BIG_ENDIAN and pdFREERTOS_LITTLE_ENDIAN. */
-#define ipconfigBYTE_ORDER                         pdFREERTOS_LITTLE_ENDIAN
-
-/*
- * FreeRTOS debug logging routines.
- * The macro will be called with a printf() format as a parameter.  Users
- * can define their own logging routine as:
- *
- * The FreeRTOS_debug_printf() must be thread-safe but does not have to be
- * interrupt-safe.
- */
-#define FreeRTOS_debug_printf( MSG )    configPRINTF( MSG )
-#define ipconfigHAS_PRINTF    1
-#define FreeRTOS_printf( MSG )    configPRINTF( MSG )
-
-/* 'ipconfigUSE_NETWORK_EVENT_HOOK' indicates if an application hook is available
- * called 'vApplicationIPNetworkEventHook()'.  This function will be called when
- * the network goes up and when it goes down.  See also FREERTOS_IP.h for further
- * explanation. */
-#define ipconfigUSE_NETWORK_EVENT_HOOK    1
-
-/* Define the number of entries in the ARP cache table. */
-#define ipconfigARP_CACHE_ENTRIES    6
-
-/* 'ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS' is an important macro: it
- * determines the number of network buffers that are available in the
- * entire application.
- * Note that the default of 45 may be pretty high for smaller
- * applications.
- * Also note that when the network interface uses zero-copy reception
- * ( ipconfigZERO_COPY_RX_DRIVER ), it will reserve a set of network
- * buffers permanently.
- * For zero-copy transmission, no network buffers are permanently
- * "reserved" for transmission.
- */
-#define ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS    ETHER_CFG_EMAC_TX_DESCRIPTORS
-
-/* Related to the macro 'ipconfigEVENT_QUEUE_LENGTH' here above:
- * when developing a new networking application, it can be helpful
- * to monitor the length of the message queue of the IP-task.
- * This code is only enabled when 'ipconfigCHECK_IP_QUEUE_SPACE'
- * is set to 1.  See also the function 'uxGetMinimumIPQueueSpace()'.
- */
-#define ipconfigCHECK_IP_QUEUE_SPACE    1
-
-/* Set ipconfigUSE_LLMNR to 1 to include LLMNR. */
-#define ipconfigUSE_LLMNR    0
-
-/* Set ipconfigUSE_NBNS to 1 to include NBNS. */
-#define ipconfigUSE_NBNS    0
-
-/* DHCP servers have a table with information about each clients.  One
- * of the fields in this table contains the host name of the DHCP clients.
- * When 'ipconfigDHCP_REGISTER_HOSTNAME' is defined as non-zero, the DHCP
- * driver will call 'pcApplicationHostnameHook()' to obtain the name of
- * the embedded device.
- */
-#define ipconfigDHCP_REGISTER_HOSTNAME    1
-
-/* The results of DNS lookup's can be stored in a cache table. */
-#define ipconfigUSE_DNS_CACHE    1
-
-/* When ipconfigDRIVER_INCLUDED_RX_IP_CHECKSUM is enabled,
- * the network interface is responsible for checking the checksums
- * of the incoming packets.
- * This can be either done in hardware, or by calling the checksum
- * functions.
- */
-#define ipconfigDRIVER_INCLUDED_RX_IP_CHECKSUM    1
-
-/* The macro 'ipconfigSOCKET_HAS_USER_WAKE_CALLBACK' allows to use a call-back
- * function that will be called at the moment one of the above events occurs.
- * Use the socket option 'FREERTOS_SO_WAKEUP_CALLBACK' to install a function
- * of the type 'void callback( Socket_t pxSocket )'.
- * Note that the call-back function runs in the IP-task, so very little things
- * can be done.  Better not to call any networking API, because that could
- * easily lead to a deadlock situation.
- */
-#define ipconfigSOCKET_HAS_USER_WAKE_CALLBACK    1
-
-/* TCP only: if the 'ipconfigTCP_KEEP_ALIVE' macro is defined as 1,
- * sockets in state "ESTABLISHED" can be protected using keep-alive packets.
- * These packets will be sent as soon as there hasn't been any activity
- * for a while.
- * The macro 'ipconfigTCP_KEEP_ALIVE_INTERVAL' determines the interval at
- * which keep-alive packets are sent.
- */
-#define ipconfigTCP_KEEP_ALIVE    1
-
-#endif /* FREERTOS_IP_CONFIG_H */
diff --git a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/core_http_config.h b/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/core_http_config.h
deleted file mode 100644
index 679a119d..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/core_http_config.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * coreHTTP v3.0.0
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_HTTP_CONFIG_H_
-#define CORE_HTTP_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging config definition and header files inclusion are required in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for HTTP.
- * 3. Include the header file "logging_stack.h", if logging is enabled for HTTP.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the HTTP library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "HTTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_HTTP_CONFIG_ */
\ No newline at end of file
diff --git a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/core_mqtt_agent_config.h b/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/core_mqtt_agent_config.h
deleted file mode 100644
index 9cb54017..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/core_mqtt_agent_config.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * coreMQTT Agent v1.2.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_mqtt_agent_config.h
- * @brief This represents the default values for the configuration macros
- * for the MQTT-Agent library.
- */
-
-#ifndef CORE_MQTT_AGENT_CONFIG_H_
-#define CORE_MQTT_AGENT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT Agent.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT_Agent"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
- /**
- * @brief Maximum time MQTT agent waits in the queue for any pending MQTT
- * operations.
- *
- * The wait time is kept smallest possible to increase the responsiveness of
- * MQTT agent while processing  pending MQTT operations as well as receive
- * packets from network.
- */
-#define MQTT_AGENT_MAX_EVENT_QUEUE_WAIT_TIME    ( 50U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_AGENT_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/core_mqtt_config.h b/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/core_mqtt_config.h
deleted file mode 100644
index 6222626b..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/core_mqtt_config.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * coreMQTT v2.1.1
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_MQTT_CONFIG_H_
-#define CORE_MQTT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief The maximum duration between non-empty network reads while
-* receiving an MQTT packet via the #MQTT_ProcessLoop or #MQTT_ReceiveLoop
-* API functions.
-*
-* When an incoming MQTT packet is detected, the transport receive function
-* may be called multiple times until all of the expected number of bytes of the
-* packet are received. This timeout represents the maximum polling duration that
-* is allowed without any data reception from the network for the incoming packet.
-*
-* If the timeout expires, the #MQTT_ProcessLoop and #MQTT_ReceiveLoop functions
-* return #MQTTRecvFailed.
-*
-* @note If a dummy implementation of the #MQTTGetCurrentTimeFunc_t timer function,
-* is supplied to the library, then #MQTT_RECV_POLLING_TIMEOUT_MS MUST be set to 0.
-*
-* <b>Possible values:</b> Any positive 32 bit integer. Recommended to use a
-* small timeout value. <br>
-* <b>Default value:</b> `10`
-*
-*/
-#define MQTT_RECV_POLLING_TIMEOUT_MS    ( 1000U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/core_pkcs11_config.h b/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/core_pkcs11_config.h
deleted file mode 100644
index e18f347c..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/core_pkcs11_config.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * corePKCS11 v3.5.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_pkcs11_config.h
- * @brief List of configuration macros for the corePKCS11 library along with
- * their custom values.
- */
-
-#ifndef CORE_PKCS11_CONFIG_H_
-#define CORE_PKCS11_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for PKCS #11.
- * 3. Include the header file "logging_stack.h", if logging is enabled for PKCS #11.
- */
-#include "logging_levels.h"
-
-/* Logging configuration for the PKCS #11 library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "PKCS11"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_ERROR
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief Maximum number of sessions that can be stored
-* by the PKCS #11 module.
-*
-* @note The windows test port has an abnormally large value in order to have
-* enough sessions to successfully run all the model based PKCS #11 tests.
-*
-* <b>Possible values:</b> Any positive integer.<br>
-* <b>Default value:</b> 10
-*/
-#define pkcs11configMAX_NUM_OBJECTS    8
-
-/**
-* @brief Set to 1 if a PAL destroy object is implemented.
-*
-* If set to 0, no PAL destroy object is implemented, and this functionality
-* is implemented in the common PKCS #11 layer.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configPAL_DESTROY_SUPPORTED    1
-
-/**
-* @brief Set to 1 if OTA image verification via PKCS #11 module is supported.
-*
-* If set to 0, OTA code signing certificate is built in via
-* aws_ota_codesigner_certificate.h.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configOTA_SUPPORTED    1
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* CORE_PKCS11_CONFIG_H_ include guard. */
diff --git a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/core_sntp_config.h b/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/core_sntp_config.h
deleted file mode 100644
index a6303826..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/core_sntp_config.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * coreSNTP v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_sntp_config.h
- * @brief This file represents the custom values for the configuration macros
- * of the coreSNTP library.
- */
-
-#ifndef CORE_SNTP_CONFIG_H_
-#define CORE_SNTP_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for SNTP.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "SNTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef CORE_SNTP_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/defender_config.h b/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/defender_config.h
deleted file mode 100644
index d0b3d8e4..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/defender_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Defender Client v1.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file defender_config.h
- * @brief Custom config values for the AWS IoT Device Defender Client Library.
- */
-
-#ifndef DEFENDER_CONFIG_H_
-#define DEFENDER_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for Device Defender.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "Defender"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* DEFENDER_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/demo_config.h b/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/demo_config.h
deleted file mode 100644
index a8c8de2d..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/demo_config.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * FreeRTOS V202111.00
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * https://www.FreeRTOS.org
- * https://github.com/FreeRTOS
- *
- */
-
-#ifndef DEMO_CONFIG_H
-#define DEMO_CONFIG_H
-
-/* FreeRTOS include. */
-#include "FreeRTOS.h"
-#include "aws_clientcredential.h"
-#include "aws_clientcredential_keys.h"
-#include "iot_default_root_certificates.h"
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for DEMO.
- * 3. Include the header file "logging_stack.h", if logging is enabled for DEMO.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Demo. */
-#ifndef LIBRARY_LOG_NAME
-#define LIBRARY_LOG_NAME    "MQTTDemo"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-#define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "iot_logging_task.h"
-
-
-/* Select a combination of demos to run
- * These demo has not been evaluated outside of the combination of demos listed below.
- *
- *          PUBSUB demo only :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB and OTA over MQTT demo :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (1)
- *          PUBSUB and OTA over MQTT demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (1)
- */
-/* demo is configured for PUBSUB */
-/* Select demo combination to run. */
-
-/* Please select a provisioning method
- * (0) : Pre-provisioning
- * (1) : Fleet provisioning
- */
-#define ENABLE_FLEET_PROVISIONING_DEMO      (1)
-
-/* Please select whether to enable or disable the OTA demo
- * (0) : OTA demo is disabled
- * (1) : OTA over MQTT demo is enabled
- */
-#define ENABLE_OTA_UPDATE_DEMO              (0)
-
-#define democonfigROOT_CA_PEM               tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief Path of the file containing the provisioning claim certificate. This
- * certificate is used to connect to AWS IoT Core and use Fleet Provisioning
- * APIs to provision the client device. This is used for the "Provisioning by
- * Claim" provisioning workflow.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This certificate should be PEM-encoded. The certificate should be
- * registered on AWS IoT Core beforehand. It should have an AWS IoT policy to
- * allow it to access only the Fleet Provisioning APIs. An example policy for
- * the claim certificates for this demo is available in the
- * example_claim_policy.json file in the demo directory. In the example,
- * replace <aws-region> with your AWS region, <aws-account-id> with your
- * account ID, and <template-name> with the name of your provisioning template.
- *
- */
-#define democonfigCLAIM_CERT_PEM            "...insert here..."
-
-/**
- * @brief Path of the file containing the provisioning claim private key. This
- * key corresponds to the provisioning claim certificate and is used to
- * authenticate with AWS IoT for provisioning by claim.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This private key should be PEM-encoded.
- *
- */
-#define democonfigCLAIM_PRIVATE_KEY_PEM     "...insert here..."
-
-/**
- * @brief An option to disable Server Name Indication.
- *
- * @note When using a local Mosquitto server setup, SNI needs to be disabled
- * for an MQTT broker that only has an IP address but no hostname. However,
- * SNI should be enabled whenever possible.
- */
-#define democonfigDISABLE_SNI                ( pdFALSE )
-
-/**
- * @brief Configuration that indicates if the demo connection is made to the AWS IoT Core MQTT broker.
- *
- * If username/password based authentication is used, the demo will use appropriate TLS ALPN and
- * SNI configurations as required for the Custom Authentication feature of AWS IoT.
- * For more information, refer to the following documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/custom-auth.html#custom-auth-mqtt
- *
- * #define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
- */
-#define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
-
-/**
- * @brief The unique ID used by the demo to differentiate instances.
- *
- *!!! Please note a #defined constant is used for convenience of demonstration
- *!!! only.  Production devices can use something unique to the device that can
- *!!! be read by software, such as a production serial number, instead of a
- *!!! hard coded constant.
- */
-#define democonfigFP_DEMO_ID    "FPDemoID"
-
-/**
- * @brief The MQTT client identifier used in this example.  Each client identifier
- * must be unique so edit as required to ensure no two clients connecting to the
- * same broker use the same client identifier.
- *
- * @note Appending __TIME__ to the client id string will reduce the possibility of a
- * client id collision in the broker. Note that the appended time is the compilation
- * time. This client id can cause collision, if more than one instance of the same
- * binary is used at the same time to connect to the broker.
- */
-#ifndef democonfigCLIENT_IDENTIFIER
-#if (ENABLE_FLEET_PROVISIONING_DEMO == 1)
-    #define democonfigCLIENT_IDENTIFIER    "client"democonfigFP_DEMO_ID
-#else
-    #define democonfigCLIENT_IDENTIFIER    clientcredentialIOT_THING_NAME
-#endif
-#endif
-
-/**
- * @brief Details of the MQTT broker to connect to.
- *
- * This is the Claim's Rest API Endpoint for AWS IoT.
- *
- * @note Your AWS IoT Core endpoint can be found in the AWS IoT console under
- * Settings/Custom Endpoint, or using the describe-endpoint API.
- *
- */
-#define democonfigMQTT_BROKER_ENDPOINT     clientcredentialMQTT_BROKER_ENDPOINT
-
-/**
- * @brief AWS IoT MQTT broker port number.
- *
- * In general, port 8883 is for secured MQTT connections.
- *
- * @note Port 443 requires use of the ALPN TLS extension with the ALPN protocol
- * name. When using port 8883, ALPN is not required.
- */
-#define democonfigMQTT_BROKER_PORT    ( clientcredentialMQTT_BROKER_PORT )
-
-/**
- * @brief Name of the provisioning template to use for the RegisterThing
- * portion of the Fleet Provisioning workflow.
- *
- * For information about provisioning templates, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-template.html#fleet-provision-template
- *
- * The example template used for this demo is available in the
- * example_demo_template.json file in the DemoSetup directory. In the example,
- * replace <provisioned-thing-policy> with the policy provisioned devices
- * should have.  The demo template uses Fn::Join to construct the Thing name by
- * concatenating fp_demo_ and the serial number sent by the demo.
- *
- * @note The provisioning template MUST be created in AWS IoT before running the
- * demo.
- *
- * @note If you followed the manual setup steps on https://freertos.org/iot-fleet-provisioning/demo.html,
- * the provisioning template name is "FleetProvisioningDemoTemplate".
- * However, if you used CloudFormation to set up the demo, the template name is "CF_FleetProvisioningDemoTemplate"
- */
- #define democonfigPROVISIONING_TEMPLATE_NAME    "...insert here..."
-
-/**
- * @brief Subject name to use when creating the certificate signing request (CSR)
- * for provisioning the demo client with using the Fleet Provisioning
- * CreateCertificateFromCsr APIs.
- *
- * This is passed to MbedTLS; see https://tls.mbed.org/api/x509__csr_8h.html#a954eae166b125cea2115b7db8c896e90
- */
-#ifndef democonfigCSR_SUBJECT_NAME
-    #define democonfigCSR_SUBJECT_NAME    "CN="democonfigFP_DEMO_ID
-#endif
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_STACKSIZE        configMINIMAL_STACK_SIZE * 3
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_TASK_PRIORITY    ( tskIDLE_PRIORITY + 1 )
-
-#define democonfigNETWORK_BUFFER_SIZE    ( configMINIMAL_STACK_SIZE * 3 )
-
-#include "core_mqtt.h" /* Include coreMQTT header for MQTT_LIBRARY_VERSION macro. */
-#define democonfigMQTT_LIB    "core-mqtt@"MQTT_LIBRARY_VERSION
-
-#define democonfigDISABLE_SNI       ( pdFALSE )
-
-/**
- * @brief ALPN (Application-Layer Protocol Negotiation) protocol name for AWS IoT MQTT.
- *
- * This will be used if democonfigMQTT_BROKER_PORT is configured as 443 for the AWS IoT MQTT broker.
- * Please see more details about the ALPN protocol for AWS IoT MQTT endpoint
- * in the link below.
- * https://aws.amazon.com/blogs/iot/mqtt-with-tls-client-authentication-on-port-443-why-it-is-useful-and-how-it-works/
- */
-#define AWS_IOT_MQTT_ALPN           "\x0ex-amzn-mqtt-ca"
-
-/**
- * @brief This is the ALPN (Application-Layer Protocol Negotiation) string
- * required by AWS IoT for password-based authentication using TCP port 443.
- */
-#define AWS_IOT_CUSTOM_AUTH_ALPN    "\x04mqtt"
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-/**
- * @brief The name of the operating system that the application is running on.
- * The current value is given as an example. Please update for your specific
- * operating system.
- */
-#define democonfigOS_NAME       "FreeRTOS"
-
-/**
- * @brief The version of the operating system that the application is running
- * on. The current value is given as an example. Please update for your specific
- * operating system version.
- */
-#define democonfigOS_VERSION    "V10.4.3"
-
-/**
- * @brief The name of the hardware platform the application is running on. The
- * current value is given as an example. Please update for your specific
- * hardware platform.
- */
-#define democonfigHARDWARE_PLATFORM_NAME    "CK-RX65N"
-
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING                                 \
-    "?SDK=" democonfigOS_NAME "&Version=" democonfigOS_VERSION \
-    "&MQTTLib=" democonfigMQTT_LIB
-
-/**
- * @brief The length of the MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING_LENGTH    ( ( uint16_t ) ( sizeof( AWS_IOT_METRICS_STRING ) - 1 ) )
-
-
-#ifdef democonfigCLIENT_USERNAME
-
-/**
- * @brief Append the username with the metrics string if #democonfigCLIENT_USERNAME is defined.
- *
- * This is to support both metrics reporting and username/password based client
- * authentication by AWS IoT.
- */
-#define CLIENT_USERNAME_WITH_METRICS    democonfigCLIENT_USERNAME AWS_IOT_METRICS_STRING
-#endif
-
-/**
- * @brief Flag to enable or disable provisioning mode for the demo.
- * Enabling the flags starts a CLI task, so that user can perform provisioning of the device through
- * a serial terminal. Provisioning involves running commands to fetch or set the PKI and configuration
- * information for the device to connect to broker and perform OTA updates. Disabling the flag results
- * in disabling the CLI task and execution of the demo tasks in normal device operation mode.
- */
-#define appmainPROVISIONING_MODE                  ( 1 )
-
-/**
- * @brief Certificate used for validating code signing signatures in the OTA PAL.
- */
-#ifndef otapalconfigCODE_SIGNING_CERTIFICATE
-    #define otapalconfigCODE_SIGNING_CERTIFICATE    "Insert code signing certificate..."
-#endif
-
-/**
- * @brief Major version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MAJOR
-    #define APP_VERSION_MAJOR    0
-#endif
-
-/**
- * @brief Minor version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MINOR
-    #define APP_VERSION_MINOR    9
-#endif
-
-/**
- * @brief Build version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_BUILD
-    #define APP_VERSION_BUILD    2
-#endif
-
-/**
- * @brief Server's root CA certificate.
- *
- * This certificate is used to identify the AWS IoT server and is publicly
- * available. Refer to the AWS documentation available in the link below for
- * information about the Server Root CAs.
- * https://docs.aws.amazon.com/iot/latest/developerguide/server-authentication.html#server-authentication-certs
- *
- * @note The TI C3220 Launchpad board requires that the Root CA have its
- * certificate self-signed. As mentioned in the above link, the Amazon Root CAs
- * are cross-signed by the Starfield Root CA. Thus, ONLY the Starfield Root CA
- * can be used to connect to the ATS endpoints on AWS IoT for the TI board.
- *
- * @note This certificate should be PEM-encoded.
- *
- * Must include the PEM header and footer:
- * "-----BEGIN CERTIFICATE-----\n"\
- * "...base64 data...\n"\
- * "-----END CERTIFICATE-----\n"
- *
- */
-#define democonfigROOT_CA_PEM                   tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief The length of the queue used to hold commands for the agent.
- */
-#define MQTT_AGENT_COMMAND_QUEUE_LENGTH         ( 25 )
-
-/**
- * @brief Dimensions the buffer used to serialise and deserialise MQTT packets.
- * @note Specified in bytes.  Must be large enough to hold the maximum
- * anticipated MQTT payload.
- */
-#define MQTT_AGENT_NETWORK_BUFFER_SIZE          ( 5000 )
-
-#define MQTT_COMMAND_CONTEXTS_POOL_SIZE              ( 10 )
-
-#endif /* DEMO_CONFIG_H */
diff --git a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/fleet_provisioning_config.h b/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/fleet_provisioning_config.h
deleted file mode 100644
index 68b85d66..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/fleet_provisioning_config.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * AWS IoT Fleet Provisioning v1.1.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file fleet_provisioning_config.h
- * @brief Custom config values for the AWS IoT Fleet Provisioning Library.
- */
-
-#ifndef FLEET_PROVISIONING_CONFIG_H_
-#define FLEET_PROVISIONING_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for Fleet Provisioning.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Fleet Provisioning library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "FleetProvisioning"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-/************ End of logging configuration ****************/
-
-#endif /* ifndef FLEET_PROVISIONING_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/rm_littlefs_flash_config.h b/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/rm_littlefs_flash_config.h
deleted file mode 100644
index 94207ffa..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/rm_littlefs_flash_config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/***********************************************************************************************************************
- * Copyright 2023 Renesas Electronics Corporation and/or its affiliates.  All Rights Reserved.
- *
- * This software and documentation are supplied by Renesas Electronics America Inc. and may only be used with products
- * of Renesas Electronics Corp. and its affiliates ("Renesas").  No other uses are authorized.  Renesas products are
- * sold pursuant to Renesas terms and conditions of sale.  Purchasers are solely responsible for the selection and use
- * of Renesas products and Renesas assumes no liability.  No license, express or implied, to any intellectual property
- * right is granted by Renesas. This software is protected under all applicable laws, including copyright laws. Renesas
- * reserves the right to change or discontinue this software and/or this documentation. THE SOFTWARE AND DOCUMENTATION
- * IS DELIVERED TO YOU "AS IS," AND RENESAS MAKES NO REPRESENTATIONS OR WARRANTIES, AND TO THE FULLEST EXTENT
- * PERMISSIBLE UNDER APPLICABLE LAW, DISCLAIMS ALL WARRANTIES, WHETHER EXPLICITLY OR IMPLICITLY, INCLUDING WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT, WITH RESPECT TO THE SOFTWARE OR
- * DOCUMENTATION.  RENESAS SHALL HAVE NO LIABILITY ARISING OUT OF ANY SECURITY VULNERABILITY OR BREACH.  TO THE MAXIMUM
- * EXTENT PERMITTED BY LAW, IN NO EVENT WILL RENESAS BE LIABLE TO YOU IN CONNECTION WITH THE SOFTWARE OR DOCUMENTATION
- * (OR ANY PERSON OR ENTITY CLAIMING RIGHTS DERIVED FROM YOU) FOR ANY LOSS, DAMAGES, OR CLAIMS WHATSOEVER, INCLUDING,
- * WITHOUT LIMITATION, ANY DIRECT, CONSEQUENTIAL, SPECIAL, INDIRECT, PUNITIVE, OR INCIDENTAL DAMAGES; ANY LOST PROFITS,
- * OTHER ECONOMIC DAMAGE, PROPERTY DAMAGE, OR PERSONAL INJURY; AND EVEN IF RENESAS HAS BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH LOSS, DAMAGES, CLAIMS OR COSTS.
- **********************************************************************************************************************/
-
-#ifndef FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-#define FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-
-/***********************************************************************************************************************
- * Includes
- **********************************************************************************************************************/
-#include "rm_littlefs_df_rx65n.h"
-
-#define LFS_FLASH_READ_SIZE				(1)
-#define LFS_FLASH_PROGRAM_SIZE			(4)
-#define LFS_FLASH_BLOCK_SIZE			(128)
-#define LFS_FLASH_BLOCK_COUNT			(70)
-#define RM_LITTLEFS_FLASH_DATA_START	FLASH_DF_BLOCK_0_MACRO
-
-#if LFS_FLASH_BLOCK_SIZE*LFS_FLASH_BLOCK_COUNT + (RM_LITTLEFS_FLASH_DATA_START - FLASH_DF_BLOCK_0_MACRO) > BSP_DATA_FLASH_SIZE_BYTES
-#error "Too many blocks"
-#endif
-
-#endif /* FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/shadow_config.h b/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/shadow_config.h
deleted file mode 100644
index aa948c12..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/shadow_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Shadow v1.3.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file shadow_config.h
- * @brief This represents the custom values for the configuration macros
- * for the Shadow library.
- */
-
-#ifndef SHADOW_CONFIG_H_
-#define SHADOW_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SHADOW"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef SHADOW_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/sigv4_config.h b/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/sigv4_config.h
deleted file mode 100644
index ba277a79..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/ether/src/frtos_config/sigv4_config.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * SigV4 Library v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file sigv4_config.h
- * @brief The custom values for configuration macros used by the SigV4 Library.
- */
-
-#ifndef SIGV4_CONFIG_H_
-#define SIGV4_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SIGV4"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef SIGV4_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/wifi/linker_section_sample.esi b/Configuration/samples/fleetps/ck-rx65n/wifi/linker_section_sample.esi
deleted file mode 100644
index 3371ded6..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/wifi/linker_section_sample.esi
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<com.renesas.linkersection.model:SectionContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:com.renesas.linkersection.model="http:///LinkerSection.ecore">
-  <sections name="SU">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4"/>
-  </sections>
-  <sections name="SI"/>
-  <sections name="R_1"/>
-  <sections name="B_2"/>
-  <sections name="R"/>
-  <sections name="RPFRAM2"/>
-  <sections name="C_LITTLEFS_MANAGEMENT_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1048576"/>
-  </sections>
-  <sections name="C_USER_APPLICATION_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1057536"/>
-  </sections>
-  <sections name="B">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="8388608"/>
-  </sections>
-  <sections name="B_1"/>
-  <sections name="R_2"/>
-  <sections name="PResetPRG">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4293919488"/>
-  </sections>
-  <sections name="C_1"/>
-  <sections name="C_2"/>
-  <sections name="C"/>
-  <sections name="C$*"/>
-  <sections name="D*"/>
-  <sections name="W*"/>
-  <sections name="L"/>
-  <sections name="P"/>
-  <sections name="PFRAM2"/>
-  <sections name="EXCEPTVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294967168"/>
-  </sections>
-  <sections name="RESETVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294967292"/>
-  </sections>
-</com.renesas.linkersection.model:SectionContainer>
diff --git a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/FreeRTOSConfig.h b/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/FreeRTOSConfig.h
deleted file mode 100644
index 5662a8c2..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/FreeRTOSConfig.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * FreeRTOS Kernel V10.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * http://aws.amazon.com/freertos
- * http://www.FreeRTOS.org
- */
-
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
-
-
-/* Unity includes. */
-#if defined(FREERTOS_ENABLE_UNIT_TESTS)
-#include "unity_internals.h"
-#elif defined(ENABLE_UNIT_TESTS)
-#include "unity.h"
-#endif
-
-/*-----------------------------------------------------------
-* Application specific definitions.
-*
-* These definitions should be adjusted for your particular hardware and
-* application requirements.
-*
-* THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
-* FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
-* http://www.freertos.org/a00110.html
-*
-* The bottom of this file contains some constants specific to running the UDP
-* stack in this demo.  Constants specific to FreeRTOS+TCP itself (rather than
-* the demo) are contained in FreeRTOSIPConfig.h.
-*----------------------------------------------------------*/
-#define configENABLE_BACKWARD_COMPATIBILITY        1
-#define configUSE_PREEMPTION                       1
-#define configUSE_PORT_OPTIMISED_TASK_SELECTION    0
-#define configMAX_PRIORITIES                       (7)
-#define configTICK_RATE_HZ                         (( TickType_t ) 1000)
-#define configMINIMAL_STACK_SIZE                   (768)
-#define configTOTAL_HEAP_SIZE_N						(256)
-#define configTOTAL_HEAP_SIZE                      (( size_t ) ( configTOTAL_HEAP_SIZE_N * 1024 ))
-#define configMAX_TASK_NAME_LEN                    (12)
-#define configUSE_TRACE_FACILITY                   1
-#define configUSE_16_BIT_TICKS                     0
-#define configIDLE_SHOULD_YIELD                    1
-#define configUSE_CO_ROUTINES                      0
-#define configUSE_MUTEXES                          1
-#define configUSE_RECURSIVE_MUTEXES                1
-#define configQUEUE_REGISTRY_SIZE                  0
-#define configUSE_APPLICATION_TASK_TAG             0
-#define configUSE_COUNTING_SEMAPHORES              1
-#define configUSE_ALTERNATIVE_API                  0
-#define configNUM_THREAD_LOCAL_STORAGE_POINTERS    3      /* FreeRTOS+FAT requires 2 pointers if a CWD is supported. */
-#define configRECORD_STACK_HIGH_ADDRESS            1
-
-#define configUSE_DAEMON_TASK_STARTUP_HOOK 1
-
-#define configCPU_CLOCK_HZ				(BSP_ICLK_HZ)
-#define configPERIPHERAL_CLOCK_HZ		(BSP_PCLKB_HZ)
-#define configUSE_QUEUE_SETS			1
-
-/* Hook function related definitions. */
-#define configUSE_TICK_HOOK                        1
-#define configUSE_IDLE_HOOK                        1
-#define configUSE_MALLOC_FAILED_HOOK               1
-#define configCHECK_FOR_STACK_OVERFLOW             2      /* Not applicable to the Win32 port. */
-
-/* Software timer related definitions. */
-#define configUSE_TIMERS                           1
-#define configTIMER_TASK_PRIORITY                  (6)
-#define configTIMER_QUEUE_LENGTH                   5
-#define configTIMER_TASK_STACK_DEPTH               (configMINIMAL_STACK_SIZE)
-
-/* The interrupt priority used by the kernel itself for the tick interrupt and
-the pended interrupt.  This would normally be the lowest priority. */
-#define configKERNEL_INTERRUPT_PRIORITY         1
-
-/* The maximum interrupt priority from which FreeRTOS API calls can be made.
-Interrupts that use a priority above this will not be effected by anything the
-kernel is doing. */
-#define configMAX_SYSCALL_INTERRUPT_PRIORITY    4
-
-/* The peripheral used to generate the tick interrupt is configured as part of
-the application code.  This constant should be set to the vector number of the
-peripheral chosen.  As supplied this is CMT0. */
-#define configTICK_VECTOR						_CMT0_CMI0		//CMT0
-//#define configTICK_VECTOR						_CMT1_CMI1		//CMT1
-//#define configTICK_VECTOR						_CMT2_CMI2		//CMT2
-//#define configTICK_VECTOR						_CMT3_CMI3		//CMT3
-
-/* Event group related definitions. */
-#define configUSE_EVENT_GROUPS                     1
-
-/* Run time stats gathering definitions. */
-unsigned long ulGetRunTimeCounterValue( void );
-void vConfigureTimerForRunTimeStats( void );
-#define configGENERATE_RUN_TIME_STATS    0
-//#define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS()    vConfigureTimerForRunTimeStats()
-//#define portGET_RUN_TIME_COUNTER_VALUE()            ulGetRunTimeCounterValue()
-
-/* Co-routine definitions. */
-#define configUSE_CO_ROUTINES                   0
-#define configMAX_CO_ROUTINE_PRIORITIES         (2)
-
-/* Currently the TCP/IP stack is using dynamic allocation, and the MQTT task is
- * using static allocation. */
-#define configSUPPORT_DYNAMIC_ALLOCATION        1
-#define configSUPPORT_STATIC_ALLOCATION         1
-
-/* Set the following definitions to 1 to include the API function, or zero
- * to exclude the API function. */
-#define INCLUDE_vTaskPrioritySet                1
-#define INCLUDE_uxTaskPriorityGet               1
-#define INCLUDE_vTaskDelete                     1
-#define INCLUDE_vTaskCleanUpResources           0
-#define INCLUDE_vTaskSuspend                    1
-#define INCLUDE_vTaskDelayUntil                 1
-#define INCLUDE_vTaskDelay                      1
-#define INCLUDE_uxTaskGetStackHighWaterMark     1
-#define INCLUDE_xTaskGetSchedulerState          1
-#define INCLUDE_xTimerGetTimerTaskHandle        0
-#define INCLUDE_xTaskGetIdleTaskHandle          0
-#define INCLUDE_xQueueGetMutexHolder            1
-#define INCLUDE_eTaskGetState                   1
-#define INCLUDE_xEventGroupSetBitsFromISR       1
-#define INCLUDE_xTimerPendFunctionCall          1
-#define INCLUDE_xTaskGetCurrentTaskHandle       1
-#define INCLUDE_xTaskAbortDelay                 1
-
-/* This demo makes use of one or more example stats formatting functions.  These
- * format the raw data provided by the uxTaskGetSystemState() function in to human
- * readable ASCII form.  See the notes in the implementation of vTaskList() within
- * FreeRTOS/Source/tasks.c for limitations.  configUSE_STATS_FORMATTING_FUNCTIONS
- * is set to 2 so the formatting functions are included without the stdio.h being
- * included in tasks.c.  That is because this project defines its own sprintf()
- * functions. */
-#define configUSE_STATS_FORMATTING_FUNCTIONS    1
-
-#if defined(ENABLE_UNIT_TESTS) || defined(FREERTOS_ENABLE_UNIT_TESTS)
-/* unity testing */
-#define configASSERT( x ) do { if( ( x ) == 0 ) TEST_ABORT(); } while( 0 )
-#elif defined(CONFIG_FREERTOS_ASSERT_DISABLE) || defined(NDEBUG)
-/* Disable Assert call for release builds. */
-#define configASSERT( x ) ( ( void ) 0 )
-#else /* CONFIG_FREERTOS_ASSERT_FAIL_ABORT or nothing */
-/* Assert call defined for debug builds. */
-extern void vAssertCalled( void );
-#define configASSERT( x ) do { if( ( x ) == 0 ) vAssertCalled(); } while( 0 )
-#endif
-
-/* The function that implements FreeRTOS printf style output, and the macro
- * that maps the configPRINTF() macros to that function. */
-extern void vLoggingPrintf( const char * pcFormat, ... );
-#define configPRINTF( X )    vLoggingPrintf X
-
-/* Non-format version thread-safe print */
-extern void vLoggingPrint( const char * pcMessage );
-#define configPRINT( X )     vLoggingPrint( X )
-
-extern void vOutputString( const char * pcMessage );
-/* Map the logging task's printf to the board specific output function. */
-#define configPRINT_STRING( x )    vOutputString(x)
-
-/* Sets the length of the buffers into which logging messages are written - so
- * also defines the maximum length of each log message. */
-#define configLOGGING_MAX_MESSAGE_LENGTH            192
-
-/* Set to 1 to prepend each log message with a message number, the task name,
- * and a time stamp. */
-#define configLOGGING_INCLUDE_TIME_AND_TASK_NAME    1
-
-/* Application specific definitions follow. **********************************/
-
-/* If configINCLUDE_DEMO_DEBUG_STATS is set to one, then a few basic IP trace
- * macros are defined to gather some UDP stack statistics that can then be viewed
- * through the CLI interface. */
-#define configINCLUDE_DEMO_DEBUG_STATS       1
-
-/* The size of the global output buffer that is available for use when there
- * are multiple command interpreters running at once (for example, one on a UART
- * and one on TCP/IP).  This is done to prevent an output buffer being defined by
- * each implementation - which would waste RAM.  In this case, there is only one
- * command interpreter running, and it has its own local output buffer, so the
- * global buffer is just set to be one byte long as it is not used and should not
- * take up unnecessary RAM. */
-#define configCOMMAND_INT_MAX_OUTPUT_SIZE    850
-
-/* Only used when running in the FreeRTOS Windows simulator.  Defines the
- * priority of the task used to simulate Ethernet interrupts. */
-#define configMAC_ISR_SIMULATOR_PRIORITY     ( configMAX_PRIORITIES - 1 )
-
-/* This demo creates a virtual network connection by accessing the raw Ethernet
- * or WiFi data to and from a real network connection.  Many computers have more
- * than one real network port, and configNETWORK_INTERFACE_TO_USE is used to tell
- * the demo which real port should be used to create the virtual port.  The ports
- * available are displayed on the console when the application is executed.  For
- * example, on my development laptop setting configNETWORK_INTERFACE_TO_USE to 4
- * results in the wired network being used, while setting
- * configNETWORK_INTERFACE_TO_USE to 2 results in the wireless network being
- * used. */
-#define configNETWORK_INTERFACE_TO_USE       2L
-
-/* The address of an echo server that will be used by the two demo echo client
- * tasks:
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_Echo_Clients.html,
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/UDP_Echo_Clients.html. */
-#define configECHO_SERVER_ADDR0              192
-#define configECHO_SERVER_ADDR1              168
-#define configECHO_SERVER_ADDR2              1
-#define configECHO_SERVER_ADDR3              200
-#define configTCP_ECHO_CLIENT_PORT           9999
-
-/* Default MAC address configuration.  The demo creates a virtual network
- * connection that uses this MAC address by accessing the raw Ethernet/WiFi data
- * to and from a real network connection on the host PC.  See the
- * configNETWORK_INTERFACE_TO_USE definition above for information on how to
- * configure the real network connection to use. */
-#define configMAC_ADDR0                      0x74
-#define configMAC_ADDR1                      0x90
-#define configMAC_ADDR2                      0x50
-#define configMAC_ADDR3                      0x00
-#define configMAC_ADDR4                      0x79
-#define configMAC_ADDR5                      0x03
-
-/* Default IP address configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configIP_ADDR0                       192
-#define configIP_ADDR1                       168
-#define configIP_ADDR2                       11
-#define configIP_ADDR3                       12
-
-/* Default gateway IP address configuration.  Used in ipconfigUSE_DHCP is set to
- * 0, or ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configGATEWAY_ADDR0                  172
-#define configGATEWAY_ADDR1                  27
-#define configGATEWAY_ADDR2                  49
-#define configGATEWAY_ADDR3                  1
-
-/* Default DNS server configuration.  OpenDNS addresses are 208.67.222.222 and
- * 208.67.220.220.  Used in ipconfigUSE_DHCP is set to 0, or ipconfigUSE_DHCP is
- * set to 1 but a DNS server cannot be contacted.*/
-#define configDNS_SERVER_ADDR0               143
-#define configDNS_SERVER_ADDR1               103
-#define configDNS_SERVER_ADDR2               47
-#define configDNS_SERVER_ADDR3               193
-
-/* Default netmask configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configNET_MASK0                      255
-#define configNET_MASK1                      255
-#define configNET_MASK2                      255
-#define configNET_MASK3                      0
-
-/* The UDP port to which print messages are sent. */
-#define configPRINT_PORT                     ( 15000 )
-
-#define configPROFILING                      ( 0 )
-
-/* Pseudo random number generater used by some demo tasks. */
-uint32_t ulRand(void);
-#define configRAND32()    ulRand()
-
-/* The platform FreeRTOS is running on. */
-#define configPLATFORM_NAME    "RenesasRX65N"
-
-/* Header required for the tracealyzer recorder library. */
-//#include "trcRecorder.h"
-
-/* When the FIT configurator or the Smart Configurator is used, platform.h has to be used. */
-#define configINCLUDE_PLATFORM_H_INSTEAD_OF_IODEFINE_H  1
-
-#endif /* FREERTOS_CONFIG_H */
diff --git a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/core_http_config.h b/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/core_http_config.h
deleted file mode 100644
index 679a119d..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/core_http_config.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * coreHTTP v3.0.0
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_HTTP_CONFIG_H_
-#define CORE_HTTP_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging config definition and header files inclusion are required in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for HTTP.
- * 3. Include the header file "logging_stack.h", if logging is enabled for HTTP.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the HTTP library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "HTTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_HTTP_CONFIG_ */
\ No newline at end of file
diff --git a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/core_mqtt_agent_config.h b/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/core_mqtt_agent_config.h
deleted file mode 100644
index 9cb54017..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/core_mqtt_agent_config.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * coreMQTT Agent v1.2.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_mqtt_agent_config.h
- * @brief This represents the default values for the configuration macros
- * for the MQTT-Agent library.
- */
-
-#ifndef CORE_MQTT_AGENT_CONFIG_H_
-#define CORE_MQTT_AGENT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT Agent.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT_Agent"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
- /**
- * @brief Maximum time MQTT agent waits in the queue for any pending MQTT
- * operations.
- *
- * The wait time is kept smallest possible to increase the responsiveness of
- * MQTT agent while processing  pending MQTT operations as well as receive
- * packets from network.
- */
-#define MQTT_AGENT_MAX_EVENT_QUEUE_WAIT_TIME    ( 50U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_AGENT_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/core_mqtt_config.h b/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/core_mqtt_config.h
deleted file mode 100644
index 6222626b..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/core_mqtt_config.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * coreMQTT v2.1.1
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_MQTT_CONFIG_H_
-#define CORE_MQTT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief The maximum duration between non-empty network reads while
-* receiving an MQTT packet via the #MQTT_ProcessLoop or #MQTT_ReceiveLoop
-* API functions.
-*
-* When an incoming MQTT packet is detected, the transport receive function
-* may be called multiple times until all of the expected number of bytes of the
-* packet are received. This timeout represents the maximum polling duration that
-* is allowed without any data reception from the network for the incoming packet.
-*
-* If the timeout expires, the #MQTT_ProcessLoop and #MQTT_ReceiveLoop functions
-* return #MQTTRecvFailed.
-*
-* @note If a dummy implementation of the #MQTTGetCurrentTimeFunc_t timer function,
-* is supplied to the library, then #MQTT_RECV_POLLING_TIMEOUT_MS MUST be set to 0.
-*
-* <b>Possible values:</b> Any positive 32 bit integer. Recommended to use a
-* small timeout value. <br>
-* <b>Default value:</b> `10`
-*
-*/
-#define MQTT_RECV_POLLING_TIMEOUT_MS    ( 1000U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/core_pkcs11_config.h b/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/core_pkcs11_config.h
deleted file mode 100644
index e18f347c..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/core_pkcs11_config.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * corePKCS11 v3.5.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_pkcs11_config.h
- * @brief List of configuration macros for the corePKCS11 library along with
- * their custom values.
- */
-
-#ifndef CORE_PKCS11_CONFIG_H_
-#define CORE_PKCS11_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for PKCS #11.
- * 3. Include the header file "logging_stack.h", if logging is enabled for PKCS #11.
- */
-#include "logging_levels.h"
-
-/* Logging configuration for the PKCS #11 library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "PKCS11"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_ERROR
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief Maximum number of sessions that can be stored
-* by the PKCS #11 module.
-*
-* @note The windows test port has an abnormally large value in order to have
-* enough sessions to successfully run all the model based PKCS #11 tests.
-*
-* <b>Possible values:</b> Any positive integer.<br>
-* <b>Default value:</b> 10
-*/
-#define pkcs11configMAX_NUM_OBJECTS    8
-
-/**
-* @brief Set to 1 if a PAL destroy object is implemented.
-*
-* If set to 0, no PAL destroy object is implemented, and this functionality
-* is implemented in the common PKCS #11 layer.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configPAL_DESTROY_SUPPORTED    1
-
-/**
-* @brief Set to 1 if OTA image verification via PKCS #11 module is supported.
-*
-* If set to 0, OTA code signing certificate is built in via
-* aws_ota_codesigner_certificate.h.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configOTA_SUPPORTED    1
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* CORE_PKCS11_CONFIG_H_ include guard. */
diff --git a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/core_sntp_config.h b/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/core_sntp_config.h
deleted file mode 100644
index a6303826..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/core_sntp_config.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * coreSNTP v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_sntp_config.h
- * @brief This file represents the custom values for the configuration macros
- * of the coreSNTP library.
- */
-
-#ifndef CORE_SNTP_CONFIG_H_
-#define CORE_SNTP_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for SNTP.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "SNTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef CORE_SNTP_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/defender_config.h b/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/defender_config.h
deleted file mode 100644
index d0b3d8e4..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/defender_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Defender Client v1.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file defender_config.h
- * @brief Custom config values for the AWS IoT Device Defender Client Library.
- */
-
-#ifndef DEFENDER_CONFIG_H_
-#define DEFENDER_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for Device Defender.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "Defender"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* DEFENDER_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/demo_config.h b/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/demo_config.h
deleted file mode 100644
index a8c8de2d..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/demo_config.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * FreeRTOS V202111.00
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * https://www.FreeRTOS.org
- * https://github.com/FreeRTOS
- *
- */
-
-#ifndef DEMO_CONFIG_H
-#define DEMO_CONFIG_H
-
-/* FreeRTOS include. */
-#include "FreeRTOS.h"
-#include "aws_clientcredential.h"
-#include "aws_clientcredential_keys.h"
-#include "iot_default_root_certificates.h"
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for DEMO.
- * 3. Include the header file "logging_stack.h", if logging is enabled for DEMO.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Demo. */
-#ifndef LIBRARY_LOG_NAME
-#define LIBRARY_LOG_NAME    "MQTTDemo"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-#define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "iot_logging_task.h"
-
-
-/* Select a combination of demos to run
- * These demo has not been evaluated outside of the combination of demos listed below.
- *
- *          PUBSUB demo only :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB and OTA over MQTT demo :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (1)
- *          PUBSUB and OTA over MQTT demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (1)
- */
-/* demo is configured for PUBSUB */
-/* Select demo combination to run. */
-
-/* Please select a provisioning method
- * (0) : Pre-provisioning
- * (1) : Fleet provisioning
- */
-#define ENABLE_FLEET_PROVISIONING_DEMO      (1)
-
-/* Please select whether to enable or disable the OTA demo
- * (0) : OTA demo is disabled
- * (1) : OTA over MQTT demo is enabled
- */
-#define ENABLE_OTA_UPDATE_DEMO              (0)
-
-#define democonfigROOT_CA_PEM               tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief Path of the file containing the provisioning claim certificate. This
- * certificate is used to connect to AWS IoT Core and use Fleet Provisioning
- * APIs to provision the client device. This is used for the "Provisioning by
- * Claim" provisioning workflow.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This certificate should be PEM-encoded. The certificate should be
- * registered on AWS IoT Core beforehand. It should have an AWS IoT policy to
- * allow it to access only the Fleet Provisioning APIs. An example policy for
- * the claim certificates for this demo is available in the
- * example_claim_policy.json file in the demo directory. In the example,
- * replace <aws-region> with your AWS region, <aws-account-id> with your
- * account ID, and <template-name> with the name of your provisioning template.
- *
- */
-#define democonfigCLAIM_CERT_PEM            "...insert here..."
-
-/**
- * @brief Path of the file containing the provisioning claim private key. This
- * key corresponds to the provisioning claim certificate and is used to
- * authenticate with AWS IoT for provisioning by claim.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This private key should be PEM-encoded.
- *
- */
-#define democonfigCLAIM_PRIVATE_KEY_PEM     "...insert here..."
-
-/**
- * @brief An option to disable Server Name Indication.
- *
- * @note When using a local Mosquitto server setup, SNI needs to be disabled
- * for an MQTT broker that only has an IP address but no hostname. However,
- * SNI should be enabled whenever possible.
- */
-#define democonfigDISABLE_SNI                ( pdFALSE )
-
-/**
- * @brief Configuration that indicates if the demo connection is made to the AWS IoT Core MQTT broker.
- *
- * If username/password based authentication is used, the demo will use appropriate TLS ALPN and
- * SNI configurations as required for the Custom Authentication feature of AWS IoT.
- * For more information, refer to the following documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/custom-auth.html#custom-auth-mqtt
- *
- * #define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
- */
-#define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
-
-/**
- * @brief The unique ID used by the demo to differentiate instances.
- *
- *!!! Please note a #defined constant is used for convenience of demonstration
- *!!! only.  Production devices can use something unique to the device that can
- *!!! be read by software, such as a production serial number, instead of a
- *!!! hard coded constant.
- */
-#define democonfigFP_DEMO_ID    "FPDemoID"
-
-/**
- * @brief The MQTT client identifier used in this example.  Each client identifier
- * must be unique so edit as required to ensure no two clients connecting to the
- * same broker use the same client identifier.
- *
- * @note Appending __TIME__ to the client id string will reduce the possibility of a
- * client id collision in the broker. Note that the appended time is the compilation
- * time. This client id can cause collision, if more than one instance of the same
- * binary is used at the same time to connect to the broker.
- */
-#ifndef democonfigCLIENT_IDENTIFIER
-#if (ENABLE_FLEET_PROVISIONING_DEMO == 1)
-    #define democonfigCLIENT_IDENTIFIER    "client"democonfigFP_DEMO_ID
-#else
-    #define democonfigCLIENT_IDENTIFIER    clientcredentialIOT_THING_NAME
-#endif
-#endif
-
-/**
- * @brief Details of the MQTT broker to connect to.
- *
- * This is the Claim's Rest API Endpoint for AWS IoT.
- *
- * @note Your AWS IoT Core endpoint can be found in the AWS IoT console under
- * Settings/Custom Endpoint, or using the describe-endpoint API.
- *
- */
-#define democonfigMQTT_BROKER_ENDPOINT     clientcredentialMQTT_BROKER_ENDPOINT
-
-/**
- * @brief AWS IoT MQTT broker port number.
- *
- * In general, port 8883 is for secured MQTT connections.
- *
- * @note Port 443 requires use of the ALPN TLS extension with the ALPN protocol
- * name. When using port 8883, ALPN is not required.
- */
-#define democonfigMQTT_BROKER_PORT    ( clientcredentialMQTT_BROKER_PORT )
-
-/**
- * @brief Name of the provisioning template to use for the RegisterThing
- * portion of the Fleet Provisioning workflow.
- *
- * For information about provisioning templates, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-template.html#fleet-provision-template
- *
- * The example template used for this demo is available in the
- * example_demo_template.json file in the DemoSetup directory. In the example,
- * replace <provisioned-thing-policy> with the policy provisioned devices
- * should have.  The demo template uses Fn::Join to construct the Thing name by
- * concatenating fp_demo_ and the serial number sent by the demo.
- *
- * @note The provisioning template MUST be created in AWS IoT before running the
- * demo.
- *
- * @note If you followed the manual setup steps on https://freertos.org/iot-fleet-provisioning/demo.html,
- * the provisioning template name is "FleetProvisioningDemoTemplate".
- * However, if you used CloudFormation to set up the demo, the template name is "CF_FleetProvisioningDemoTemplate"
- */
- #define democonfigPROVISIONING_TEMPLATE_NAME    "...insert here..."
-
-/**
- * @brief Subject name to use when creating the certificate signing request (CSR)
- * for provisioning the demo client with using the Fleet Provisioning
- * CreateCertificateFromCsr APIs.
- *
- * This is passed to MbedTLS; see https://tls.mbed.org/api/x509__csr_8h.html#a954eae166b125cea2115b7db8c896e90
- */
-#ifndef democonfigCSR_SUBJECT_NAME
-    #define democonfigCSR_SUBJECT_NAME    "CN="democonfigFP_DEMO_ID
-#endif
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_STACKSIZE        configMINIMAL_STACK_SIZE * 3
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_TASK_PRIORITY    ( tskIDLE_PRIORITY + 1 )
-
-#define democonfigNETWORK_BUFFER_SIZE    ( configMINIMAL_STACK_SIZE * 3 )
-
-#include "core_mqtt.h" /* Include coreMQTT header for MQTT_LIBRARY_VERSION macro. */
-#define democonfigMQTT_LIB    "core-mqtt@"MQTT_LIBRARY_VERSION
-
-#define democonfigDISABLE_SNI       ( pdFALSE )
-
-/**
- * @brief ALPN (Application-Layer Protocol Negotiation) protocol name for AWS IoT MQTT.
- *
- * This will be used if democonfigMQTT_BROKER_PORT is configured as 443 for the AWS IoT MQTT broker.
- * Please see more details about the ALPN protocol for AWS IoT MQTT endpoint
- * in the link below.
- * https://aws.amazon.com/blogs/iot/mqtt-with-tls-client-authentication-on-port-443-why-it-is-useful-and-how-it-works/
- */
-#define AWS_IOT_MQTT_ALPN           "\x0ex-amzn-mqtt-ca"
-
-/**
- * @brief This is the ALPN (Application-Layer Protocol Negotiation) string
- * required by AWS IoT for password-based authentication using TCP port 443.
- */
-#define AWS_IOT_CUSTOM_AUTH_ALPN    "\x04mqtt"
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-/**
- * @brief The name of the operating system that the application is running on.
- * The current value is given as an example. Please update for your specific
- * operating system.
- */
-#define democonfigOS_NAME       "FreeRTOS"
-
-/**
- * @brief The version of the operating system that the application is running
- * on. The current value is given as an example. Please update for your specific
- * operating system version.
- */
-#define democonfigOS_VERSION    "V10.4.3"
-
-/**
- * @brief The name of the hardware platform the application is running on. The
- * current value is given as an example. Please update for your specific
- * hardware platform.
- */
-#define democonfigHARDWARE_PLATFORM_NAME    "CK-RX65N"
-
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING                                 \
-    "?SDK=" democonfigOS_NAME "&Version=" democonfigOS_VERSION \
-    "&MQTTLib=" democonfigMQTT_LIB
-
-/**
- * @brief The length of the MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING_LENGTH    ( ( uint16_t ) ( sizeof( AWS_IOT_METRICS_STRING ) - 1 ) )
-
-
-#ifdef democonfigCLIENT_USERNAME
-
-/**
- * @brief Append the username with the metrics string if #democonfigCLIENT_USERNAME is defined.
- *
- * This is to support both metrics reporting and username/password based client
- * authentication by AWS IoT.
- */
-#define CLIENT_USERNAME_WITH_METRICS    democonfigCLIENT_USERNAME AWS_IOT_METRICS_STRING
-#endif
-
-/**
- * @brief Flag to enable or disable provisioning mode for the demo.
- * Enabling the flags starts a CLI task, so that user can perform provisioning of the device through
- * a serial terminal. Provisioning involves running commands to fetch or set the PKI and configuration
- * information for the device to connect to broker and perform OTA updates. Disabling the flag results
- * in disabling the CLI task and execution of the demo tasks in normal device operation mode.
- */
-#define appmainPROVISIONING_MODE                  ( 1 )
-
-/**
- * @brief Certificate used for validating code signing signatures in the OTA PAL.
- */
-#ifndef otapalconfigCODE_SIGNING_CERTIFICATE
-    #define otapalconfigCODE_SIGNING_CERTIFICATE    "Insert code signing certificate..."
-#endif
-
-/**
- * @brief Major version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MAJOR
-    #define APP_VERSION_MAJOR    0
-#endif
-
-/**
- * @brief Minor version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MINOR
-    #define APP_VERSION_MINOR    9
-#endif
-
-/**
- * @brief Build version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_BUILD
-    #define APP_VERSION_BUILD    2
-#endif
-
-/**
- * @brief Server's root CA certificate.
- *
- * This certificate is used to identify the AWS IoT server and is publicly
- * available. Refer to the AWS documentation available in the link below for
- * information about the Server Root CAs.
- * https://docs.aws.amazon.com/iot/latest/developerguide/server-authentication.html#server-authentication-certs
- *
- * @note The TI C3220 Launchpad board requires that the Root CA have its
- * certificate self-signed. As mentioned in the above link, the Amazon Root CAs
- * are cross-signed by the Starfield Root CA. Thus, ONLY the Starfield Root CA
- * can be used to connect to the ATS endpoints on AWS IoT for the TI board.
- *
- * @note This certificate should be PEM-encoded.
- *
- * Must include the PEM header and footer:
- * "-----BEGIN CERTIFICATE-----\n"\
- * "...base64 data...\n"\
- * "-----END CERTIFICATE-----\n"
- *
- */
-#define democonfigROOT_CA_PEM                   tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief The length of the queue used to hold commands for the agent.
- */
-#define MQTT_AGENT_COMMAND_QUEUE_LENGTH         ( 25 )
-
-/**
- * @brief Dimensions the buffer used to serialise and deserialise MQTT packets.
- * @note Specified in bytes.  Must be large enough to hold the maximum
- * anticipated MQTT payload.
- */
-#define MQTT_AGENT_NETWORK_BUFFER_SIZE          ( 5000 )
-
-#define MQTT_COMMAND_CONTEXTS_POOL_SIZE              ( 10 )
-
-#endif /* DEMO_CONFIG_H */
diff --git a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/fleet_provisioning_config.h b/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/fleet_provisioning_config.h
deleted file mode 100644
index 68b85d66..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/fleet_provisioning_config.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * AWS IoT Fleet Provisioning v1.1.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file fleet_provisioning_config.h
- * @brief Custom config values for the AWS IoT Fleet Provisioning Library.
- */
-
-#ifndef FLEET_PROVISIONING_CONFIG_H_
-#define FLEET_PROVISIONING_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for Fleet Provisioning.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Fleet Provisioning library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "FleetProvisioning"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-/************ End of logging configuration ****************/
-
-#endif /* ifndef FLEET_PROVISIONING_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/rm_littlefs_flash_config.h b/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/rm_littlefs_flash_config.h
deleted file mode 100644
index 94207ffa..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/rm_littlefs_flash_config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/***********************************************************************************************************************
- * Copyright 2023 Renesas Electronics Corporation and/or its affiliates.  All Rights Reserved.
- *
- * This software and documentation are supplied by Renesas Electronics America Inc. and may only be used with products
- * of Renesas Electronics Corp. and its affiliates ("Renesas").  No other uses are authorized.  Renesas products are
- * sold pursuant to Renesas terms and conditions of sale.  Purchasers are solely responsible for the selection and use
- * of Renesas products and Renesas assumes no liability.  No license, express or implied, to any intellectual property
- * right is granted by Renesas. This software is protected under all applicable laws, including copyright laws. Renesas
- * reserves the right to change or discontinue this software and/or this documentation. THE SOFTWARE AND DOCUMENTATION
- * IS DELIVERED TO YOU "AS IS," AND RENESAS MAKES NO REPRESENTATIONS OR WARRANTIES, AND TO THE FULLEST EXTENT
- * PERMISSIBLE UNDER APPLICABLE LAW, DISCLAIMS ALL WARRANTIES, WHETHER EXPLICITLY OR IMPLICITLY, INCLUDING WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT, WITH RESPECT TO THE SOFTWARE OR
- * DOCUMENTATION.  RENESAS SHALL HAVE NO LIABILITY ARISING OUT OF ANY SECURITY VULNERABILITY OR BREACH.  TO THE MAXIMUM
- * EXTENT PERMITTED BY LAW, IN NO EVENT WILL RENESAS BE LIABLE TO YOU IN CONNECTION WITH THE SOFTWARE OR DOCUMENTATION
- * (OR ANY PERSON OR ENTITY CLAIMING RIGHTS DERIVED FROM YOU) FOR ANY LOSS, DAMAGES, OR CLAIMS WHATSOEVER, INCLUDING,
- * WITHOUT LIMITATION, ANY DIRECT, CONSEQUENTIAL, SPECIAL, INDIRECT, PUNITIVE, OR INCIDENTAL DAMAGES; ANY LOST PROFITS,
- * OTHER ECONOMIC DAMAGE, PROPERTY DAMAGE, OR PERSONAL INJURY; AND EVEN IF RENESAS HAS BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH LOSS, DAMAGES, CLAIMS OR COSTS.
- **********************************************************************************************************************/
-
-#ifndef FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-#define FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-
-/***********************************************************************************************************************
- * Includes
- **********************************************************************************************************************/
-#include "rm_littlefs_df_rx65n.h"
-
-#define LFS_FLASH_READ_SIZE				(1)
-#define LFS_FLASH_PROGRAM_SIZE			(4)
-#define LFS_FLASH_BLOCK_SIZE			(128)
-#define LFS_FLASH_BLOCK_COUNT			(70)
-#define RM_LITTLEFS_FLASH_DATA_START	FLASH_DF_BLOCK_0_MACRO
-
-#if LFS_FLASH_BLOCK_SIZE*LFS_FLASH_BLOCK_COUNT + (RM_LITTLEFS_FLASH_DATA_START - FLASH_DF_BLOCK_0_MACRO) > BSP_DATA_FLASH_SIZE_BYTES
-#error "Too many blocks"
-#endif
-
-#endif /* FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/shadow_config.h b/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/shadow_config.h
deleted file mode 100644
index aa948c12..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/shadow_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Shadow v1.3.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file shadow_config.h
- * @brief This represents the custom values for the configuration macros
- * for the Shadow library.
- */
-
-#ifndef SHADOW_CONFIG_H_
-#define SHADOW_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SHADOW"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef SHADOW_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/sigv4_config.h b/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/sigv4_config.h
deleted file mode 100644
index ba277a79..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/sigv4_config.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * SigV4 Library v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file sigv4_config.h
- * @brief The custom values for configuration macros used by the SigV4 Library.
- */
-
-#ifndef SIGV4_CONFIG_H_
-#define SIGV4_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SIGV4"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef SIGV4_CONFIG_H_ */
diff --git a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/user_tcp_hook_config.h b/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/user_tcp_hook_config.h
deleted file mode 100644
index abe7b80b..00000000
--- a/Configuration/samples/fleetps/ck-rx65n/wifi/src/frtos_config/user_tcp_hook_config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**********************************************************************************************************************
- * Copyright (C) 2023 Renesas Electronics Corporation. All rights reserved.
- *
- * DISCLAIMER
- * This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
- * other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
- * applicable laws, including copyright laws.
- * THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
- * THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
- * EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
- * SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS
- * SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
- * this software. By using this software, you agree to the additional terms and conditions found by accessing the
- * following link:
- * http://www.renesas.com/disclaimer
- *********************************************************************************************************************/
-
-#ifndef FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_
-#define FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_
-
-/* The limit of number for WIFI_ERR_MODULE_COM when it comes continuously.
- * If counter is over than this limit, hook the reset */
-#define USER_COMM_ERROR_TRIES		3
-
-/*Connection retry limit*/
-#define USER_RECONNECT_TRIES 		3
-
-/*Socket closing retry limit*/
-#define USER_CLOSE_SOCKET_TRIES		3
-
-/*Enable SocketErrorHook*/
-#define USER_TCP_HOOK_ENABLED   	1 /* Default */
-
-#endif /* FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/cellular/linker_section_sample.esi b/Configuration/samples/pso/ck-rx65n/cellular/linker_section_sample.esi
deleted file mode 100644
index 49300ec4..00000000
--- a/Configuration/samples/pso/ck-rx65n/cellular/linker_section_sample.esi
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<com.renesas.linkersection.model:SectionContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:com.renesas.linkersection.model="http:///LinkerSection.ecore">
-  <sections name="SU">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4"/>
-  </sections>
-  <sections name="SI"/>
-  <sections name="R_1"/>
-  <sections name="B_2"/>
-  <sections name="R"/>
-  <sections name="RPFRAM2"/>
-  <sections name="C_LITTLEFS_MANAGEMENT_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1048576"/>
-  </sections>
-  <sections name="C_USER_APPLICATION_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1057536"/>
-  </sections>
-  <sections name="B">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="8388608"/>
-  </sections>
-  <sections name="B_1"/>
-  <sections name="R_2"/>
-  <sections name="PResetPRG">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4293919488"/>
-  </sections>
-  <sections name="C_1"/>
-  <sections name="C_2"/>
-  <sections name="C"/>
-  <sections name="C$*"/>
-  <sections name="D*"/>
-  <sections name="W*"/>
-  <sections name="L"/>
-  <sections name="P"/>
-  <sections name="PFRAM2"/>
-  <sections name="EXCEPTVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294901632"/>
-  </sections>
-  <sections name="RESETVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294901756"/>
-  </sections>
-</com.renesas.linkersection.model:SectionContainer>
diff --git a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/FreeRTOSConfig.h b/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/FreeRTOSConfig.h
deleted file mode 100644
index 5662a8c2..00000000
--- a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/FreeRTOSConfig.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * FreeRTOS Kernel V10.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * http://aws.amazon.com/freertos
- * http://www.FreeRTOS.org
- */
-
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
-
-
-/* Unity includes. */
-#if defined(FREERTOS_ENABLE_UNIT_TESTS)
-#include "unity_internals.h"
-#elif defined(ENABLE_UNIT_TESTS)
-#include "unity.h"
-#endif
-
-/*-----------------------------------------------------------
-* Application specific definitions.
-*
-* These definitions should be adjusted for your particular hardware and
-* application requirements.
-*
-* THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
-* FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
-* http://www.freertos.org/a00110.html
-*
-* The bottom of this file contains some constants specific to running the UDP
-* stack in this demo.  Constants specific to FreeRTOS+TCP itself (rather than
-* the demo) are contained in FreeRTOSIPConfig.h.
-*----------------------------------------------------------*/
-#define configENABLE_BACKWARD_COMPATIBILITY        1
-#define configUSE_PREEMPTION                       1
-#define configUSE_PORT_OPTIMISED_TASK_SELECTION    0
-#define configMAX_PRIORITIES                       (7)
-#define configTICK_RATE_HZ                         (( TickType_t ) 1000)
-#define configMINIMAL_STACK_SIZE                   (768)
-#define configTOTAL_HEAP_SIZE_N						(256)
-#define configTOTAL_HEAP_SIZE                      (( size_t ) ( configTOTAL_HEAP_SIZE_N * 1024 ))
-#define configMAX_TASK_NAME_LEN                    (12)
-#define configUSE_TRACE_FACILITY                   1
-#define configUSE_16_BIT_TICKS                     0
-#define configIDLE_SHOULD_YIELD                    1
-#define configUSE_CO_ROUTINES                      0
-#define configUSE_MUTEXES                          1
-#define configUSE_RECURSIVE_MUTEXES                1
-#define configQUEUE_REGISTRY_SIZE                  0
-#define configUSE_APPLICATION_TASK_TAG             0
-#define configUSE_COUNTING_SEMAPHORES              1
-#define configUSE_ALTERNATIVE_API                  0
-#define configNUM_THREAD_LOCAL_STORAGE_POINTERS    3      /* FreeRTOS+FAT requires 2 pointers if a CWD is supported. */
-#define configRECORD_STACK_HIGH_ADDRESS            1
-
-#define configUSE_DAEMON_TASK_STARTUP_HOOK 1
-
-#define configCPU_CLOCK_HZ				(BSP_ICLK_HZ)
-#define configPERIPHERAL_CLOCK_HZ		(BSP_PCLKB_HZ)
-#define configUSE_QUEUE_SETS			1
-
-/* Hook function related definitions. */
-#define configUSE_TICK_HOOK                        1
-#define configUSE_IDLE_HOOK                        1
-#define configUSE_MALLOC_FAILED_HOOK               1
-#define configCHECK_FOR_STACK_OVERFLOW             2      /* Not applicable to the Win32 port. */
-
-/* Software timer related definitions. */
-#define configUSE_TIMERS                           1
-#define configTIMER_TASK_PRIORITY                  (6)
-#define configTIMER_QUEUE_LENGTH                   5
-#define configTIMER_TASK_STACK_DEPTH               (configMINIMAL_STACK_SIZE)
-
-/* The interrupt priority used by the kernel itself for the tick interrupt and
-the pended interrupt.  This would normally be the lowest priority. */
-#define configKERNEL_INTERRUPT_PRIORITY         1
-
-/* The maximum interrupt priority from which FreeRTOS API calls can be made.
-Interrupts that use a priority above this will not be effected by anything the
-kernel is doing. */
-#define configMAX_SYSCALL_INTERRUPT_PRIORITY    4
-
-/* The peripheral used to generate the tick interrupt is configured as part of
-the application code.  This constant should be set to the vector number of the
-peripheral chosen.  As supplied this is CMT0. */
-#define configTICK_VECTOR						_CMT0_CMI0		//CMT0
-//#define configTICK_VECTOR						_CMT1_CMI1		//CMT1
-//#define configTICK_VECTOR						_CMT2_CMI2		//CMT2
-//#define configTICK_VECTOR						_CMT3_CMI3		//CMT3
-
-/* Event group related definitions. */
-#define configUSE_EVENT_GROUPS                     1
-
-/* Run time stats gathering definitions. */
-unsigned long ulGetRunTimeCounterValue( void );
-void vConfigureTimerForRunTimeStats( void );
-#define configGENERATE_RUN_TIME_STATS    0
-//#define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS()    vConfigureTimerForRunTimeStats()
-//#define portGET_RUN_TIME_COUNTER_VALUE()            ulGetRunTimeCounterValue()
-
-/* Co-routine definitions. */
-#define configUSE_CO_ROUTINES                   0
-#define configMAX_CO_ROUTINE_PRIORITIES         (2)
-
-/* Currently the TCP/IP stack is using dynamic allocation, and the MQTT task is
- * using static allocation. */
-#define configSUPPORT_DYNAMIC_ALLOCATION        1
-#define configSUPPORT_STATIC_ALLOCATION         1
-
-/* Set the following definitions to 1 to include the API function, or zero
- * to exclude the API function. */
-#define INCLUDE_vTaskPrioritySet                1
-#define INCLUDE_uxTaskPriorityGet               1
-#define INCLUDE_vTaskDelete                     1
-#define INCLUDE_vTaskCleanUpResources           0
-#define INCLUDE_vTaskSuspend                    1
-#define INCLUDE_vTaskDelayUntil                 1
-#define INCLUDE_vTaskDelay                      1
-#define INCLUDE_uxTaskGetStackHighWaterMark     1
-#define INCLUDE_xTaskGetSchedulerState          1
-#define INCLUDE_xTimerGetTimerTaskHandle        0
-#define INCLUDE_xTaskGetIdleTaskHandle          0
-#define INCLUDE_xQueueGetMutexHolder            1
-#define INCLUDE_eTaskGetState                   1
-#define INCLUDE_xEventGroupSetBitsFromISR       1
-#define INCLUDE_xTimerPendFunctionCall          1
-#define INCLUDE_xTaskGetCurrentTaskHandle       1
-#define INCLUDE_xTaskAbortDelay                 1
-
-/* This demo makes use of one or more example stats formatting functions.  These
- * format the raw data provided by the uxTaskGetSystemState() function in to human
- * readable ASCII form.  See the notes in the implementation of vTaskList() within
- * FreeRTOS/Source/tasks.c for limitations.  configUSE_STATS_FORMATTING_FUNCTIONS
- * is set to 2 so the formatting functions are included without the stdio.h being
- * included in tasks.c.  That is because this project defines its own sprintf()
- * functions. */
-#define configUSE_STATS_FORMATTING_FUNCTIONS    1
-
-#if defined(ENABLE_UNIT_TESTS) || defined(FREERTOS_ENABLE_UNIT_TESTS)
-/* unity testing */
-#define configASSERT( x ) do { if( ( x ) == 0 ) TEST_ABORT(); } while( 0 )
-#elif defined(CONFIG_FREERTOS_ASSERT_DISABLE) || defined(NDEBUG)
-/* Disable Assert call for release builds. */
-#define configASSERT( x ) ( ( void ) 0 )
-#else /* CONFIG_FREERTOS_ASSERT_FAIL_ABORT or nothing */
-/* Assert call defined for debug builds. */
-extern void vAssertCalled( void );
-#define configASSERT( x ) do { if( ( x ) == 0 ) vAssertCalled(); } while( 0 )
-#endif
-
-/* The function that implements FreeRTOS printf style output, and the macro
- * that maps the configPRINTF() macros to that function. */
-extern void vLoggingPrintf( const char * pcFormat, ... );
-#define configPRINTF( X )    vLoggingPrintf X
-
-/* Non-format version thread-safe print */
-extern void vLoggingPrint( const char * pcMessage );
-#define configPRINT( X )     vLoggingPrint( X )
-
-extern void vOutputString( const char * pcMessage );
-/* Map the logging task's printf to the board specific output function. */
-#define configPRINT_STRING( x )    vOutputString(x)
-
-/* Sets the length of the buffers into which logging messages are written - so
- * also defines the maximum length of each log message. */
-#define configLOGGING_MAX_MESSAGE_LENGTH            192
-
-/* Set to 1 to prepend each log message with a message number, the task name,
- * and a time stamp. */
-#define configLOGGING_INCLUDE_TIME_AND_TASK_NAME    1
-
-/* Application specific definitions follow. **********************************/
-
-/* If configINCLUDE_DEMO_DEBUG_STATS is set to one, then a few basic IP trace
- * macros are defined to gather some UDP stack statistics that can then be viewed
- * through the CLI interface. */
-#define configINCLUDE_DEMO_DEBUG_STATS       1
-
-/* The size of the global output buffer that is available for use when there
- * are multiple command interpreters running at once (for example, one on a UART
- * and one on TCP/IP).  This is done to prevent an output buffer being defined by
- * each implementation - which would waste RAM.  In this case, there is only one
- * command interpreter running, and it has its own local output buffer, so the
- * global buffer is just set to be one byte long as it is not used and should not
- * take up unnecessary RAM. */
-#define configCOMMAND_INT_MAX_OUTPUT_SIZE    850
-
-/* Only used when running in the FreeRTOS Windows simulator.  Defines the
- * priority of the task used to simulate Ethernet interrupts. */
-#define configMAC_ISR_SIMULATOR_PRIORITY     ( configMAX_PRIORITIES - 1 )
-
-/* This demo creates a virtual network connection by accessing the raw Ethernet
- * or WiFi data to and from a real network connection.  Many computers have more
- * than one real network port, and configNETWORK_INTERFACE_TO_USE is used to tell
- * the demo which real port should be used to create the virtual port.  The ports
- * available are displayed on the console when the application is executed.  For
- * example, on my development laptop setting configNETWORK_INTERFACE_TO_USE to 4
- * results in the wired network being used, while setting
- * configNETWORK_INTERFACE_TO_USE to 2 results in the wireless network being
- * used. */
-#define configNETWORK_INTERFACE_TO_USE       2L
-
-/* The address of an echo server that will be used by the two demo echo client
- * tasks:
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_Echo_Clients.html,
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/UDP_Echo_Clients.html. */
-#define configECHO_SERVER_ADDR0              192
-#define configECHO_SERVER_ADDR1              168
-#define configECHO_SERVER_ADDR2              1
-#define configECHO_SERVER_ADDR3              200
-#define configTCP_ECHO_CLIENT_PORT           9999
-
-/* Default MAC address configuration.  The demo creates a virtual network
- * connection that uses this MAC address by accessing the raw Ethernet/WiFi data
- * to and from a real network connection on the host PC.  See the
- * configNETWORK_INTERFACE_TO_USE definition above for information on how to
- * configure the real network connection to use. */
-#define configMAC_ADDR0                      0x74
-#define configMAC_ADDR1                      0x90
-#define configMAC_ADDR2                      0x50
-#define configMAC_ADDR3                      0x00
-#define configMAC_ADDR4                      0x79
-#define configMAC_ADDR5                      0x03
-
-/* Default IP address configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configIP_ADDR0                       192
-#define configIP_ADDR1                       168
-#define configIP_ADDR2                       11
-#define configIP_ADDR3                       12
-
-/* Default gateway IP address configuration.  Used in ipconfigUSE_DHCP is set to
- * 0, or ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configGATEWAY_ADDR0                  172
-#define configGATEWAY_ADDR1                  27
-#define configGATEWAY_ADDR2                  49
-#define configGATEWAY_ADDR3                  1
-
-/* Default DNS server configuration.  OpenDNS addresses are 208.67.222.222 and
- * 208.67.220.220.  Used in ipconfigUSE_DHCP is set to 0, or ipconfigUSE_DHCP is
- * set to 1 but a DNS server cannot be contacted.*/
-#define configDNS_SERVER_ADDR0               143
-#define configDNS_SERVER_ADDR1               103
-#define configDNS_SERVER_ADDR2               47
-#define configDNS_SERVER_ADDR3               193
-
-/* Default netmask configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configNET_MASK0                      255
-#define configNET_MASK1                      255
-#define configNET_MASK2                      255
-#define configNET_MASK3                      0
-
-/* The UDP port to which print messages are sent. */
-#define configPRINT_PORT                     ( 15000 )
-
-#define configPROFILING                      ( 0 )
-
-/* Pseudo random number generater used by some demo tasks. */
-uint32_t ulRand(void);
-#define configRAND32()    ulRand()
-
-/* The platform FreeRTOS is running on. */
-#define configPLATFORM_NAME    "RenesasRX65N"
-
-/* Header required for the tracealyzer recorder library. */
-//#include "trcRecorder.h"
-
-/* When the FIT configurator or the Smart Configurator is used, platform.h has to be used. */
-#define configINCLUDE_PLATFORM_H_INSTEAD_OF_IODEFINE_H  1
-
-#endif /* FREERTOS_CONFIG_H */
diff --git a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/core_http_config.h b/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/core_http_config.h
deleted file mode 100644
index 1a2c82e0..00000000
--- a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/core_http_config.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * coreHTTP v3.0.0
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_HTTP_CONFIG_H_
-#define CORE_HTTP_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging config definition and header files inclusion are required in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for HTTP.
- * 3. Include the header file "logging_stack.h", if logging is enabled for HTTP.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the HTTP library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "HTTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_HTTP_CONFIG_ */
diff --git a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/core_mqtt_agent_config.h b/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/core_mqtt_agent_config.h
deleted file mode 100644
index 9cb54017..00000000
--- a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/core_mqtt_agent_config.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * coreMQTT Agent v1.2.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_mqtt_agent_config.h
- * @brief This represents the default values for the configuration macros
- * for the MQTT-Agent library.
- */
-
-#ifndef CORE_MQTT_AGENT_CONFIG_H_
-#define CORE_MQTT_AGENT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT Agent.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT_Agent"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
- /**
- * @brief Maximum time MQTT agent waits in the queue for any pending MQTT
- * operations.
- *
- * The wait time is kept smallest possible to increase the responsiveness of
- * MQTT agent while processing  pending MQTT operations as well as receive
- * packets from network.
- */
-#define MQTT_AGENT_MAX_EVENT_QUEUE_WAIT_TIME    ( 50U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_AGENT_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/core_mqtt_config.h b/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/core_mqtt_config.h
deleted file mode 100644
index 6222626b..00000000
--- a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/core_mqtt_config.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * coreMQTT v2.1.1
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_MQTT_CONFIG_H_
-#define CORE_MQTT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief The maximum duration between non-empty network reads while
-* receiving an MQTT packet via the #MQTT_ProcessLoop or #MQTT_ReceiveLoop
-* API functions.
-*
-* When an incoming MQTT packet is detected, the transport receive function
-* may be called multiple times until all of the expected number of bytes of the
-* packet are received. This timeout represents the maximum polling duration that
-* is allowed without any data reception from the network for the incoming packet.
-*
-* If the timeout expires, the #MQTT_ProcessLoop and #MQTT_ReceiveLoop functions
-* return #MQTTRecvFailed.
-*
-* @note If a dummy implementation of the #MQTTGetCurrentTimeFunc_t timer function,
-* is supplied to the library, then #MQTT_RECV_POLLING_TIMEOUT_MS MUST be set to 0.
-*
-* <b>Possible values:</b> Any positive 32 bit integer. Recommended to use a
-* small timeout value. <br>
-* <b>Default value:</b> `10`
-*
-*/
-#define MQTT_RECV_POLLING_TIMEOUT_MS    ( 1000U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/core_pkcs11_config.h b/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/core_pkcs11_config.h
deleted file mode 100644
index e18f347c..00000000
--- a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/core_pkcs11_config.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * corePKCS11 v3.5.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_pkcs11_config.h
- * @brief List of configuration macros for the corePKCS11 library along with
- * their custom values.
- */
-
-#ifndef CORE_PKCS11_CONFIG_H_
-#define CORE_PKCS11_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for PKCS #11.
- * 3. Include the header file "logging_stack.h", if logging is enabled for PKCS #11.
- */
-#include "logging_levels.h"
-
-/* Logging configuration for the PKCS #11 library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "PKCS11"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_ERROR
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief Maximum number of sessions that can be stored
-* by the PKCS #11 module.
-*
-* @note The windows test port has an abnormally large value in order to have
-* enough sessions to successfully run all the model based PKCS #11 tests.
-*
-* <b>Possible values:</b> Any positive integer.<br>
-* <b>Default value:</b> 10
-*/
-#define pkcs11configMAX_NUM_OBJECTS    8
-
-/**
-* @brief Set to 1 if a PAL destroy object is implemented.
-*
-* If set to 0, no PAL destroy object is implemented, and this functionality
-* is implemented in the common PKCS #11 layer.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configPAL_DESTROY_SUPPORTED    1
-
-/**
-* @brief Set to 1 if OTA image verification via PKCS #11 module is supported.
-*
-* If set to 0, OTA code signing certificate is built in via
-* aws_ota_codesigner_certificate.h.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configOTA_SUPPORTED    1
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* CORE_PKCS11_CONFIG_H_ include guard. */
diff --git a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/core_sntp_config.h b/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/core_sntp_config.h
deleted file mode 100644
index a6303826..00000000
--- a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/core_sntp_config.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * coreSNTP v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_sntp_config.h
- * @brief This file represents the custom values for the configuration macros
- * of the coreSNTP library.
- */
-
-#ifndef CORE_SNTP_CONFIG_H_
-#define CORE_SNTP_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for SNTP.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "SNTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef CORE_SNTP_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/defender_config.h b/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/defender_config.h
deleted file mode 100644
index d0b3d8e4..00000000
--- a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/defender_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Defender Client v1.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file defender_config.h
- * @brief Custom config values for the AWS IoT Device Defender Client Library.
- */
-
-#ifndef DEFENDER_CONFIG_H_
-#define DEFENDER_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for Device Defender.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "Defender"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* DEFENDER_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/demo_config.h b/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/demo_config.h
deleted file mode 100644
index 3fb828c8..00000000
--- a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/demo_config.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * FreeRTOS V202111.00
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * https://www.FreeRTOS.org
- * https://github.com/FreeRTOS
- *
- */
-
-#ifndef DEMO_CONFIG_H
-#define DEMO_CONFIG_H
-
-/* FreeRTOS include. */
-#include "FreeRTOS.h"
-#include "aws_clientcredential.h"
-#include "aws_clientcredential_keys.h"
-#include "iot_default_root_certificates.h"
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for DEMO.
- * 3. Include the header file "logging_stack.h", if logging is enabled for DEMO.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Demo. */
-#ifndef LIBRARY_LOG_NAME
-#define LIBRARY_LOG_NAME    "MQTTDemo"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-#define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "iot_logging_task.h"
-
-
-/* Select a combination of demos to run
- * These demo has not been evaluated outside of the combination of demos listed below.
- *
- *          PUBSUB demo only :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB and OTA over MQTT demo :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (1)
- *          PUBSUB and OTA over MQTT demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (1)
- */
-/* demo is configured for PUBSUB */
-/* Select demo combination to run. */
-
-/* Please select a provisioning method
- * (0) : Pre-provisioning
- * (1) : Fleet provisioning
- */
-#define ENABLE_FLEET_PROVISIONING_DEMO      (0)
-
-/* Please select whether to enable or disable the OTA demo
- * (0) : OTA demo is disabled
- * (1) : OTA over MQTT demo is enabled
- */
-#define ENABLE_OTA_UPDATE_DEMO              (1)
-
-#define democonfigROOT_CA_PEM               tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief Path of the file containing the provisioning claim certificate. This
- * certificate is used to connect to AWS IoT Core and use Fleet Provisioning
- * APIs to provision the client device. This is used for the "Provisioning by
- * Claim" provisioning workflow.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This certificate should be PEM-encoded. The certificate should be
- * registered on AWS IoT Core beforehand. It should have an AWS IoT policy to
- * allow it to access only the Fleet Provisioning APIs. An example policy for
- * the claim certificates for this demo is available in the
- * example_claim_policy.json file in the demo directory. In the example,
- * replace <aws-region> with your AWS region, <aws-account-id> with your
- * account ID, and <template-name> with the name of your provisioning template.
- *
- */
-#define democonfigCLAIM_CERT_PEM            "...insert here..."
-
-/**
- * @brief Path of the file containing the provisioning claim private key. This
- * key corresponds to the provisioning claim certificate and is used to
- * authenticate with AWS IoT for provisioning by claim.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This private key should be PEM-encoded.
- *
- */
-#define democonfigCLAIM_PRIVATE_KEY_PEM     "...insert here..."
-
-/**
- * @brief An option to disable Server Name Indication.
- *
- * @note When using a local Mosquitto server setup, SNI needs to be disabled
- * for an MQTT broker that only has an IP address but no hostname. However,
- * SNI should be enabled whenever possible.
- */
-#define democonfigDISABLE_SNI                ( pdFALSE )
-
-/**
- * @brief Configuration that indicates if the demo connection is made to the AWS IoT Core MQTT broker.
- *
- * If username/password based authentication is used, the demo will use appropriate TLS ALPN and
- * SNI configurations as required for the Custom Authentication feature of AWS IoT.
- * For more information, refer to the following documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/custom-auth.html#custom-auth-mqtt
- *
- * #define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
- */
-#define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
-
-/**
- * @brief The unique ID used by the demo to differentiate instances.
- *
- *!!! Please note a #defined constant is used for convenience of demonstration
- *!!! only.  Production devices can use something unique to the device that can
- *!!! be read by software, such as a production serial number, instead of a
- *!!! hard coded constant.
- */
-#define democonfigFP_DEMO_ID    "FPDemoID"
-
-/**
- * @brief The MQTT client identifier used in this example.  Each client identifier
- * must be unique so edit as required to ensure no two clients connecting to the
- * same broker use the same client identifier.
- *
- * @note Appending __TIME__ to the client id string will reduce the possibility of a
- * client id collision in the broker. Note that the appended time is the compilation
- * time. This client id can cause collision, if more than one instance of the same
- * binary is used at the same time to connect to the broker.
- */
-#ifndef democonfigCLIENT_IDENTIFIER
-#if (ENABLE_FLEET_PROVISIONING_DEMO == 1)
-    #define democonfigCLIENT_IDENTIFIER    "client"democonfigFP_DEMO_ID
-#else
-    #define democonfigCLIENT_IDENTIFIER    clientcredentialIOT_THING_NAME
-#endif
-#endif
-
-/**
- * @brief Details of the MQTT broker to connect to.
- *
- * This is the Claim's Rest API Endpoint for AWS IoT.
- *
- * @note Your AWS IoT Core endpoint can be found in the AWS IoT console under
- * Settings/Custom Endpoint, or using the describe-endpoint API.
- *
- */
-#define democonfigMQTT_BROKER_ENDPOINT     clientcredentialMQTT_BROKER_ENDPOINT
-
-/**
- * @brief AWS IoT MQTT broker port number.
- *
- * In general, port 8883 is for secured MQTT connections.
- *
- * @note Port 443 requires use of the ALPN TLS extension with the ALPN protocol
- * name. When using port 8883, ALPN is not required.
- */
-#define democonfigMQTT_BROKER_PORT    ( clientcredentialMQTT_BROKER_PORT )
-
-/**
- * @brief Name of the provisioning template to use for the RegisterThing
- * portion of the Fleet Provisioning workflow.
- *
- * For information about provisioning templates, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-template.html#fleet-provision-template
- *
- * The example template used for this demo is available in the
- * example_demo_template.json file in the DemoSetup directory. In the example,
- * replace <provisioned-thing-policy> with the policy provisioned devices
- * should have.  The demo template uses Fn::Join to construct the Thing name by
- * concatenating fp_demo_ and the serial number sent by the demo.
- *
- * @note The provisioning template MUST be created in AWS IoT before running the
- * demo.
- *
- * @note If you followed the manual setup steps on https://freertos.org/iot-fleet-provisioning/demo.html,
- * the provisioning template name is "FleetProvisioningDemoTemplate".
- * However, if you used CloudFormation to set up the demo, the template name is "CF_FleetProvisioningDemoTemplate"
- */
- #define democonfigPROVISIONING_TEMPLATE_NAME    "...insert here..."
-
-/**
- * @brief Subject name to use when creating the certificate signing request (CSR)
- * for provisioning the demo client with using the Fleet Provisioning
- * CreateCertificateFromCsr APIs.
- *
- * This is passed to MbedTLS; see https://tls.mbed.org/api/x509__csr_8h.html#a954eae166b125cea2115b7db8c896e90
- */
-#ifndef democonfigCSR_SUBJECT_NAME
-    #define democonfigCSR_SUBJECT_NAME    "CN="democonfigFP_DEMO_ID
-#endif
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_STACKSIZE        configMINIMAL_STACK_SIZE * 3
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_TASK_PRIORITY    ( tskIDLE_PRIORITY + 1 )
-
-#define democonfigNETWORK_BUFFER_SIZE    ( configMINIMAL_STACK_SIZE * 3 )
-
-#include "core_mqtt.h" /* Include coreMQTT header for MQTT_LIBRARY_VERSION macro. */
-#define democonfigMQTT_LIB    "core-mqtt@"MQTT_LIBRARY_VERSION
-
-#define democonfigDISABLE_SNI       ( pdFALSE )
-
-/**
- * @brief ALPN (Application-Layer Protocol Negotiation) protocol name for AWS IoT MQTT.
- *
- * This will be used if democonfigMQTT_BROKER_PORT is configured as 443 for the AWS IoT MQTT broker.
- * Please see more details about the ALPN protocol for AWS IoT MQTT endpoint
- * in the link below.
- * https://aws.amazon.com/blogs/iot/mqtt-with-tls-client-authentication-on-port-443-why-it-is-useful-and-how-it-works/
- */
-#define AWS_IOT_MQTT_ALPN           "\x0ex-amzn-mqtt-ca"
-
-/**
- * @brief This is the ALPN (Application-Layer Protocol Negotiation) string
- * required by AWS IoT for password-based authentication using TCP port 443.
- */
-#define AWS_IOT_CUSTOM_AUTH_ALPN    "\x04mqtt"
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-/**
- * @brief The name of the operating system that the application is running on.
- * The current value is given as an example. Please update for your specific
- * operating system.
- */
-#define democonfigOS_NAME       "FreeRTOS"
-
-/**
- * @brief The version of the operating system that the application is running
- * on. The current value is given as an example. Please update for your specific
- * operating system version.
- */
-#define democonfigOS_VERSION    "V10.4.3"
-
-/**
- * @brief The name of the hardware platform the application is running on. The
- * current value is given as an example. Please update for your specific
- * hardware platform.
- */
-#define democonfigHARDWARE_PLATFORM_NAME    "CK-RX65N"
-
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING                                 \
-    "?SDK=" democonfigOS_NAME "&Version=" democonfigOS_VERSION \
-    "&MQTTLib=" democonfigMQTT_LIB
-
-/**
- * @brief The length of the MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING_LENGTH    ( ( uint16_t ) ( sizeof( AWS_IOT_METRICS_STRING ) - 1 ) )
-
-
-#ifdef democonfigCLIENT_USERNAME
-
-/**
- * @brief Append the username with the metrics string if #democonfigCLIENT_USERNAME is defined.
- *
- * This is to support both metrics reporting and username/password based client
- * authentication by AWS IoT.
- */
-#define CLIENT_USERNAME_WITH_METRICS    democonfigCLIENT_USERNAME AWS_IOT_METRICS_STRING
-#endif
-
-/**
- * @brief Flag to enable or disable provisioning mode for the demo.
- * Enabling the flags starts a CLI task, so that user can perform provisioning of the device through
- * a serial terminal. Provisioning involves running commands to fetch or set the PKI and configuration
- * information for the device to connect to broker and perform OTA updates. Disabling the flag results
- * in disabling the CLI task and execution of the demo tasks in normal device operation mode.
- */
-#define appmainPROVISIONING_MODE                  ( 1 )
-
-/**
- * @brief Certificate used for validating code signing signatures in the OTA PAL.
- */
-#ifndef otapalconfigCODE_SIGNING_CERTIFICATE
-    #define otapalconfigCODE_SIGNING_CERTIFICATE    "Insert code signing certificate..."
-#endif
-
-/**
- * @brief Major version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MAJOR
-    #define APP_VERSION_MAJOR    0
-#endif
-
-/**
- * @brief Minor version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MINOR
-    #define APP_VERSION_MINOR    9
-#endif
-
-/**
- * @brief Build version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_BUILD
-    #define APP_VERSION_BUILD    2
-#endif
-
-/**
- * @brief Server's root CA certificate.
- *
- * This certificate is used to identify the AWS IoT server and is publicly
- * available. Refer to the AWS documentation available in the link below for
- * information about the Server Root CAs.
- * https://docs.aws.amazon.com/iot/latest/developerguide/server-authentication.html#server-authentication-certs
- *
- * @note The TI C3220 Launchpad board requires that the Root CA have its
- * certificate self-signed. As mentioned in the above link, the Amazon Root CAs
- * are cross-signed by the Starfield Root CA. Thus, ONLY the Starfield Root CA
- * can be used to connect to the ATS endpoints on AWS IoT for the TI board.
- *
- * @note This certificate should be PEM-encoded.
- *
- * Must include the PEM header and footer:
- * "-----BEGIN CERTIFICATE-----\n"\
- * "...base64 data...\n"\
- * "-----END CERTIFICATE-----\n"
- *
- */
-#define democonfigROOT_CA_PEM                   tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief The length of the queue used to hold commands for the agent.
- */
-#define MQTT_AGENT_COMMAND_QUEUE_LENGTH         ( 25 )
-
-/**
- * @brief Dimensions the buffer used to serialise and deserialise MQTT packets.
- * @note Specified in bytes.  Must be large enough to hold the maximum
- * anticipated MQTT payload.
- */
-#define MQTT_AGENT_NETWORK_BUFFER_SIZE          ( 5000 )
-
-#define MQTT_COMMAND_CONTEXTS_POOL_SIZE              ( 10 )
-
-#endif /* DEMO_CONFIG_H */
diff --git a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/ota_config.h b/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/ota_config.h
deleted file mode 100644
index 38a3df57..00000000
--- a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/ota_config.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * AWS IoT Over-the-air Update v3.4.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file ota_config.h
- * @brief This represents the custom values for the configuration macros
- * for the OTA library.
- */
-
-#ifndef OTA_CONFIG_H
-#define OTA_CONFIG_H
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for OTA.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "OTA"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-/**
- * @brief Log base 2 of the size of the file data block message (excluding the header).
- *
- * 10 bits yields a data block size of 1KB.
- */
-#define otaconfigLOG2_FILE_BLOCK_SIZE           12UL
-
-/**
- * @brief Size of the file data block message (excluding the header).
- *
- */
-#define otaconfigFILE_BLOCK_SIZE                ( 1UL << otaconfigLOG2_FILE_BLOCK_SIZE )
-
-/**
- * @brief Milliseconds to wait for the self test phase to succeed before we force reset.
- */
-#define otaconfigSELF_TEST_RESPONSE_WAIT_MS     16000U
-
-/**
- * @brief Milliseconds to wait before requesting data blocks from the OTA service if nothing is happening.
- *
- * The wait timer is reset whenever a data block is received from the OTA service so we will only send
- * the request message after being idle for this amount of time.
- */
-#define otaconfigFILE_REQUEST_WAIT_MS           360000U
-
-/**
- * @brief The maximum allowed length of the thing name used by the OTA agent.
- *
- * AWS IoT requires Thing names to be unique for each device that connects to the broker.
- * Likewise, the OTA agent requires the developer to construct and pass in the Thing name when
- * initializing the OTA agent. The agent uses this size to allocate static storage for the
- * Thing name used in all OTA base topics. Namely $aws/things/<thingName>
- */
-#define otaconfigMAX_THINGNAME_LEN              128U
-
-/**
- * @brief The maximum number of data blocks requested from OTA streaming service.
- *
- *  This configuration parameter is sent with data requests and represents the maximum number of
- *  data blocks the service will send in response. The maximum limit for this must be calculated
- *  from the maximum data response limit (128 KB from service) divided by the block size.
- *  For example if block size is set as 1 KB then the maximum number of data blocks that we can
- *  request is 128/1 = 128 blocks. Configure this parameter to this maximum limit or lower based on
- *  how many data blocks response is expected for each data requests.
- *  Please note that this must be set larger than zero.
- *
- */
-#define otaconfigMAX_NUM_BLOCKS_REQUEST         1U
-#if otaconfigMAX_NUM_BLOCKS_REQUEST > 1U
-#error "otaconfigMAX_NUM_BLOCKS_REQUEST > 1U is not supported in this release "
-#endif
-
-/**
- * @brief The maximum number of requests allowed to send without a response before we abort.
- *
- * This configuration parameter sets the maximum number of times the requests are made over
- * the selected communication channel before aborting and returning error.
- *
- */
-#define otaconfigMAX_NUM_REQUEST_MOMENTUM       1U
-
-/**
- * @brief The number of data buffers reserved by the OTA agent.
- *
- * This configurations parameter sets the maximum number of static data buffers used by
- * the OTA agent for job and file data blocks received.
- */
-#define otaconfigMAX_NUM_OTA_DATA_BUFFERS       otaconfigMAX_NUM_BLOCKS_REQUEST + 1U
-
-/**
- * @brief How frequently the device will report its OTA progress to the cloud.
- *
- * Device will update the job status with the number of blocks it has received every certain
- * number of blocks it receives. For example, 25 means device will update job status every 25 blocks
- * it receives.
- */
-#define otaconfigOTA_UPDATE_STATUS_FREQUENCY    25U
-
-/**
- * @brief Allow update to same or lower version.
- *
- * Set this to 1 to allow downgrade or same version update.This configurations parameter
- * disables version check and allows update to a same or lower version.This is provided for
- * testing purpose and it is recommended to always update to higher version and keep this
- * configuration disabled.
- */
-#define otaconfigAllowDowngrade           0U
-
-/**
- * @brief The protocol selected for OTA control operations.
- *
- * This configurations parameter sets the default protocol for all the OTA control
- * operations like requesting OTA job, updating the job status etc.
- *
- * Note - Only MQTT is supported at this time for control operations.
- */
-#define configENABLED_CONTROL_PROTOCOL    ( OTA_CONTROL_OVER_MQTT )
-
-/**
- * @brief The protocol selected for OTA data operations.
- *
- * This configurations parameter sets the protocols selected for the data operations
- * like requesting file blocks from the service.
- *
- * Note - Both MQTT and HTTP is supported for data transfer from service. This configuration parameter
- * can be set to following -
- * Enable data over MQTT - ( OTA_DATA_OVER_MQTT )
- * Enable data over HTTP - ( OTA_DATA_OVER_HTTP)
- *
- * Note - Please check the OTA over HTTP demo which has the HTTP data transfer functionality and
- * and this configuration is set to OTA_DATA_OVER_HTTP.
- */
-#define configENABLED_DATA_PROTOCOLS      ( OTA_DATA_OVER_MQTT )
-
-/**
- * @brief The preferred protocol selected for OTA data operations.
- *
- * Primary data protocol will be the protocol used for downloading file if more than
- * one protocol is selected while creating OTA job. Default primary data protocol is MQTT
- * and following update here to switch to HTTP as primary.
- *
- * Note - use OTA_DATA_OVER_HTTP for HTTP as primary data protocol.
- */
-
-#define configOTA_PRIMARY_DATA_PROTOCOL    ( OTA_DATA_OVER_MQTT )
-
-
-#endif /* ifndef OTA_CONFIG_H */
diff --git a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/rm_littlefs_flash_config.h b/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/rm_littlefs_flash_config.h
deleted file mode 100644
index 94207ffa..00000000
--- a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/rm_littlefs_flash_config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/***********************************************************************************************************************
- * Copyright 2023 Renesas Electronics Corporation and/or its affiliates.  All Rights Reserved.
- *
- * This software and documentation are supplied by Renesas Electronics America Inc. and may only be used with products
- * of Renesas Electronics Corp. and its affiliates ("Renesas").  No other uses are authorized.  Renesas products are
- * sold pursuant to Renesas terms and conditions of sale.  Purchasers are solely responsible for the selection and use
- * of Renesas products and Renesas assumes no liability.  No license, express or implied, to any intellectual property
- * right is granted by Renesas. This software is protected under all applicable laws, including copyright laws. Renesas
- * reserves the right to change or discontinue this software and/or this documentation. THE SOFTWARE AND DOCUMENTATION
- * IS DELIVERED TO YOU "AS IS," AND RENESAS MAKES NO REPRESENTATIONS OR WARRANTIES, AND TO THE FULLEST EXTENT
- * PERMISSIBLE UNDER APPLICABLE LAW, DISCLAIMS ALL WARRANTIES, WHETHER EXPLICITLY OR IMPLICITLY, INCLUDING WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT, WITH RESPECT TO THE SOFTWARE OR
- * DOCUMENTATION.  RENESAS SHALL HAVE NO LIABILITY ARISING OUT OF ANY SECURITY VULNERABILITY OR BREACH.  TO THE MAXIMUM
- * EXTENT PERMITTED BY LAW, IN NO EVENT WILL RENESAS BE LIABLE TO YOU IN CONNECTION WITH THE SOFTWARE OR DOCUMENTATION
- * (OR ANY PERSON OR ENTITY CLAIMING RIGHTS DERIVED FROM YOU) FOR ANY LOSS, DAMAGES, OR CLAIMS WHATSOEVER, INCLUDING,
- * WITHOUT LIMITATION, ANY DIRECT, CONSEQUENTIAL, SPECIAL, INDIRECT, PUNITIVE, OR INCIDENTAL DAMAGES; ANY LOST PROFITS,
- * OTHER ECONOMIC DAMAGE, PROPERTY DAMAGE, OR PERSONAL INJURY; AND EVEN IF RENESAS HAS BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH LOSS, DAMAGES, CLAIMS OR COSTS.
- **********************************************************************************************************************/
-
-#ifndef FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-#define FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-
-/***********************************************************************************************************************
- * Includes
- **********************************************************************************************************************/
-#include "rm_littlefs_df_rx65n.h"
-
-#define LFS_FLASH_READ_SIZE				(1)
-#define LFS_FLASH_PROGRAM_SIZE			(4)
-#define LFS_FLASH_BLOCK_SIZE			(128)
-#define LFS_FLASH_BLOCK_COUNT			(70)
-#define RM_LITTLEFS_FLASH_DATA_START	FLASH_DF_BLOCK_0_MACRO
-
-#if LFS_FLASH_BLOCK_SIZE*LFS_FLASH_BLOCK_COUNT + (RM_LITTLEFS_FLASH_DATA_START - FLASH_DF_BLOCK_0_MACRO) > BSP_DATA_FLASH_SIZE_BYTES
-#error "Too many blocks"
-#endif
-
-#endif /* FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/shadow_config.h b/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/shadow_config.h
deleted file mode 100644
index aa948c12..00000000
--- a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/shadow_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Shadow v1.3.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file shadow_config.h
- * @brief This represents the custom values for the configuration macros
- * for the Shadow library.
- */
-
-#ifndef SHADOW_CONFIG_H_
-#define SHADOW_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SHADOW"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef SHADOW_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/sigv4_config.h b/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/sigv4_config.h
deleted file mode 100644
index ba277a79..00000000
--- a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/sigv4_config.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * SigV4 Library v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file sigv4_config.h
- * @brief The custom values for configuration macros used by the SigV4 Library.
- */
-
-#ifndef SIGV4_CONFIG_H_
-#define SIGV4_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SIGV4"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef SIGV4_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/user_tcp_hook_config.h b/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/user_tcp_hook_config.h
deleted file mode 100644
index 0c1308fe..00000000
--- a/Configuration/samples/pso/ck-rx65n/cellular/src/frtos_config/user_tcp_hook_config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**********************************************************************************************************************
- * Copyright (C) 2023 Renesas Electronics Corporation. All rights reserved.
- *
- * DISCLAIMER
- * This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
- * other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
- * applicable laws, including copyright laws.
- * THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
- * THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
- * EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
- * SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS
- * SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
- * this software. By using this software, you agree to the additional terms and conditions found by accessing the
- * following link:
- * http://www.renesas.com/disclaimer
- *********************************************************************************************************************/
-
-#ifndef FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_
-#define FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_
-
-/* The limit of number for CELLULAR_ERR_MODULE_COM when it comes continuously.
- * If counter is over than this limit, hook the reset */
-#define USER_COMM_ERROR_TRIES		3
-
-/*Connection retry limit*/
-#define USER_RECONNECT_TRIES 		3
-
-/*Socket closing retry limit*/
-#define USER_CLOSE_SOCKET_TRIES		3
-
-/*Enable SocketErrorHook*/
-#define USER_TCP_HOOK_ENABLED   	1 /* Default */
-
-/* Reset cellular hardware*/
-#define USER_TCP_HOOK_FUNCTION     SocketErrorHook
-
-#endif /* FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/ether/linker_section_sample.esi b/Configuration/samples/pso/ck-rx65n/ether/linker_section_sample.esi
deleted file mode 100644
index dc7e6ce9..00000000
--- a/Configuration/samples/pso/ck-rx65n/ether/linker_section_sample.esi
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<com.renesas.linkersection.model:SectionContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:com.renesas.linkersection.model="http:///LinkerSection.ecore">
-  <sections name="SU">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4"/>
-  </sections>
-  <sections name="SI"/>
-  <sections name="R_1"/>
-  <sections name="B_2"/>
-  <sections name="R"/>
-  <sections name="RPFRAM2"/>
-  <sections name="C_LITTLEFS_MANAGEMENT_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1048576"/>
-  </sections>
-  <sections name="C_USER_APPLICATION_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1057536"/>
-  </sections>
-  <sections name="B_ETHERNET_BUFFERS*">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="8388608"/>
-  </sections>
-  <sections name="B_RX_DESC*"/>
-  <sections name="B_TX_DESC*"/>
-  <sections name="B"/>
-  <sections name="B_1"/>
-  <sections name="R_2"/>
-  <sections name="PResetPRG">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4293919488"/>
-  </sections>
-  <sections name="C_1"/>
-  <sections name="C_2"/>
-  <sections name="C"/>
-  <sections name="C$*"/>
-  <sections name="D*"/>
-  <sections name="W*"/>
-  <sections name="L"/>
-  <sections name="P"/>
-  <sections name="PFRAM2"/>
-  <sections name="EXCEPTVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294901632"/>
-  </sections>
-  <sections name="RESETVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294901756"/>
-  </sections>
-</com.renesas.linkersection.model:SectionContainer>
diff --git a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/FreeRTOSConfig.h b/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/FreeRTOSConfig.h
deleted file mode 100644
index 5662a8c2..00000000
--- a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/FreeRTOSConfig.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * FreeRTOS Kernel V10.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * http://aws.amazon.com/freertos
- * http://www.FreeRTOS.org
- */
-
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
-
-
-/* Unity includes. */
-#if defined(FREERTOS_ENABLE_UNIT_TESTS)
-#include "unity_internals.h"
-#elif defined(ENABLE_UNIT_TESTS)
-#include "unity.h"
-#endif
-
-/*-----------------------------------------------------------
-* Application specific definitions.
-*
-* These definitions should be adjusted for your particular hardware and
-* application requirements.
-*
-* THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
-* FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
-* http://www.freertos.org/a00110.html
-*
-* The bottom of this file contains some constants specific to running the UDP
-* stack in this demo.  Constants specific to FreeRTOS+TCP itself (rather than
-* the demo) are contained in FreeRTOSIPConfig.h.
-*----------------------------------------------------------*/
-#define configENABLE_BACKWARD_COMPATIBILITY        1
-#define configUSE_PREEMPTION                       1
-#define configUSE_PORT_OPTIMISED_TASK_SELECTION    0
-#define configMAX_PRIORITIES                       (7)
-#define configTICK_RATE_HZ                         (( TickType_t ) 1000)
-#define configMINIMAL_STACK_SIZE                   (768)
-#define configTOTAL_HEAP_SIZE_N						(256)
-#define configTOTAL_HEAP_SIZE                      (( size_t ) ( configTOTAL_HEAP_SIZE_N * 1024 ))
-#define configMAX_TASK_NAME_LEN                    (12)
-#define configUSE_TRACE_FACILITY                   1
-#define configUSE_16_BIT_TICKS                     0
-#define configIDLE_SHOULD_YIELD                    1
-#define configUSE_CO_ROUTINES                      0
-#define configUSE_MUTEXES                          1
-#define configUSE_RECURSIVE_MUTEXES                1
-#define configQUEUE_REGISTRY_SIZE                  0
-#define configUSE_APPLICATION_TASK_TAG             0
-#define configUSE_COUNTING_SEMAPHORES              1
-#define configUSE_ALTERNATIVE_API                  0
-#define configNUM_THREAD_LOCAL_STORAGE_POINTERS    3      /* FreeRTOS+FAT requires 2 pointers if a CWD is supported. */
-#define configRECORD_STACK_HIGH_ADDRESS            1
-
-#define configUSE_DAEMON_TASK_STARTUP_HOOK 1
-
-#define configCPU_CLOCK_HZ				(BSP_ICLK_HZ)
-#define configPERIPHERAL_CLOCK_HZ		(BSP_PCLKB_HZ)
-#define configUSE_QUEUE_SETS			1
-
-/* Hook function related definitions. */
-#define configUSE_TICK_HOOK                        1
-#define configUSE_IDLE_HOOK                        1
-#define configUSE_MALLOC_FAILED_HOOK               1
-#define configCHECK_FOR_STACK_OVERFLOW             2      /* Not applicable to the Win32 port. */
-
-/* Software timer related definitions. */
-#define configUSE_TIMERS                           1
-#define configTIMER_TASK_PRIORITY                  (6)
-#define configTIMER_QUEUE_LENGTH                   5
-#define configTIMER_TASK_STACK_DEPTH               (configMINIMAL_STACK_SIZE)
-
-/* The interrupt priority used by the kernel itself for the tick interrupt and
-the pended interrupt.  This would normally be the lowest priority. */
-#define configKERNEL_INTERRUPT_PRIORITY         1
-
-/* The maximum interrupt priority from which FreeRTOS API calls can be made.
-Interrupts that use a priority above this will not be effected by anything the
-kernel is doing. */
-#define configMAX_SYSCALL_INTERRUPT_PRIORITY    4
-
-/* The peripheral used to generate the tick interrupt is configured as part of
-the application code.  This constant should be set to the vector number of the
-peripheral chosen.  As supplied this is CMT0. */
-#define configTICK_VECTOR						_CMT0_CMI0		//CMT0
-//#define configTICK_VECTOR						_CMT1_CMI1		//CMT1
-//#define configTICK_VECTOR						_CMT2_CMI2		//CMT2
-//#define configTICK_VECTOR						_CMT3_CMI3		//CMT3
-
-/* Event group related definitions. */
-#define configUSE_EVENT_GROUPS                     1
-
-/* Run time stats gathering definitions. */
-unsigned long ulGetRunTimeCounterValue( void );
-void vConfigureTimerForRunTimeStats( void );
-#define configGENERATE_RUN_TIME_STATS    0
-//#define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS()    vConfigureTimerForRunTimeStats()
-//#define portGET_RUN_TIME_COUNTER_VALUE()            ulGetRunTimeCounterValue()
-
-/* Co-routine definitions. */
-#define configUSE_CO_ROUTINES                   0
-#define configMAX_CO_ROUTINE_PRIORITIES         (2)
-
-/* Currently the TCP/IP stack is using dynamic allocation, and the MQTT task is
- * using static allocation. */
-#define configSUPPORT_DYNAMIC_ALLOCATION        1
-#define configSUPPORT_STATIC_ALLOCATION         1
-
-/* Set the following definitions to 1 to include the API function, or zero
- * to exclude the API function. */
-#define INCLUDE_vTaskPrioritySet                1
-#define INCLUDE_uxTaskPriorityGet               1
-#define INCLUDE_vTaskDelete                     1
-#define INCLUDE_vTaskCleanUpResources           0
-#define INCLUDE_vTaskSuspend                    1
-#define INCLUDE_vTaskDelayUntil                 1
-#define INCLUDE_vTaskDelay                      1
-#define INCLUDE_uxTaskGetStackHighWaterMark     1
-#define INCLUDE_xTaskGetSchedulerState          1
-#define INCLUDE_xTimerGetTimerTaskHandle        0
-#define INCLUDE_xTaskGetIdleTaskHandle          0
-#define INCLUDE_xQueueGetMutexHolder            1
-#define INCLUDE_eTaskGetState                   1
-#define INCLUDE_xEventGroupSetBitsFromISR       1
-#define INCLUDE_xTimerPendFunctionCall          1
-#define INCLUDE_xTaskGetCurrentTaskHandle       1
-#define INCLUDE_xTaskAbortDelay                 1
-
-/* This demo makes use of one or more example stats formatting functions.  These
- * format the raw data provided by the uxTaskGetSystemState() function in to human
- * readable ASCII form.  See the notes in the implementation of vTaskList() within
- * FreeRTOS/Source/tasks.c for limitations.  configUSE_STATS_FORMATTING_FUNCTIONS
- * is set to 2 so the formatting functions are included without the stdio.h being
- * included in tasks.c.  That is because this project defines its own sprintf()
- * functions. */
-#define configUSE_STATS_FORMATTING_FUNCTIONS    1
-
-#if defined(ENABLE_UNIT_TESTS) || defined(FREERTOS_ENABLE_UNIT_TESTS)
-/* unity testing */
-#define configASSERT( x ) do { if( ( x ) == 0 ) TEST_ABORT(); } while( 0 )
-#elif defined(CONFIG_FREERTOS_ASSERT_DISABLE) || defined(NDEBUG)
-/* Disable Assert call for release builds. */
-#define configASSERT( x ) ( ( void ) 0 )
-#else /* CONFIG_FREERTOS_ASSERT_FAIL_ABORT or nothing */
-/* Assert call defined for debug builds. */
-extern void vAssertCalled( void );
-#define configASSERT( x ) do { if( ( x ) == 0 ) vAssertCalled(); } while( 0 )
-#endif
-
-/* The function that implements FreeRTOS printf style output, and the macro
- * that maps the configPRINTF() macros to that function. */
-extern void vLoggingPrintf( const char * pcFormat, ... );
-#define configPRINTF( X )    vLoggingPrintf X
-
-/* Non-format version thread-safe print */
-extern void vLoggingPrint( const char * pcMessage );
-#define configPRINT( X )     vLoggingPrint( X )
-
-extern void vOutputString( const char * pcMessage );
-/* Map the logging task's printf to the board specific output function. */
-#define configPRINT_STRING( x )    vOutputString(x)
-
-/* Sets the length of the buffers into which logging messages are written - so
- * also defines the maximum length of each log message. */
-#define configLOGGING_MAX_MESSAGE_LENGTH            192
-
-/* Set to 1 to prepend each log message with a message number, the task name,
- * and a time stamp. */
-#define configLOGGING_INCLUDE_TIME_AND_TASK_NAME    1
-
-/* Application specific definitions follow. **********************************/
-
-/* If configINCLUDE_DEMO_DEBUG_STATS is set to one, then a few basic IP trace
- * macros are defined to gather some UDP stack statistics that can then be viewed
- * through the CLI interface. */
-#define configINCLUDE_DEMO_DEBUG_STATS       1
-
-/* The size of the global output buffer that is available for use when there
- * are multiple command interpreters running at once (for example, one on a UART
- * and one on TCP/IP).  This is done to prevent an output buffer being defined by
- * each implementation - which would waste RAM.  In this case, there is only one
- * command interpreter running, and it has its own local output buffer, so the
- * global buffer is just set to be one byte long as it is not used and should not
- * take up unnecessary RAM. */
-#define configCOMMAND_INT_MAX_OUTPUT_SIZE    850
-
-/* Only used when running in the FreeRTOS Windows simulator.  Defines the
- * priority of the task used to simulate Ethernet interrupts. */
-#define configMAC_ISR_SIMULATOR_PRIORITY     ( configMAX_PRIORITIES - 1 )
-
-/* This demo creates a virtual network connection by accessing the raw Ethernet
- * or WiFi data to and from a real network connection.  Many computers have more
- * than one real network port, and configNETWORK_INTERFACE_TO_USE is used to tell
- * the demo which real port should be used to create the virtual port.  The ports
- * available are displayed on the console when the application is executed.  For
- * example, on my development laptop setting configNETWORK_INTERFACE_TO_USE to 4
- * results in the wired network being used, while setting
- * configNETWORK_INTERFACE_TO_USE to 2 results in the wireless network being
- * used. */
-#define configNETWORK_INTERFACE_TO_USE       2L
-
-/* The address of an echo server that will be used by the two demo echo client
- * tasks:
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_Echo_Clients.html,
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/UDP_Echo_Clients.html. */
-#define configECHO_SERVER_ADDR0              192
-#define configECHO_SERVER_ADDR1              168
-#define configECHO_SERVER_ADDR2              1
-#define configECHO_SERVER_ADDR3              200
-#define configTCP_ECHO_CLIENT_PORT           9999
-
-/* Default MAC address configuration.  The demo creates a virtual network
- * connection that uses this MAC address by accessing the raw Ethernet/WiFi data
- * to and from a real network connection on the host PC.  See the
- * configNETWORK_INTERFACE_TO_USE definition above for information on how to
- * configure the real network connection to use. */
-#define configMAC_ADDR0                      0x74
-#define configMAC_ADDR1                      0x90
-#define configMAC_ADDR2                      0x50
-#define configMAC_ADDR3                      0x00
-#define configMAC_ADDR4                      0x79
-#define configMAC_ADDR5                      0x03
-
-/* Default IP address configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configIP_ADDR0                       192
-#define configIP_ADDR1                       168
-#define configIP_ADDR2                       11
-#define configIP_ADDR3                       12
-
-/* Default gateway IP address configuration.  Used in ipconfigUSE_DHCP is set to
- * 0, or ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configGATEWAY_ADDR0                  172
-#define configGATEWAY_ADDR1                  27
-#define configGATEWAY_ADDR2                  49
-#define configGATEWAY_ADDR3                  1
-
-/* Default DNS server configuration.  OpenDNS addresses are 208.67.222.222 and
- * 208.67.220.220.  Used in ipconfigUSE_DHCP is set to 0, or ipconfigUSE_DHCP is
- * set to 1 but a DNS server cannot be contacted.*/
-#define configDNS_SERVER_ADDR0               143
-#define configDNS_SERVER_ADDR1               103
-#define configDNS_SERVER_ADDR2               47
-#define configDNS_SERVER_ADDR3               193
-
-/* Default netmask configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configNET_MASK0                      255
-#define configNET_MASK1                      255
-#define configNET_MASK2                      255
-#define configNET_MASK3                      0
-
-/* The UDP port to which print messages are sent. */
-#define configPRINT_PORT                     ( 15000 )
-
-#define configPROFILING                      ( 0 )
-
-/* Pseudo random number generater used by some demo tasks. */
-uint32_t ulRand(void);
-#define configRAND32()    ulRand()
-
-/* The platform FreeRTOS is running on. */
-#define configPLATFORM_NAME    "RenesasRX65N"
-
-/* Header required for the tracealyzer recorder library. */
-//#include "trcRecorder.h"
-
-/* When the FIT configurator or the Smart Configurator is used, platform.h has to be used. */
-#define configINCLUDE_PLATFORM_H_INSTEAD_OF_IODEFINE_H  1
-
-#endif /* FREERTOS_CONFIG_H */
diff --git a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/FreeRTOSIPConfig.h b/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/FreeRTOSIPConfig.h
deleted file mode 100644
index 413f8d38..00000000
--- a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/FreeRTOSIPConfig.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * FreeRTOS+TCP V3.1.0
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * http://aws.amazon.com/freertos
- * http://www.FreeRTOS.org
- */
-
-
-/*****************************************************************************
-*
-* See the following URL for configuration information.
-* http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_IP_Configuration.html
-*
-*****************************************************************************/
-#include "r_ether_rx_config.h"
-
-#ifndef FREERTOS_IP_CONFIG_H
-#define FREERTOS_IP_CONFIG_H
-
-/* Define the byte order of the target MCU (the MCU FreeRTOS+TCP is executing
- * on).  Valid options are pdFREERTOS_BIG_ENDIAN and pdFREERTOS_LITTLE_ENDIAN. */
-#define ipconfigBYTE_ORDER                         pdFREERTOS_LITTLE_ENDIAN
-
-/*
- * FreeRTOS debug logging routines.
- * The macro will be called with a printf() format as a parameter.  Users
- * can define their own logging routine as:
- *
- * The FreeRTOS_debug_printf() must be thread-safe but does not have to be
- * interrupt-safe.
- */
-#define FreeRTOS_debug_printf( MSG )    configPRINTF( MSG )
-#define ipconfigHAS_PRINTF    1
-#define FreeRTOS_printf( MSG )    configPRINTF( MSG )
-
-/* 'ipconfigUSE_NETWORK_EVENT_HOOK' indicates if an application hook is available
- * called 'vApplicationIPNetworkEventHook()'.  This function will be called when
- * the network goes up and when it goes down.  See also FREERTOS_IP.h for further
- * explanation. */
-#define ipconfigUSE_NETWORK_EVENT_HOOK    1
-
-/* Define the number of entries in the ARP cache table. */
-#define ipconfigARP_CACHE_ENTRIES    6
-
-/* 'ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS' is an important macro: it
- * determines the number of network buffers that are available in the
- * entire application.
- * Note that the default of 45 may be pretty high for smaller
- * applications.
- * Also note that when the network interface uses zero-copy reception
- * ( ipconfigZERO_COPY_RX_DRIVER ), it will reserve a set of network
- * buffers permanently.
- * For zero-copy transmission, no network buffers are permanently
- * "reserved" for transmission.
- */
-#define ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS    ETHER_CFG_EMAC_TX_DESCRIPTORS
-
-/* Related to the macro 'ipconfigEVENT_QUEUE_LENGTH' here above:
- * when developing a new networking application, it can be helpful
- * to monitor the length of the message queue of the IP-task.
- * This code is only enabled when 'ipconfigCHECK_IP_QUEUE_SPACE'
- * is set to 1.  See also the function 'uxGetMinimumIPQueueSpace()'.
- */
-#define ipconfigCHECK_IP_QUEUE_SPACE    1
-
-/* Set ipconfigUSE_LLMNR to 1 to include LLMNR. */
-#define ipconfigUSE_LLMNR    0
-
-/* Set ipconfigUSE_NBNS to 1 to include NBNS. */
-#define ipconfigUSE_NBNS    0
-
-/* DHCP servers have a table with information about each clients.  One
- * of the fields in this table contains the host name of the DHCP clients.
- * When 'ipconfigDHCP_REGISTER_HOSTNAME' is defined as non-zero, the DHCP
- * driver will call 'pcApplicationHostnameHook()' to obtain the name of
- * the embedded device.
- */
-#define ipconfigDHCP_REGISTER_HOSTNAME    1
-
-/* The results of DNS lookup's can be stored in a cache table. */
-#define ipconfigUSE_DNS_CACHE    1
-
-/* When ipconfigDRIVER_INCLUDED_RX_IP_CHECKSUM is enabled,
- * the network interface is responsible for checking the checksums
- * of the incoming packets.
- * This can be either done in hardware, or by calling the checksum
- * functions.
- */
-#define ipconfigDRIVER_INCLUDED_RX_IP_CHECKSUM    1
-
-/* The macro 'ipconfigSOCKET_HAS_USER_WAKE_CALLBACK' allows to use a call-back
- * function that will be called at the moment one of the above events occurs.
- * Use the socket option 'FREERTOS_SO_WAKEUP_CALLBACK' to install a function
- * of the type 'void callback( Socket_t pxSocket )'.
- * Note that the call-back function runs in the IP-task, so very little things
- * can be done.  Better not to call any networking API, because that could
- * easily lead to a deadlock situation.
- */
-#define ipconfigSOCKET_HAS_USER_WAKE_CALLBACK    1
-
-/* TCP only: if the 'ipconfigTCP_KEEP_ALIVE' macro is defined as 1,
- * sockets in state "ESTABLISHED" can be protected using keep-alive packets.
- * These packets will be sent as soon as there hasn't been any activity
- * for a while.
- * The macro 'ipconfigTCP_KEEP_ALIVE_INTERVAL' determines the interval at
- * which keep-alive packets are sent.
- */
-#define ipconfigTCP_KEEP_ALIVE    1
-
-#endif /* FREERTOS_IP_CONFIG_H */
diff --git a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/core_http_config.h b/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/core_http_config.h
deleted file mode 100644
index 679a119d..00000000
--- a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/core_http_config.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * coreHTTP v3.0.0
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_HTTP_CONFIG_H_
-#define CORE_HTTP_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging config definition and header files inclusion are required in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for HTTP.
- * 3. Include the header file "logging_stack.h", if logging is enabled for HTTP.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the HTTP library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "HTTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_HTTP_CONFIG_ */
\ No newline at end of file
diff --git a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/core_mqtt_agent_config.h b/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/core_mqtt_agent_config.h
deleted file mode 100644
index 08994a84..00000000
--- a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/core_mqtt_agent_config.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * coreMQTT Agent v1.2.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_mqtt_agent_config.h
- * @brief This represents the default values for the configuration macros
- * for the MQTT-Agent library.
- */
-
-#ifndef CORE_MQTT_AGENT_CONFIG_H_
-#define CORE_MQTT_AGENT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT Agent.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT_Agent"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
- * @brief Maximum time MQTT agent waits in the queue for any pending MQTT
- * operations.
- *
- * The wait time is kept smallest possible to increase the responsiveness of
- * MQTT agent while processing  pending MQTT operations as well as receive
- * packets from network.
- */
-#define MQTT_AGENT_MAX_EVENT_QUEUE_WAIT_TIME    ( 50U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_AGENT_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/core_mqtt_config.h b/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/core_mqtt_config.h
deleted file mode 100644
index 6222626b..00000000
--- a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/core_mqtt_config.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * coreMQTT v2.1.1
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_MQTT_CONFIG_H_
-#define CORE_MQTT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief The maximum duration between non-empty network reads while
-* receiving an MQTT packet via the #MQTT_ProcessLoop or #MQTT_ReceiveLoop
-* API functions.
-*
-* When an incoming MQTT packet is detected, the transport receive function
-* may be called multiple times until all of the expected number of bytes of the
-* packet are received. This timeout represents the maximum polling duration that
-* is allowed without any data reception from the network for the incoming packet.
-*
-* If the timeout expires, the #MQTT_ProcessLoop and #MQTT_ReceiveLoop functions
-* return #MQTTRecvFailed.
-*
-* @note If a dummy implementation of the #MQTTGetCurrentTimeFunc_t timer function,
-* is supplied to the library, then #MQTT_RECV_POLLING_TIMEOUT_MS MUST be set to 0.
-*
-* <b>Possible values:</b> Any positive 32 bit integer. Recommended to use a
-* small timeout value. <br>
-* <b>Default value:</b> `10`
-*
-*/
-#define MQTT_RECV_POLLING_TIMEOUT_MS    ( 1000U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/core_pkcs11_config.h b/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/core_pkcs11_config.h
deleted file mode 100644
index e18f347c..00000000
--- a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/core_pkcs11_config.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * corePKCS11 v3.5.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_pkcs11_config.h
- * @brief List of configuration macros for the corePKCS11 library along with
- * their custom values.
- */
-
-#ifndef CORE_PKCS11_CONFIG_H_
-#define CORE_PKCS11_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for PKCS #11.
- * 3. Include the header file "logging_stack.h", if logging is enabled for PKCS #11.
- */
-#include "logging_levels.h"
-
-/* Logging configuration for the PKCS #11 library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "PKCS11"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_ERROR
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief Maximum number of sessions that can be stored
-* by the PKCS #11 module.
-*
-* @note The windows test port has an abnormally large value in order to have
-* enough sessions to successfully run all the model based PKCS #11 tests.
-*
-* <b>Possible values:</b> Any positive integer.<br>
-* <b>Default value:</b> 10
-*/
-#define pkcs11configMAX_NUM_OBJECTS    8
-
-/**
-* @brief Set to 1 if a PAL destroy object is implemented.
-*
-* If set to 0, no PAL destroy object is implemented, and this functionality
-* is implemented in the common PKCS #11 layer.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configPAL_DESTROY_SUPPORTED    1
-
-/**
-* @brief Set to 1 if OTA image verification via PKCS #11 module is supported.
-*
-* If set to 0, OTA code signing certificate is built in via
-* aws_ota_codesigner_certificate.h.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configOTA_SUPPORTED    1
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* CORE_PKCS11_CONFIG_H_ include guard. */
diff --git a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/core_sntp_config.h b/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/core_sntp_config.h
deleted file mode 100644
index a6303826..00000000
--- a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/core_sntp_config.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * coreSNTP v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_sntp_config.h
- * @brief This file represents the custom values for the configuration macros
- * of the coreSNTP library.
- */
-
-#ifndef CORE_SNTP_CONFIG_H_
-#define CORE_SNTP_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for SNTP.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "SNTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef CORE_SNTP_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/defender_config.h b/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/defender_config.h
deleted file mode 100644
index d0b3d8e4..00000000
--- a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/defender_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Defender Client v1.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file defender_config.h
- * @brief Custom config values for the AWS IoT Device Defender Client Library.
- */
-
-#ifndef DEFENDER_CONFIG_H_
-#define DEFENDER_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for Device Defender.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "Defender"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* DEFENDER_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/demo_config.h b/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/demo_config.h
deleted file mode 100644
index 3fb828c8..00000000
--- a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/demo_config.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * FreeRTOS V202111.00
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * https://www.FreeRTOS.org
- * https://github.com/FreeRTOS
- *
- */
-
-#ifndef DEMO_CONFIG_H
-#define DEMO_CONFIG_H
-
-/* FreeRTOS include. */
-#include "FreeRTOS.h"
-#include "aws_clientcredential.h"
-#include "aws_clientcredential_keys.h"
-#include "iot_default_root_certificates.h"
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for DEMO.
- * 3. Include the header file "logging_stack.h", if logging is enabled for DEMO.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Demo. */
-#ifndef LIBRARY_LOG_NAME
-#define LIBRARY_LOG_NAME    "MQTTDemo"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-#define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "iot_logging_task.h"
-
-
-/* Select a combination of demos to run
- * These demo has not been evaluated outside of the combination of demos listed below.
- *
- *          PUBSUB demo only :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB and OTA over MQTT demo :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (1)
- *          PUBSUB and OTA over MQTT demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (1)
- */
-/* demo is configured for PUBSUB */
-/* Select demo combination to run. */
-
-/* Please select a provisioning method
- * (0) : Pre-provisioning
- * (1) : Fleet provisioning
- */
-#define ENABLE_FLEET_PROVISIONING_DEMO      (0)
-
-/* Please select whether to enable or disable the OTA demo
- * (0) : OTA demo is disabled
- * (1) : OTA over MQTT demo is enabled
- */
-#define ENABLE_OTA_UPDATE_DEMO              (1)
-
-#define democonfigROOT_CA_PEM               tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief Path of the file containing the provisioning claim certificate. This
- * certificate is used to connect to AWS IoT Core and use Fleet Provisioning
- * APIs to provision the client device. This is used for the "Provisioning by
- * Claim" provisioning workflow.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This certificate should be PEM-encoded. The certificate should be
- * registered on AWS IoT Core beforehand. It should have an AWS IoT policy to
- * allow it to access only the Fleet Provisioning APIs. An example policy for
- * the claim certificates for this demo is available in the
- * example_claim_policy.json file in the demo directory. In the example,
- * replace <aws-region> with your AWS region, <aws-account-id> with your
- * account ID, and <template-name> with the name of your provisioning template.
- *
- */
-#define democonfigCLAIM_CERT_PEM            "...insert here..."
-
-/**
- * @brief Path of the file containing the provisioning claim private key. This
- * key corresponds to the provisioning claim certificate and is used to
- * authenticate with AWS IoT for provisioning by claim.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This private key should be PEM-encoded.
- *
- */
-#define democonfigCLAIM_PRIVATE_KEY_PEM     "...insert here..."
-
-/**
- * @brief An option to disable Server Name Indication.
- *
- * @note When using a local Mosquitto server setup, SNI needs to be disabled
- * for an MQTT broker that only has an IP address but no hostname. However,
- * SNI should be enabled whenever possible.
- */
-#define democonfigDISABLE_SNI                ( pdFALSE )
-
-/**
- * @brief Configuration that indicates if the demo connection is made to the AWS IoT Core MQTT broker.
- *
- * If username/password based authentication is used, the demo will use appropriate TLS ALPN and
- * SNI configurations as required for the Custom Authentication feature of AWS IoT.
- * For more information, refer to the following documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/custom-auth.html#custom-auth-mqtt
- *
- * #define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
- */
-#define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
-
-/**
- * @brief The unique ID used by the demo to differentiate instances.
- *
- *!!! Please note a #defined constant is used for convenience of demonstration
- *!!! only.  Production devices can use something unique to the device that can
- *!!! be read by software, such as a production serial number, instead of a
- *!!! hard coded constant.
- */
-#define democonfigFP_DEMO_ID    "FPDemoID"
-
-/**
- * @brief The MQTT client identifier used in this example.  Each client identifier
- * must be unique so edit as required to ensure no two clients connecting to the
- * same broker use the same client identifier.
- *
- * @note Appending __TIME__ to the client id string will reduce the possibility of a
- * client id collision in the broker. Note that the appended time is the compilation
- * time. This client id can cause collision, if more than one instance of the same
- * binary is used at the same time to connect to the broker.
- */
-#ifndef democonfigCLIENT_IDENTIFIER
-#if (ENABLE_FLEET_PROVISIONING_DEMO == 1)
-    #define democonfigCLIENT_IDENTIFIER    "client"democonfigFP_DEMO_ID
-#else
-    #define democonfigCLIENT_IDENTIFIER    clientcredentialIOT_THING_NAME
-#endif
-#endif
-
-/**
- * @brief Details of the MQTT broker to connect to.
- *
- * This is the Claim's Rest API Endpoint for AWS IoT.
- *
- * @note Your AWS IoT Core endpoint can be found in the AWS IoT console under
- * Settings/Custom Endpoint, or using the describe-endpoint API.
- *
- */
-#define democonfigMQTT_BROKER_ENDPOINT     clientcredentialMQTT_BROKER_ENDPOINT
-
-/**
- * @brief AWS IoT MQTT broker port number.
- *
- * In general, port 8883 is for secured MQTT connections.
- *
- * @note Port 443 requires use of the ALPN TLS extension with the ALPN protocol
- * name. When using port 8883, ALPN is not required.
- */
-#define democonfigMQTT_BROKER_PORT    ( clientcredentialMQTT_BROKER_PORT )
-
-/**
- * @brief Name of the provisioning template to use for the RegisterThing
- * portion of the Fleet Provisioning workflow.
- *
- * For information about provisioning templates, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-template.html#fleet-provision-template
- *
- * The example template used for this demo is available in the
- * example_demo_template.json file in the DemoSetup directory. In the example,
- * replace <provisioned-thing-policy> with the policy provisioned devices
- * should have.  The demo template uses Fn::Join to construct the Thing name by
- * concatenating fp_demo_ and the serial number sent by the demo.
- *
- * @note The provisioning template MUST be created in AWS IoT before running the
- * demo.
- *
- * @note If you followed the manual setup steps on https://freertos.org/iot-fleet-provisioning/demo.html,
- * the provisioning template name is "FleetProvisioningDemoTemplate".
- * However, if you used CloudFormation to set up the demo, the template name is "CF_FleetProvisioningDemoTemplate"
- */
- #define democonfigPROVISIONING_TEMPLATE_NAME    "...insert here..."
-
-/**
- * @brief Subject name to use when creating the certificate signing request (CSR)
- * for provisioning the demo client with using the Fleet Provisioning
- * CreateCertificateFromCsr APIs.
- *
- * This is passed to MbedTLS; see https://tls.mbed.org/api/x509__csr_8h.html#a954eae166b125cea2115b7db8c896e90
- */
-#ifndef democonfigCSR_SUBJECT_NAME
-    #define democonfigCSR_SUBJECT_NAME    "CN="democonfigFP_DEMO_ID
-#endif
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_STACKSIZE        configMINIMAL_STACK_SIZE * 3
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_TASK_PRIORITY    ( tskIDLE_PRIORITY + 1 )
-
-#define democonfigNETWORK_BUFFER_SIZE    ( configMINIMAL_STACK_SIZE * 3 )
-
-#include "core_mqtt.h" /* Include coreMQTT header for MQTT_LIBRARY_VERSION macro. */
-#define democonfigMQTT_LIB    "core-mqtt@"MQTT_LIBRARY_VERSION
-
-#define democonfigDISABLE_SNI       ( pdFALSE )
-
-/**
- * @brief ALPN (Application-Layer Protocol Negotiation) protocol name for AWS IoT MQTT.
- *
- * This will be used if democonfigMQTT_BROKER_PORT is configured as 443 for the AWS IoT MQTT broker.
- * Please see more details about the ALPN protocol for AWS IoT MQTT endpoint
- * in the link below.
- * https://aws.amazon.com/blogs/iot/mqtt-with-tls-client-authentication-on-port-443-why-it-is-useful-and-how-it-works/
- */
-#define AWS_IOT_MQTT_ALPN           "\x0ex-amzn-mqtt-ca"
-
-/**
- * @brief This is the ALPN (Application-Layer Protocol Negotiation) string
- * required by AWS IoT for password-based authentication using TCP port 443.
- */
-#define AWS_IOT_CUSTOM_AUTH_ALPN    "\x04mqtt"
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-/**
- * @brief The name of the operating system that the application is running on.
- * The current value is given as an example. Please update for your specific
- * operating system.
- */
-#define democonfigOS_NAME       "FreeRTOS"
-
-/**
- * @brief The version of the operating system that the application is running
- * on. The current value is given as an example. Please update for your specific
- * operating system version.
- */
-#define democonfigOS_VERSION    "V10.4.3"
-
-/**
- * @brief The name of the hardware platform the application is running on. The
- * current value is given as an example. Please update for your specific
- * hardware platform.
- */
-#define democonfigHARDWARE_PLATFORM_NAME    "CK-RX65N"
-
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING                                 \
-    "?SDK=" democonfigOS_NAME "&Version=" democonfigOS_VERSION \
-    "&MQTTLib=" democonfigMQTT_LIB
-
-/**
- * @brief The length of the MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING_LENGTH    ( ( uint16_t ) ( sizeof( AWS_IOT_METRICS_STRING ) - 1 ) )
-
-
-#ifdef democonfigCLIENT_USERNAME
-
-/**
- * @brief Append the username with the metrics string if #democonfigCLIENT_USERNAME is defined.
- *
- * This is to support both metrics reporting and username/password based client
- * authentication by AWS IoT.
- */
-#define CLIENT_USERNAME_WITH_METRICS    democonfigCLIENT_USERNAME AWS_IOT_METRICS_STRING
-#endif
-
-/**
- * @brief Flag to enable or disable provisioning mode for the demo.
- * Enabling the flags starts a CLI task, so that user can perform provisioning of the device through
- * a serial terminal. Provisioning involves running commands to fetch or set the PKI and configuration
- * information for the device to connect to broker and perform OTA updates. Disabling the flag results
- * in disabling the CLI task and execution of the demo tasks in normal device operation mode.
- */
-#define appmainPROVISIONING_MODE                  ( 1 )
-
-/**
- * @brief Certificate used for validating code signing signatures in the OTA PAL.
- */
-#ifndef otapalconfigCODE_SIGNING_CERTIFICATE
-    #define otapalconfigCODE_SIGNING_CERTIFICATE    "Insert code signing certificate..."
-#endif
-
-/**
- * @brief Major version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MAJOR
-    #define APP_VERSION_MAJOR    0
-#endif
-
-/**
- * @brief Minor version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MINOR
-    #define APP_VERSION_MINOR    9
-#endif
-
-/**
- * @brief Build version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_BUILD
-    #define APP_VERSION_BUILD    2
-#endif
-
-/**
- * @brief Server's root CA certificate.
- *
- * This certificate is used to identify the AWS IoT server and is publicly
- * available. Refer to the AWS documentation available in the link below for
- * information about the Server Root CAs.
- * https://docs.aws.amazon.com/iot/latest/developerguide/server-authentication.html#server-authentication-certs
- *
- * @note The TI C3220 Launchpad board requires that the Root CA have its
- * certificate self-signed. As mentioned in the above link, the Amazon Root CAs
- * are cross-signed by the Starfield Root CA. Thus, ONLY the Starfield Root CA
- * can be used to connect to the ATS endpoints on AWS IoT for the TI board.
- *
- * @note This certificate should be PEM-encoded.
- *
- * Must include the PEM header and footer:
- * "-----BEGIN CERTIFICATE-----\n"\
- * "...base64 data...\n"\
- * "-----END CERTIFICATE-----\n"
- *
- */
-#define democonfigROOT_CA_PEM                   tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief The length of the queue used to hold commands for the agent.
- */
-#define MQTT_AGENT_COMMAND_QUEUE_LENGTH         ( 25 )
-
-/**
- * @brief Dimensions the buffer used to serialise and deserialise MQTT packets.
- * @note Specified in bytes.  Must be large enough to hold the maximum
- * anticipated MQTT payload.
- */
-#define MQTT_AGENT_NETWORK_BUFFER_SIZE          ( 5000 )
-
-#define MQTT_COMMAND_CONTEXTS_POOL_SIZE              ( 10 )
-
-#endif /* DEMO_CONFIG_H */
diff --git a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/ota_config.h b/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/ota_config.h
deleted file mode 100644
index 49389beb..00000000
--- a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/ota_config.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * AWS IoT Over-the-air Update v3.4.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file ota_config.h
- * @brief This represents the custom values for the configuration macros
- * for the OTA library.
- */
-
-#ifndef OTA_CONFIG_H
-#define OTA_CONFIG_H
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for OTA.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "OTA"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-/**
- * @brief Log base 2 of the size of the file data block message (excluding the header).
- *
- * 10 bits yields a data block size of 1KB.
- */
-#define otaconfigLOG2_FILE_BLOCK_SIZE           12UL
-
-/**
- * @brief Size of the file data block message (excluding the header).
- *
- */
-#define otaconfigFILE_BLOCK_SIZE                ( 1UL << otaconfigLOG2_FILE_BLOCK_SIZE )
-
-/**
- * @brief Milliseconds to wait for the self test phase to succeed before we force reset.
- */
-#define otaconfigSELF_TEST_RESPONSE_WAIT_MS     16000U
-
-/**
- * @brief Milliseconds to wait before requesting data blocks from the OTA service if nothing is happening.
- *
- * The wait timer is reset whenever a data block is received from the OTA service so we will only send
- * the request message after being idle for this amount of time.
- */
-#define otaconfigFILE_REQUEST_WAIT_MS           360000U
-
-/**
- * @brief The maximum allowed length of the thing name used by the OTA agent.
- *
- * AWS IoT requires Thing names to be unique for each device that connects to the broker.
- * Likewise, the OTA agent requires the developer to construct and pass in the Thing name when
- * initializing the OTA agent. The agent uses this size to allocate static storage for the
- * Thing name used in all OTA base topics. Namely $aws/things/<thingName>
- */
-#define otaconfigMAX_THINGNAME_LEN              128U
-
-/**
- * @brief The maximum number of data blocks requested from OTA streaming service.
- *
- *  This configuration parameter is sent with data requests and represents the maximum number of
- *  data blocks the service will send in response. The maximum limit for this must be calculated
- *  from the maximum data response limit (128 KB from service) divided by the block size.
- *  For example if block size is set as 1 KB then the maximum number of data blocks that we can
- *  request is 128/1 = 128 blocks. Configure this parameter to this maximum limit or lower based on
- *  how many data blocks response is expected for each data requests.
- *  Please note that this must be set larger than zero.
- *
- */
-#define otaconfigMAX_NUM_BLOCKS_REQUEST         1U
-#if otaconfigMAX_NUM_BLOCKS_REQUEST > 1U
-#error "otaconfigMAX_NUM_BLOCKS_REQUEST > 1U is not supported in this release "
-#endif
-
-/**
- * @brief The maximum number of requests allowed to send without a response before we abort.
- *
- * This configuration parameter sets the maximum number of times the requests are made over
- * the selected communication channel before aborting and returning error.
- *
- */
-#define otaconfigMAX_NUM_REQUEST_MOMENTUM       1U
-
-/**
- * @brief The number of data buffers reserved by the OTA agent.
- *
- * This configurations parameter sets the maximum number of static data buffers used by
- * the OTA agent for job and file data blocks received.
- */
-#define otaconfigMAX_NUM_OTA_DATA_BUFFERS       otaconfigMAX_NUM_BLOCKS_REQUEST + 2U
-
-/**
- * @brief How frequently the device will report its OTA progress to the cloud.
- *
- * Device will update the job status with the number of blocks it has received every certain
- * number of blocks it receives. For example, 25 means device will update job status every 25 blocks
- * it receives.
- */
-#define otaconfigOTA_UPDATE_STATUS_FREQUENCY    25U
-
-/**
- * @brief Allow update to same or lower version.
- *
- * Set this to 1 to allow downgrade or same version update.This configurations parameter
- * disables version check and allows update to a same or lower version.This is provided for
- * testing purpose and it is recommended to always update to higher version and keep this
- * configuration disabled.
- */
-#define otaconfigAllowDowngrade           0U
-
-/**
- * @brief The protocol selected for OTA control operations.
- *
- * This configurations parameter sets the default protocol for all the OTA control
- * operations like requesting OTA job, updating the job status etc.
- *
- * Note - Only MQTT is supported at this time for control operations.
- */
-#define configENABLED_CONTROL_PROTOCOL    ( OTA_CONTROL_OVER_MQTT )
-
-/**
- * @brief The protocol selected for OTA data operations.
- *
- * This configurations parameter sets the protocols selected for the data operations
- * like requesting file blocks from the service.
- *
- * Note - Both MQTT and HTTP is supported for data transfer from service. This configuration parameter
- * can be set to following -
- * Enable data over MQTT - ( OTA_DATA_OVER_MQTT )
- * Enable data over HTTP - ( OTA_DATA_OVER_HTTP)
- *
- * Note - Please check the OTA over HTTP demo which has the HTTP data transfer functionality and
- * and this configuration is set to OTA_DATA_OVER_HTTP.
- */
-#define configENABLED_DATA_PROTOCOLS      ( OTA_DATA_OVER_MQTT )
-
-/**
- * @brief The preferred protocol selected for OTA data operations.
- *
- * Primary data protocol will be the protocol used for downloading file if more than
- * one protocol is selected while creating OTA job. Default primary data protocol is MQTT
- * and following update here to switch to HTTP as primary.
- *
- * Note - use OTA_DATA_OVER_HTTP for HTTP as primary data protocol.
- */
-
-#define configOTA_PRIMARY_DATA_PROTOCOL    ( OTA_DATA_OVER_MQTT )
-
-
-#endif /* ifndef OTA_CONFIG_H */
diff --git a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/rm_littlefs_flash_config.h b/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/rm_littlefs_flash_config.h
deleted file mode 100644
index 94207ffa..00000000
--- a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/rm_littlefs_flash_config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/***********************************************************************************************************************
- * Copyright 2023 Renesas Electronics Corporation and/or its affiliates.  All Rights Reserved.
- *
- * This software and documentation are supplied by Renesas Electronics America Inc. and may only be used with products
- * of Renesas Electronics Corp. and its affiliates ("Renesas").  No other uses are authorized.  Renesas products are
- * sold pursuant to Renesas terms and conditions of sale.  Purchasers are solely responsible for the selection and use
- * of Renesas products and Renesas assumes no liability.  No license, express or implied, to any intellectual property
- * right is granted by Renesas. This software is protected under all applicable laws, including copyright laws. Renesas
- * reserves the right to change or discontinue this software and/or this documentation. THE SOFTWARE AND DOCUMENTATION
- * IS DELIVERED TO YOU "AS IS," AND RENESAS MAKES NO REPRESENTATIONS OR WARRANTIES, AND TO THE FULLEST EXTENT
- * PERMISSIBLE UNDER APPLICABLE LAW, DISCLAIMS ALL WARRANTIES, WHETHER EXPLICITLY OR IMPLICITLY, INCLUDING WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT, WITH RESPECT TO THE SOFTWARE OR
- * DOCUMENTATION.  RENESAS SHALL HAVE NO LIABILITY ARISING OUT OF ANY SECURITY VULNERABILITY OR BREACH.  TO THE MAXIMUM
- * EXTENT PERMITTED BY LAW, IN NO EVENT WILL RENESAS BE LIABLE TO YOU IN CONNECTION WITH THE SOFTWARE OR DOCUMENTATION
- * (OR ANY PERSON OR ENTITY CLAIMING RIGHTS DERIVED FROM YOU) FOR ANY LOSS, DAMAGES, OR CLAIMS WHATSOEVER, INCLUDING,
- * WITHOUT LIMITATION, ANY DIRECT, CONSEQUENTIAL, SPECIAL, INDIRECT, PUNITIVE, OR INCIDENTAL DAMAGES; ANY LOST PROFITS,
- * OTHER ECONOMIC DAMAGE, PROPERTY DAMAGE, OR PERSONAL INJURY; AND EVEN IF RENESAS HAS BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH LOSS, DAMAGES, CLAIMS OR COSTS.
- **********************************************************************************************************************/
-
-#ifndef FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-#define FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-
-/***********************************************************************************************************************
- * Includes
- **********************************************************************************************************************/
-#include "rm_littlefs_df_rx65n.h"
-
-#define LFS_FLASH_READ_SIZE				(1)
-#define LFS_FLASH_PROGRAM_SIZE			(4)
-#define LFS_FLASH_BLOCK_SIZE			(128)
-#define LFS_FLASH_BLOCK_COUNT			(70)
-#define RM_LITTLEFS_FLASH_DATA_START	FLASH_DF_BLOCK_0_MACRO
-
-#if LFS_FLASH_BLOCK_SIZE*LFS_FLASH_BLOCK_COUNT + (RM_LITTLEFS_FLASH_DATA_START - FLASH_DF_BLOCK_0_MACRO) > BSP_DATA_FLASH_SIZE_BYTES
-#error "Too many blocks"
-#endif
-
-#endif /* FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/shadow_config.h b/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/shadow_config.h
deleted file mode 100644
index aa948c12..00000000
--- a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/shadow_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Shadow v1.3.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file shadow_config.h
- * @brief This represents the custom values for the configuration macros
- * for the Shadow library.
- */
-
-#ifndef SHADOW_CONFIG_H_
-#define SHADOW_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SHADOW"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef SHADOW_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/sigv4_config.h b/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/sigv4_config.h
deleted file mode 100644
index ba277a79..00000000
--- a/Configuration/samples/pso/ck-rx65n/ether/src/frtos_config/sigv4_config.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * SigV4 Library v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file sigv4_config.h
- * @brief The custom values for configuration macros used by the SigV4 Library.
- */
-
-#ifndef SIGV4_CONFIG_H_
-#define SIGV4_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SIGV4"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef SIGV4_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/wifi/linker_section_sample.esi b/Configuration/samples/pso/ck-rx65n/wifi/linker_section_sample.esi
deleted file mode 100644
index 49300ec4..00000000
--- a/Configuration/samples/pso/ck-rx65n/wifi/linker_section_sample.esi
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<com.renesas.linkersection.model:SectionContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:com.renesas.linkersection.model="http:///LinkerSection.ecore">
-  <sections name="SU">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4"/>
-  </sections>
-  <sections name="SI"/>
-  <sections name="R_1"/>
-  <sections name="B_2"/>
-  <sections name="R"/>
-  <sections name="RPFRAM2"/>
-  <sections name="C_LITTLEFS_MANAGEMENT_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1048576"/>
-  </sections>
-  <sections name="C_USER_APPLICATION_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1057536"/>
-  </sections>
-  <sections name="B">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="8388608"/>
-  </sections>
-  <sections name="B_1"/>
-  <sections name="R_2"/>
-  <sections name="PResetPRG">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4293919488"/>
-  </sections>
-  <sections name="C_1"/>
-  <sections name="C_2"/>
-  <sections name="C"/>
-  <sections name="C$*"/>
-  <sections name="D*"/>
-  <sections name="W*"/>
-  <sections name="L"/>
-  <sections name="P"/>
-  <sections name="PFRAM2"/>
-  <sections name="EXCEPTVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294901632"/>
-  </sections>
-  <sections name="RESETVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294901756"/>
-  </sections>
-</com.renesas.linkersection.model:SectionContainer>
diff --git a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/FreeRTOSConfig.h b/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/FreeRTOSConfig.h
deleted file mode 100644
index 5662a8c2..00000000
--- a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/FreeRTOSConfig.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * FreeRTOS Kernel V10.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * http://aws.amazon.com/freertos
- * http://www.FreeRTOS.org
- */
-
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
-
-
-/* Unity includes. */
-#if defined(FREERTOS_ENABLE_UNIT_TESTS)
-#include "unity_internals.h"
-#elif defined(ENABLE_UNIT_TESTS)
-#include "unity.h"
-#endif
-
-/*-----------------------------------------------------------
-* Application specific definitions.
-*
-* These definitions should be adjusted for your particular hardware and
-* application requirements.
-*
-* THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
-* FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
-* http://www.freertos.org/a00110.html
-*
-* The bottom of this file contains some constants specific to running the UDP
-* stack in this demo.  Constants specific to FreeRTOS+TCP itself (rather than
-* the demo) are contained in FreeRTOSIPConfig.h.
-*----------------------------------------------------------*/
-#define configENABLE_BACKWARD_COMPATIBILITY        1
-#define configUSE_PREEMPTION                       1
-#define configUSE_PORT_OPTIMISED_TASK_SELECTION    0
-#define configMAX_PRIORITIES                       (7)
-#define configTICK_RATE_HZ                         (( TickType_t ) 1000)
-#define configMINIMAL_STACK_SIZE                   (768)
-#define configTOTAL_HEAP_SIZE_N						(256)
-#define configTOTAL_HEAP_SIZE                      (( size_t ) ( configTOTAL_HEAP_SIZE_N * 1024 ))
-#define configMAX_TASK_NAME_LEN                    (12)
-#define configUSE_TRACE_FACILITY                   1
-#define configUSE_16_BIT_TICKS                     0
-#define configIDLE_SHOULD_YIELD                    1
-#define configUSE_CO_ROUTINES                      0
-#define configUSE_MUTEXES                          1
-#define configUSE_RECURSIVE_MUTEXES                1
-#define configQUEUE_REGISTRY_SIZE                  0
-#define configUSE_APPLICATION_TASK_TAG             0
-#define configUSE_COUNTING_SEMAPHORES              1
-#define configUSE_ALTERNATIVE_API                  0
-#define configNUM_THREAD_LOCAL_STORAGE_POINTERS    3      /* FreeRTOS+FAT requires 2 pointers if a CWD is supported. */
-#define configRECORD_STACK_HIGH_ADDRESS            1
-
-#define configUSE_DAEMON_TASK_STARTUP_HOOK 1
-
-#define configCPU_CLOCK_HZ				(BSP_ICLK_HZ)
-#define configPERIPHERAL_CLOCK_HZ		(BSP_PCLKB_HZ)
-#define configUSE_QUEUE_SETS			1
-
-/* Hook function related definitions. */
-#define configUSE_TICK_HOOK                        1
-#define configUSE_IDLE_HOOK                        1
-#define configUSE_MALLOC_FAILED_HOOK               1
-#define configCHECK_FOR_STACK_OVERFLOW             2      /* Not applicable to the Win32 port. */
-
-/* Software timer related definitions. */
-#define configUSE_TIMERS                           1
-#define configTIMER_TASK_PRIORITY                  (6)
-#define configTIMER_QUEUE_LENGTH                   5
-#define configTIMER_TASK_STACK_DEPTH               (configMINIMAL_STACK_SIZE)
-
-/* The interrupt priority used by the kernel itself for the tick interrupt and
-the pended interrupt.  This would normally be the lowest priority. */
-#define configKERNEL_INTERRUPT_PRIORITY         1
-
-/* The maximum interrupt priority from which FreeRTOS API calls can be made.
-Interrupts that use a priority above this will not be effected by anything the
-kernel is doing. */
-#define configMAX_SYSCALL_INTERRUPT_PRIORITY    4
-
-/* The peripheral used to generate the tick interrupt is configured as part of
-the application code.  This constant should be set to the vector number of the
-peripheral chosen.  As supplied this is CMT0. */
-#define configTICK_VECTOR						_CMT0_CMI0		//CMT0
-//#define configTICK_VECTOR						_CMT1_CMI1		//CMT1
-//#define configTICK_VECTOR						_CMT2_CMI2		//CMT2
-//#define configTICK_VECTOR						_CMT3_CMI3		//CMT3
-
-/* Event group related definitions. */
-#define configUSE_EVENT_GROUPS                     1
-
-/* Run time stats gathering definitions. */
-unsigned long ulGetRunTimeCounterValue( void );
-void vConfigureTimerForRunTimeStats( void );
-#define configGENERATE_RUN_TIME_STATS    0
-//#define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS()    vConfigureTimerForRunTimeStats()
-//#define portGET_RUN_TIME_COUNTER_VALUE()            ulGetRunTimeCounterValue()
-
-/* Co-routine definitions. */
-#define configUSE_CO_ROUTINES                   0
-#define configMAX_CO_ROUTINE_PRIORITIES         (2)
-
-/* Currently the TCP/IP stack is using dynamic allocation, and the MQTT task is
- * using static allocation. */
-#define configSUPPORT_DYNAMIC_ALLOCATION        1
-#define configSUPPORT_STATIC_ALLOCATION         1
-
-/* Set the following definitions to 1 to include the API function, or zero
- * to exclude the API function. */
-#define INCLUDE_vTaskPrioritySet                1
-#define INCLUDE_uxTaskPriorityGet               1
-#define INCLUDE_vTaskDelete                     1
-#define INCLUDE_vTaskCleanUpResources           0
-#define INCLUDE_vTaskSuspend                    1
-#define INCLUDE_vTaskDelayUntil                 1
-#define INCLUDE_vTaskDelay                      1
-#define INCLUDE_uxTaskGetStackHighWaterMark     1
-#define INCLUDE_xTaskGetSchedulerState          1
-#define INCLUDE_xTimerGetTimerTaskHandle        0
-#define INCLUDE_xTaskGetIdleTaskHandle          0
-#define INCLUDE_xQueueGetMutexHolder            1
-#define INCLUDE_eTaskGetState                   1
-#define INCLUDE_xEventGroupSetBitsFromISR       1
-#define INCLUDE_xTimerPendFunctionCall          1
-#define INCLUDE_xTaskGetCurrentTaskHandle       1
-#define INCLUDE_xTaskAbortDelay                 1
-
-/* This demo makes use of one or more example stats formatting functions.  These
- * format the raw data provided by the uxTaskGetSystemState() function in to human
- * readable ASCII form.  See the notes in the implementation of vTaskList() within
- * FreeRTOS/Source/tasks.c for limitations.  configUSE_STATS_FORMATTING_FUNCTIONS
- * is set to 2 so the formatting functions are included without the stdio.h being
- * included in tasks.c.  That is because this project defines its own sprintf()
- * functions. */
-#define configUSE_STATS_FORMATTING_FUNCTIONS    1
-
-#if defined(ENABLE_UNIT_TESTS) || defined(FREERTOS_ENABLE_UNIT_TESTS)
-/* unity testing */
-#define configASSERT( x ) do { if( ( x ) == 0 ) TEST_ABORT(); } while( 0 )
-#elif defined(CONFIG_FREERTOS_ASSERT_DISABLE) || defined(NDEBUG)
-/* Disable Assert call for release builds. */
-#define configASSERT( x ) ( ( void ) 0 )
-#else /* CONFIG_FREERTOS_ASSERT_FAIL_ABORT or nothing */
-/* Assert call defined for debug builds. */
-extern void vAssertCalled( void );
-#define configASSERT( x ) do { if( ( x ) == 0 ) vAssertCalled(); } while( 0 )
-#endif
-
-/* The function that implements FreeRTOS printf style output, and the macro
- * that maps the configPRINTF() macros to that function. */
-extern void vLoggingPrintf( const char * pcFormat, ... );
-#define configPRINTF( X )    vLoggingPrintf X
-
-/* Non-format version thread-safe print */
-extern void vLoggingPrint( const char * pcMessage );
-#define configPRINT( X )     vLoggingPrint( X )
-
-extern void vOutputString( const char * pcMessage );
-/* Map the logging task's printf to the board specific output function. */
-#define configPRINT_STRING( x )    vOutputString(x)
-
-/* Sets the length of the buffers into which logging messages are written - so
- * also defines the maximum length of each log message. */
-#define configLOGGING_MAX_MESSAGE_LENGTH            192
-
-/* Set to 1 to prepend each log message with a message number, the task name,
- * and a time stamp. */
-#define configLOGGING_INCLUDE_TIME_AND_TASK_NAME    1
-
-/* Application specific definitions follow. **********************************/
-
-/* If configINCLUDE_DEMO_DEBUG_STATS is set to one, then a few basic IP trace
- * macros are defined to gather some UDP stack statistics that can then be viewed
- * through the CLI interface. */
-#define configINCLUDE_DEMO_DEBUG_STATS       1
-
-/* The size of the global output buffer that is available for use when there
- * are multiple command interpreters running at once (for example, one on a UART
- * and one on TCP/IP).  This is done to prevent an output buffer being defined by
- * each implementation - which would waste RAM.  In this case, there is only one
- * command interpreter running, and it has its own local output buffer, so the
- * global buffer is just set to be one byte long as it is not used and should not
- * take up unnecessary RAM. */
-#define configCOMMAND_INT_MAX_OUTPUT_SIZE    850
-
-/* Only used when running in the FreeRTOS Windows simulator.  Defines the
- * priority of the task used to simulate Ethernet interrupts. */
-#define configMAC_ISR_SIMULATOR_PRIORITY     ( configMAX_PRIORITIES - 1 )
-
-/* This demo creates a virtual network connection by accessing the raw Ethernet
- * or WiFi data to and from a real network connection.  Many computers have more
- * than one real network port, and configNETWORK_INTERFACE_TO_USE is used to tell
- * the demo which real port should be used to create the virtual port.  The ports
- * available are displayed on the console when the application is executed.  For
- * example, on my development laptop setting configNETWORK_INTERFACE_TO_USE to 4
- * results in the wired network being used, while setting
- * configNETWORK_INTERFACE_TO_USE to 2 results in the wireless network being
- * used. */
-#define configNETWORK_INTERFACE_TO_USE       2L
-
-/* The address of an echo server that will be used by the two demo echo client
- * tasks:
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_Echo_Clients.html,
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/UDP_Echo_Clients.html. */
-#define configECHO_SERVER_ADDR0              192
-#define configECHO_SERVER_ADDR1              168
-#define configECHO_SERVER_ADDR2              1
-#define configECHO_SERVER_ADDR3              200
-#define configTCP_ECHO_CLIENT_PORT           9999
-
-/* Default MAC address configuration.  The demo creates a virtual network
- * connection that uses this MAC address by accessing the raw Ethernet/WiFi data
- * to and from a real network connection on the host PC.  See the
- * configNETWORK_INTERFACE_TO_USE definition above for information on how to
- * configure the real network connection to use. */
-#define configMAC_ADDR0                      0x74
-#define configMAC_ADDR1                      0x90
-#define configMAC_ADDR2                      0x50
-#define configMAC_ADDR3                      0x00
-#define configMAC_ADDR4                      0x79
-#define configMAC_ADDR5                      0x03
-
-/* Default IP address configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configIP_ADDR0                       192
-#define configIP_ADDR1                       168
-#define configIP_ADDR2                       11
-#define configIP_ADDR3                       12
-
-/* Default gateway IP address configuration.  Used in ipconfigUSE_DHCP is set to
- * 0, or ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configGATEWAY_ADDR0                  172
-#define configGATEWAY_ADDR1                  27
-#define configGATEWAY_ADDR2                  49
-#define configGATEWAY_ADDR3                  1
-
-/* Default DNS server configuration.  OpenDNS addresses are 208.67.222.222 and
- * 208.67.220.220.  Used in ipconfigUSE_DHCP is set to 0, or ipconfigUSE_DHCP is
- * set to 1 but a DNS server cannot be contacted.*/
-#define configDNS_SERVER_ADDR0               143
-#define configDNS_SERVER_ADDR1               103
-#define configDNS_SERVER_ADDR2               47
-#define configDNS_SERVER_ADDR3               193
-
-/* Default netmask configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configNET_MASK0                      255
-#define configNET_MASK1                      255
-#define configNET_MASK2                      255
-#define configNET_MASK3                      0
-
-/* The UDP port to which print messages are sent. */
-#define configPRINT_PORT                     ( 15000 )
-
-#define configPROFILING                      ( 0 )
-
-/* Pseudo random number generater used by some demo tasks. */
-uint32_t ulRand(void);
-#define configRAND32()    ulRand()
-
-/* The platform FreeRTOS is running on. */
-#define configPLATFORM_NAME    "RenesasRX65N"
-
-/* Header required for the tracealyzer recorder library. */
-//#include "trcRecorder.h"
-
-/* When the FIT configurator or the Smart Configurator is used, platform.h has to be used. */
-#define configINCLUDE_PLATFORM_H_INSTEAD_OF_IODEFINE_H  1
-
-#endif /* FREERTOS_CONFIG_H */
diff --git a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/core_http_config.h b/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/core_http_config.h
deleted file mode 100644
index 1a2c82e0..00000000
--- a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/core_http_config.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * coreHTTP v3.0.0
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_HTTP_CONFIG_H_
-#define CORE_HTTP_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging config definition and header files inclusion are required in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for HTTP.
- * 3. Include the header file "logging_stack.h", if logging is enabled for HTTP.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the HTTP library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "HTTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_HTTP_CONFIG_ */
diff --git a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/core_mqtt_agent_config.h b/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/core_mqtt_agent_config.h
deleted file mode 100644
index 08994a84..00000000
--- a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/core_mqtt_agent_config.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * coreMQTT Agent v1.2.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_mqtt_agent_config.h
- * @brief This represents the default values for the configuration macros
- * for the MQTT-Agent library.
- */
-
-#ifndef CORE_MQTT_AGENT_CONFIG_H_
-#define CORE_MQTT_AGENT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT Agent.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT_Agent"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
- * @brief Maximum time MQTT agent waits in the queue for any pending MQTT
- * operations.
- *
- * The wait time is kept smallest possible to increase the responsiveness of
- * MQTT agent while processing  pending MQTT operations as well as receive
- * packets from network.
- */
-#define MQTT_AGENT_MAX_EVENT_QUEUE_WAIT_TIME    ( 50U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_AGENT_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/core_mqtt_config.h b/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/core_mqtt_config.h
deleted file mode 100644
index 6222626b..00000000
--- a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/core_mqtt_config.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * coreMQTT v2.1.1
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_MQTT_CONFIG_H_
-#define CORE_MQTT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief The maximum duration between non-empty network reads while
-* receiving an MQTT packet via the #MQTT_ProcessLoop or #MQTT_ReceiveLoop
-* API functions.
-*
-* When an incoming MQTT packet is detected, the transport receive function
-* may be called multiple times until all of the expected number of bytes of the
-* packet are received. This timeout represents the maximum polling duration that
-* is allowed without any data reception from the network for the incoming packet.
-*
-* If the timeout expires, the #MQTT_ProcessLoop and #MQTT_ReceiveLoop functions
-* return #MQTTRecvFailed.
-*
-* @note If a dummy implementation of the #MQTTGetCurrentTimeFunc_t timer function,
-* is supplied to the library, then #MQTT_RECV_POLLING_TIMEOUT_MS MUST be set to 0.
-*
-* <b>Possible values:</b> Any positive 32 bit integer. Recommended to use a
-* small timeout value. <br>
-* <b>Default value:</b> `10`
-*
-*/
-#define MQTT_RECV_POLLING_TIMEOUT_MS    ( 1000U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/core_pkcs11_config.h b/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/core_pkcs11_config.h
deleted file mode 100644
index e18f347c..00000000
--- a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/core_pkcs11_config.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * corePKCS11 v3.5.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_pkcs11_config.h
- * @brief List of configuration macros for the corePKCS11 library along with
- * their custom values.
- */
-
-#ifndef CORE_PKCS11_CONFIG_H_
-#define CORE_PKCS11_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for PKCS #11.
- * 3. Include the header file "logging_stack.h", if logging is enabled for PKCS #11.
- */
-#include "logging_levels.h"
-
-/* Logging configuration for the PKCS #11 library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "PKCS11"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_ERROR
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief Maximum number of sessions that can be stored
-* by the PKCS #11 module.
-*
-* @note The windows test port has an abnormally large value in order to have
-* enough sessions to successfully run all the model based PKCS #11 tests.
-*
-* <b>Possible values:</b> Any positive integer.<br>
-* <b>Default value:</b> 10
-*/
-#define pkcs11configMAX_NUM_OBJECTS    8
-
-/**
-* @brief Set to 1 if a PAL destroy object is implemented.
-*
-* If set to 0, no PAL destroy object is implemented, and this functionality
-* is implemented in the common PKCS #11 layer.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configPAL_DESTROY_SUPPORTED    1
-
-/**
-* @brief Set to 1 if OTA image verification via PKCS #11 module is supported.
-*
-* If set to 0, OTA code signing certificate is built in via
-* aws_ota_codesigner_certificate.h.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configOTA_SUPPORTED    1
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* CORE_PKCS11_CONFIG_H_ include guard. */
diff --git a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/core_sntp_config.h b/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/core_sntp_config.h
deleted file mode 100644
index a6303826..00000000
--- a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/core_sntp_config.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * coreSNTP v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_sntp_config.h
- * @brief This file represents the custom values for the configuration macros
- * of the coreSNTP library.
- */
-
-#ifndef CORE_SNTP_CONFIG_H_
-#define CORE_SNTP_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for SNTP.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "SNTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef CORE_SNTP_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/defender_config.h b/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/defender_config.h
deleted file mode 100644
index d0b3d8e4..00000000
--- a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/defender_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Defender Client v1.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file defender_config.h
- * @brief Custom config values for the AWS IoT Device Defender Client Library.
- */
-
-#ifndef DEFENDER_CONFIG_H_
-#define DEFENDER_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for Device Defender.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "Defender"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* DEFENDER_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/demo_config.h b/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/demo_config.h
deleted file mode 100644
index 3fb828c8..00000000
--- a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/demo_config.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * FreeRTOS V202111.00
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * https://www.FreeRTOS.org
- * https://github.com/FreeRTOS
- *
- */
-
-#ifndef DEMO_CONFIG_H
-#define DEMO_CONFIG_H
-
-/* FreeRTOS include. */
-#include "FreeRTOS.h"
-#include "aws_clientcredential.h"
-#include "aws_clientcredential_keys.h"
-#include "iot_default_root_certificates.h"
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for DEMO.
- * 3. Include the header file "logging_stack.h", if logging is enabled for DEMO.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Demo. */
-#ifndef LIBRARY_LOG_NAME
-#define LIBRARY_LOG_NAME    "MQTTDemo"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-#define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "iot_logging_task.h"
-
-
-/* Select a combination of demos to run
- * These demo has not been evaluated outside of the combination of demos listed below.
- *
- *          PUBSUB demo only :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB and OTA over MQTT demo :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (1)
- *          PUBSUB and OTA over MQTT demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (1)
- */
-/* demo is configured for PUBSUB */
-/* Select demo combination to run. */
-
-/* Please select a provisioning method
- * (0) : Pre-provisioning
- * (1) : Fleet provisioning
- */
-#define ENABLE_FLEET_PROVISIONING_DEMO      (0)
-
-/* Please select whether to enable or disable the OTA demo
- * (0) : OTA demo is disabled
- * (1) : OTA over MQTT demo is enabled
- */
-#define ENABLE_OTA_UPDATE_DEMO              (1)
-
-#define democonfigROOT_CA_PEM               tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief Path of the file containing the provisioning claim certificate. This
- * certificate is used to connect to AWS IoT Core and use Fleet Provisioning
- * APIs to provision the client device. This is used for the "Provisioning by
- * Claim" provisioning workflow.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This certificate should be PEM-encoded. The certificate should be
- * registered on AWS IoT Core beforehand. It should have an AWS IoT policy to
- * allow it to access only the Fleet Provisioning APIs. An example policy for
- * the claim certificates for this demo is available in the
- * example_claim_policy.json file in the demo directory. In the example,
- * replace <aws-region> with your AWS region, <aws-account-id> with your
- * account ID, and <template-name> with the name of your provisioning template.
- *
- */
-#define democonfigCLAIM_CERT_PEM            "...insert here..."
-
-/**
- * @brief Path of the file containing the provisioning claim private key. This
- * key corresponds to the provisioning claim certificate and is used to
- * authenticate with AWS IoT for provisioning by claim.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This private key should be PEM-encoded.
- *
- */
-#define democonfigCLAIM_PRIVATE_KEY_PEM     "...insert here..."
-
-/**
- * @brief An option to disable Server Name Indication.
- *
- * @note When using a local Mosquitto server setup, SNI needs to be disabled
- * for an MQTT broker that only has an IP address but no hostname. However,
- * SNI should be enabled whenever possible.
- */
-#define democonfigDISABLE_SNI                ( pdFALSE )
-
-/**
- * @brief Configuration that indicates if the demo connection is made to the AWS IoT Core MQTT broker.
- *
- * If username/password based authentication is used, the demo will use appropriate TLS ALPN and
- * SNI configurations as required for the Custom Authentication feature of AWS IoT.
- * For more information, refer to the following documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/custom-auth.html#custom-auth-mqtt
- *
- * #define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
- */
-#define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
-
-/**
- * @brief The unique ID used by the demo to differentiate instances.
- *
- *!!! Please note a #defined constant is used for convenience of demonstration
- *!!! only.  Production devices can use something unique to the device that can
- *!!! be read by software, such as a production serial number, instead of a
- *!!! hard coded constant.
- */
-#define democonfigFP_DEMO_ID    "FPDemoID"
-
-/**
- * @brief The MQTT client identifier used in this example.  Each client identifier
- * must be unique so edit as required to ensure no two clients connecting to the
- * same broker use the same client identifier.
- *
- * @note Appending __TIME__ to the client id string will reduce the possibility of a
- * client id collision in the broker. Note that the appended time is the compilation
- * time. This client id can cause collision, if more than one instance of the same
- * binary is used at the same time to connect to the broker.
- */
-#ifndef democonfigCLIENT_IDENTIFIER
-#if (ENABLE_FLEET_PROVISIONING_DEMO == 1)
-    #define democonfigCLIENT_IDENTIFIER    "client"democonfigFP_DEMO_ID
-#else
-    #define democonfigCLIENT_IDENTIFIER    clientcredentialIOT_THING_NAME
-#endif
-#endif
-
-/**
- * @brief Details of the MQTT broker to connect to.
- *
- * This is the Claim's Rest API Endpoint for AWS IoT.
- *
- * @note Your AWS IoT Core endpoint can be found in the AWS IoT console under
- * Settings/Custom Endpoint, or using the describe-endpoint API.
- *
- */
-#define democonfigMQTT_BROKER_ENDPOINT     clientcredentialMQTT_BROKER_ENDPOINT
-
-/**
- * @brief AWS IoT MQTT broker port number.
- *
- * In general, port 8883 is for secured MQTT connections.
- *
- * @note Port 443 requires use of the ALPN TLS extension with the ALPN protocol
- * name. When using port 8883, ALPN is not required.
- */
-#define democonfigMQTT_BROKER_PORT    ( clientcredentialMQTT_BROKER_PORT )
-
-/**
- * @brief Name of the provisioning template to use for the RegisterThing
- * portion of the Fleet Provisioning workflow.
- *
- * For information about provisioning templates, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-template.html#fleet-provision-template
- *
- * The example template used for this demo is available in the
- * example_demo_template.json file in the DemoSetup directory. In the example,
- * replace <provisioned-thing-policy> with the policy provisioned devices
- * should have.  The demo template uses Fn::Join to construct the Thing name by
- * concatenating fp_demo_ and the serial number sent by the demo.
- *
- * @note The provisioning template MUST be created in AWS IoT before running the
- * demo.
- *
- * @note If you followed the manual setup steps on https://freertos.org/iot-fleet-provisioning/demo.html,
- * the provisioning template name is "FleetProvisioningDemoTemplate".
- * However, if you used CloudFormation to set up the demo, the template name is "CF_FleetProvisioningDemoTemplate"
- */
- #define democonfigPROVISIONING_TEMPLATE_NAME    "...insert here..."
-
-/**
- * @brief Subject name to use when creating the certificate signing request (CSR)
- * for provisioning the demo client with using the Fleet Provisioning
- * CreateCertificateFromCsr APIs.
- *
- * This is passed to MbedTLS; see https://tls.mbed.org/api/x509__csr_8h.html#a954eae166b125cea2115b7db8c896e90
- */
-#ifndef democonfigCSR_SUBJECT_NAME
-    #define democonfigCSR_SUBJECT_NAME    "CN="democonfigFP_DEMO_ID
-#endif
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_STACKSIZE        configMINIMAL_STACK_SIZE * 3
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_TASK_PRIORITY    ( tskIDLE_PRIORITY + 1 )
-
-#define democonfigNETWORK_BUFFER_SIZE    ( configMINIMAL_STACK_SIZE * 3 )
-
-#include "core_mqtt.h" /* Include coreMQTT header for MQTT_LIBRARY_VERSION macro. */
-#define democonfigMQTT_LIB    "core-mqtt@"MQTT_LIBRARY_VERSION
-
-#define democonfigDISABLE_SNI       ( pdFALSE )
-
-/**
- * @brief ALPN (Application-Layer Protocol Negotiation) protocol name for AWS IoT MQTT.
- *
- * This will be used if democonfigMQTT_BROKER_PORT is configured as 443 for the AWS IoT MQTT broker.
- * Please see more details about the ALPN protocol for AWS IoT MQTT endpoint
- * in the link below.
- * https://aws.amazon.com/blogs/iot/mqtt-with-tls-client-authentication-on-port-443-why-it-is-useful-and-how-it-works/
- */
-#define AWS_IOT_MQTT_ALPN           "\x0ex-amzn-mqtt-ca"
-
-/**
- * @brief This is the ALPN (Application-Layer Protocol Negotiation) string
- * required by AWS IoT for password-based authentication using TCP port 443.
- */
-#define AWS_IOT_CUSTOM_AUTH_ALPN    "\x04mqtt"
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-/**
- * @brief The name of the operating system that the application is running on.
- * The current value is given as an example. Please update for your specific
- * operating system.
- */
-#define democonfigOS_NAME       "FreeRTOS"
-
-/**
- * @brief The version of the operating system that the application is running
- * on. The current value is given as an example. Please update for your specific
- * operating system version.
- */
-#define democonfigOS_VERSION    "V10.4.3"
-
-/**
- * @brief The name of the hardware platform the application is running on. The
- * current value is given as an example. Please update for your specific
- * hardware platform.
- */
-#define democonfigHARDWARE_PLATFORM_NAME    "CK-RX65N"
-
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING                                 \
-    "?SDK=" democonfigOS_NAME "&Version=" democonfigOS_VERSION \
-    "&MQTTLib=" democonfigMQTT_LIB
-
-/**
- * @brief The length of the MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING_LENGTH    ( ( uint16_t ) ( sizeof( AWS_IOT_METRICS_STRING ) - 1 ) )
-
-
-#ifdef democonfigCLIENT_USERNAME
-
-/**
- * @brief Append the username with the metrics string if #democonfigCLIENT_USERNAME is defined.
- *
- * This is to support both metrics reporting and username/password based client
- * authentication by AWS IoT.
- */
-#define CLIENT_USERNAME_WITH_METRICS    democonfigCLIENT_USERNAME AWS_IOT_METRICS_STRING
-#endif
-
-/**
- * @brief Flag to enable or disable provisioning mode for the demo.
- * Enabling the flags starts a CLI task, so that user can perform provisioning of the device through
- * a serial terminal. Provisioning involves running commands to fetch or set the PKI and configuration
- * information for the device to connect to broker and perform OTA updates. Disabling the flag results
- * in disabling the CLI task and execution of the demo tasks in normal device operation mode.
- */
-#define appmainPROVISIONING_MODE                  ( 1 )
-
-/**
- * @brief Certificate used for validating code signing signatures in the OTA PAL.
- */
-#ifndef otapalconfigCODE_SIGNING_CERTIFICATE
-    #define otapalconfigCODE_SIGNING_CERTIFICATE    "Insert code signing certificate..."
-#endif
-
-/**
- * @brief Major version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MAJOR
-    #define APP_VERSION_MAJOR    0
-#endif
-
-/**
- * @brief Minor version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MINOR
-    #define APP_VERSION_MINOR    9
-#endif
-
-/**
- * @brief Build version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_BUILD
-    #define APP_VERSION_BUILD    2
-#endif
-
-/**
- * @brief Server's root CA certificate.
- *
- * This certificate is used to identify the AWS IoT server and is publicly
- * available. Refer to the AWS documentation available in the link below for
- * information about the Server Root CAs.
- * https://docs.aws.amazon.com/iot/latest/developerguide/server-authentication.html#server-authentication-certs
- *
- * @note The TI C3220 Launchpad board requires that the Root CA have its
- * certificate self-signed. As mentioned in the above link, the Amazon Root CAs
- * are cross-signed by the Starfield Root CA. Thus, ONLY the Starfield Root CA
- * can be used to connect to the ATS endpoints on AWS IoT for the TI board.
- *
- * @note This certificate should be PEM-encoded.
- *
- * Must include the PEM header and footer:
- * "-----BEGIN CERTIFICATE-----\n"\
- * "...base64 data...\n"\
- * "-----END CERTIFICATE-----\n"
- *
- */
-#define democonfigROOT_CA_PEM                   tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief The length of the queue used to hold commands for the agent.
- */
-#define MQTT_AGENT_COMMAND_QUEUE_LENGTH         ( 25 )
-
-/**
- * @brief Dimensions the buffer used to serialise and deserialise MQTT packets.
- * @note Specified in bytes.  Must be large enough to hold the maximum
- * anticipated MQTT payload.
- */
-#define MQTT_AGENT_NETWORK_BUFFER_SIZE          ( 5000 )
-
-#define MQTT_COMMAND_CONTEXTS_POOL_SIZE              ( 10 )
-
-#endif /* DEMO_CONFIG_H */
diff --git a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/ota_config.h b/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/ota_config.h
deleted file mode 100644
index 38a3df57..00000000
--- a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/ota_config.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * AWS IoT Over-the-air Update v3.4.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file ota_config.h
- * @brief This represents the custom values for the configuration macros
- * for the OTA library.
- */
-
-#ifndef OTA_CONFIG_H
-#define OTA_CONFIG_H
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for OTA.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "OTA"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-/**
- * @brief Log base 2 of the size of the file data block message (excluding the header).
- *
- * 10 bits yields a data block size of 1KB.
- */
-#define otaconfigLOG2_FILE_BLOCK_SIZE           12UL
-
-/**
- * @brief Size of the file data block message (excluding the header).
- *
- */
-#define otaconfigFILE_BLOCK_SIZE                ( 1UL << otaconfigLOG2_FILE_BLOCK_SIZE )
-
-/**
- * @brief Milliseconds to wait for the self test phase to succeed before we force reset.
- */
-#define otaconfigSELF_TEST_RESPONSE_WAIT_MS     16000U
-
-/**
- * @brief Milliseconds to wait before requesting data blocks from the OTA service if nothing is happening.
- *
- * The wait timer is reset whenever a data block is received from the OTA service so we will only send
- * the request message after being idle for this amount of time.
- */
-#define otaconfigFILE_REQUEST_WAIT_MS           360000U
-
-/**
- * @brief The maximum allowed length of the thing name used by the OTA agent.
- *
- * AWS IoT requires Thing names to be unique for each device that connects to the broker.
- * Likewise, the OTA agent requires the developer to construct and pass in the Thing name when
- * initializing the OTA agent. The agent uses this size to allocate static storage for the
- * Thing name used in all OTA base topics. Namely $aws/things/<thingName>
- */
-#define otaconfigMAX_THINGNAME_LEN              128U
-
-/**
- * @brief The maximum number of data blocks requested from OTA streaming service.
- *
- *  This configuration parameter is sent with data requests and represents the maximum number of
- *  data blocks the service will send in response. The maximum limit for this must be calculated
- *  from the maximum data response limit (128 KB from service) divided by the block size.
- *  For example if block size is set as 1 KB then the maximum number of data blocks that we can
- *  request is 128/1 = 128 blocks. Configure this parameter to this maximum limit or lower based on
- *  how many data blocks response is expected for each data requests.
- *  Please note that this must be set larger than zero.
- *
- */
-#define otaconfigMAX_NUM_BLOCKS_REQUEST         1U
-#if otaconfigMAX_NUM_BLOCKS_REQUEST > 1U
-#error "otaconfigMAX_NUM_BLOCKS_REQUEST > 1U is not supported in this release "
-#endif
-
-/**
- * @brief The maximum number of requests allowed to send without a response before we abort.
- *
- * This configuration parameter sets the maximum number of times the requests are made over
- * the selected communication channel before aborting and returning error.
- *
- */
-#define otaconfigMAX_NUM_REQUEST_MOMENTUM       1U
-
-/**
- * @brief The number of data buffers reserved by the OTA agent.
- *
- * This configurations parameter sets the maximum number of static data buffers used by
- * the OTA agent for job and file data blocks received.
- */
-#define otaconfigMAX_NUM_OTA_DATA_BUFFERS       otaconfigMAX_NUM_BLOCKS_REQUEST + 1U
-
-/**
- * @brief How frequently the device will report its OTA progress to the cloud.
- *
- * Device will update the job status with the number of blocks it has received every certain
- * number of blocks it receives. For example, 25 means device will update job status every 25 blocks
- * it receives.
- */
-#define otaconfigOTA_UPDATE_STATUS_FREQUENCY    25U
-
-/**
- * @brief Allow update to same or lower version.
- *
- * Set this to 1 to allow downgrade or same version update.This configurations parameter
- * disables version check and allows update to a same or lower version.This is provided for
- * testing purpose and it is recommended to always update to higher version and keep this
- * configuration disabled.
- */
-#define otaconfigAllowDowngrade           0U
-
-/**
- * @brief The protocol selected for OTA control operations.
- *
- * This configurations parameter sets the default protocol for all the OTA control
- * operations like requesting OTA job, updating the job status etc.
- *
- * Note - Only MQTT is supported at this time for control operations.
- */
-#define configENABLED_CONTROL_PROTOCOL    ( OTA_CONTROL_OVER_MQTT )
-
-/**
- * @brief The protocol selected for OTA data operations.
- *
- * This configurations parameter sets the protocols selected for the data operations
- * like requesting file blocks from the service.
- *
- * Note - Both MQTT and HTTP is supported for data transfer from service. This configuration parameter
- * can be set to following -
- * Enable data over MQTT - ( OTA_DATA_OVER_MQTT )
- * Enable data over HTTP - ( OTA_DATA_OVER_HTTP)
- *
- * Note - Please check the OTA over HTTP demo which has the HTTP data transfer functionality and
- * and this configuration is set to OTA_DATA_OVER_HTTP.
- */
-#define configENABLED_DATA_PROTOCOLS      ( OTA_DATA_OVER_MQTT )
-
-/**
- * @brief The preferred protocol selected for OTA data operations.
- *
- * Primary data protocol will be the protocol used for downloading file if more than
- * one protocol is selected while creating OTA job. Default primary data protocol is MQTT
- * and following update here to switch to HTTP as primary.
- *
- * Note - use OTA_DATA_OVER_HTTP for HTTP as primary data protocol.
- */
-
-#define configOTA_PRIMARY_DATA_PROTOCOL    ( OTA_DATA_OVER_MQTT )
-
-
-#endif /* ifndef OTA_CONFIG_H */
diff --git a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/rm_littlefs_flash_config.h b/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/rm_littlefs_flash_config.h
deleted file mode 100644
index 94207ffa..00000000
--- a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/rm_littlefs_flash_config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/***********************************************************************************************************************
- * Copyright 2023 Renesas Electronics Corporation and/or its affiliates.  All Rights Reserved.
- *
- * This software and documentation are supplied by Renesas Electronics America Inc. and may only be used with products
- * of Renesas Electronics Corp. and its affiliates ("Renesas").  No other uses are authorized.  Renesas products are
- * sold pursuant to Renesas terms and conditions of sale.  Purchasers are solely responsible for the selection and use
- * of Renesas products and Renesas assumes no liability.  No license, express or implied, to any intellectual property
- * right is granted by Renesas. This software is protected under all applicable laws, including copyright laws. Renesas
- * reserves the right to change or discontinue this software and/or this documentation. THE SOFTWARE AND DOCUMENTATION
- * IS DELIVERED TO YOU "AS IS," AND RENESAS MAKES NO REPRESENTATIONS OR WARRANTIES, AND TO THE FULLEST EXTENT
- * PERMISSIBLE UNDER APPLICABLE LAW, DISCLAIMS ALL WARRANTIES, WHETHER EXPLICITLY OR IMPLICITLY, INCLUDING WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT, WITH RESPECT TO THE SOFTWARE OR
- * DOCUMENTATION.  RENESAS SHALL HAVE NO LIABILITY ARISING OUT OF ANY SECURITY VULNERABILITY OR BREACH.  TO THE MAXIMUM
- * EXTENT PERMITTED BY LAW, IN NO EVENT WILL RENESAS BE LIABLE TO YOU IN CONNECTION WITH THE SOFTWARE OR DOCUMENTATION
- * (OR ANY PERSON OR ENTITY CLAIMING RIGHTS DERIVED FROM YOU) FOR ANY LOSS, DAMAGES, OR CLAIMS WHATSOEVER, INCLUDING,
- * WITHOUT LIMITATION, ANY DIRECT, CONSEQUENTIAL, SPECIAL, INDIRECT, PUNITIVE, OR INCIDENTAL DAMAGES; ANY LOST PROFITS,
- * OTHER ECONOMIC DAMAGE, PROPERTY DAMAGE, OR PERSONAL INJURY; AND EVEN IF RENESAS HAS BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH LOSS, DAMAGES, CLAIMS OR COSTS.
- **********************************************************************************************************************/
-
-#ifndef FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-#define FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-
-/***********************************************************************************************************************
- * Includes
- **********************************************************************************************************************/
-#include "rm_littlefs_df_rx65n.h"
-
-#define LFS_FLASH_READ_SIZE				(1)
-#define LFS_FLASH_PROGRAM_SIZE			(4)
-#define LFS_FLASH_BLOCK_SIZE			(128)
-#define LFS_FLASH_BLOCK_COUNT			(70)
-#define RM_LITTLEFS_FLASH_DATA_START	FLASH_DF_BLOCK_0_MACRO
-
-#if LFS_FLASH_BLOCK_SIZE*LFS_FLASH_BLOCK_COUNT + (RM_LITTLEFS_FLASH_DATA_START - FLASH_DF_BLOCK_0_MACRO) > BSP_DATA_FLASH_SIZE_BYTES
-#error "Too many blocks"
-#endif
-
-#endif /* FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/shadow_config.h b/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/shadow_config.h
deleted file mode 100644
index aa948c12..00000000
--- a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/shadow_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Shadow v1.3.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file shadow_config.h
- * @brief This represents the custom values for the configuration macros
- * for the Shadow library.
- */
-
-#ifndef SHADOW_CONFIG_H_
-#define SHADOW_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SHADOW"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef SHADOW_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/sigv4_config.h b/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/sigv4_config.h
deleted file mode 100644
index ba277a79..00000000
--- a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/sigv4_config.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * SigV4 Library v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file sigv4_config.h
- * @brief The custom values for configuration macros used by the SigV4 Library.
- */
-
-#ifndef SIGV4_CONFIG_H_
-#define SIGV4_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SIGV4"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef SIGV4_CONFIG_H_ */
diff --git a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/user_tcp_hook_config.h b/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/user_tcp_hook_config.h
deleted file mode 100644
index abe7b80b..00000000
--- a/Configuration/samples/pso/ck-rx65n/wifi/src/frtos_config/user_tcp_hook_config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**********************************************************************************************************************
- * Copyright (C) 2023 Renesas Electronics Corporation. All rights reserved.
- *
- * DISCLAIMER
- * This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
- * other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
- * applicable laws, including copyright laws.
- * THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
- * THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
- * EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
- * SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS
- * SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
- * this software. By using this software, you agree to the additional terms and conditions found by accessing the
- * following link:
- * http://www.renesas.com/disclaimer
- *********************************************************************************************************************/
-
-#ifndef FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_
-#define FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_
-
-/* The limit of number for WIFI_ERR_MODULE_COM when it comes continuously.
- * If counter is over than this limit, hook the reset */
-#define USER_COMM_ERROR_TRIES		3
-
-/*Connection retry limit*/
-#define USER_RECONNECT_TRIES 		3
-
-/*Socket closing retry limit*/
-#define USER_CLOSE_SOCKET_TRIES		3
-
-/*Enable SocketErrorHook*/
-#define USER_TCP_HOOK_ENABLED   	1 /* Default */
-
-#endif /* FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/cellular/linker_section_sample.esi b/Configuration/samples/pubsub/ck-rx65n/cellular/linker_section_sample.esi
deleted file mode 100644
index 3371ded6..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/cellular/linker_section_sample.esi
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<com.renesas.linkersection.model:SectionContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:com.renesas.linkersection.model="http:///LinkerSection.ecore">
-  <sections name="SU">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4"/>
-  </sections>
-  <sections name="SI"/>
-  <sections name="R_1"/>
-  <sections name="B_2"/>
-  <sections name="R"/>
-  <sections name="RPFRAM2"/>
-  <sections name="C_LITTLEFS_MANAGEMENT_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1048576"/>
-  </sections>
-  <sections name="C_USER_APPLICATION_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1057536"/>
-  </sections>
-  <sections name="B">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="8388608"/>
-  </sections>
-  <sections name="B_1"/>
-  <sections name="R_2"/>
-  <sections name="PResetPRG">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4293919488"/>
-  </sections>
-  <sections name="C_1"/>
-  <sections name="C_2"/>
-  <sections name="C"/>
-  <sections name="C$*"/>
-  <sections name="D*"/>
-  <sections name="W*"/>
-  <sections name="L"/>
-  <sections name="P"/>
-  <sections name="PFRAM2"/>
-  <sections name="EXCEPTVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294967168"/>
-  </sections>
-  <sections name="RESETVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294967292"/>
-  </sections>
-</com.renesas.linkersection.model:SectionContainer>
diff --git a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/FreeRTOSConfig.h b/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/FreeRTOSConfig.h
deleted file mode 100644
index 5662a8c2..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/FreeRTOSConfig.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * FreeRTOS Kernel V10.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * http://aws.amazon.com/freertos
- * http://www.FreeRTOS.org
- */
-
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
-
-
-/* Unity includes. */
-#if defined(FREERTOS_ENABLE_UNIT_TESTS)
-#include "unity_internals.h"
-#elif defined(ENABLE_UNIT_TESTS)
-#include "unity.h"
-#endif
-
-/*-----------------------------------------------------------
-* Application specific definitions.
-*
-* These definitions should be adjusted for your particular hardware and
-* application requirements.
-*
-* THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
-* FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
-* http://www.freertos.org/a00110.html
-*
-* The bottom of this file contains some constants specific to running the UDP
-* stack in this demo.  Constants specific to FreeRTOS+TCP itself (rather than
-* the demo) are contained in FreeRTOSIPConfig.h.
-*----------------------------------------------------------*/
-#define configENABLE_BACKWARD_COMPATIBILITY        1
-#define configUSE_PREEMPTION                       1
-#define configUSE_PORT_OPTIMISED_TASK_SELECTION    0
-#define configMAX_PRIORITIES                       (7)
-#define configTICK_RATE_HZ                         (( TickType_t ) 1000)
-#define configMINIMAL_STACK_SIZE                   (768)
-#define configTOTAL_HEAP_SIZE_N						(256)
-#define configTOTAL_HEAP_SIZE                      (( size_t ) ( configTOTAL_HEAP_SIZE_N * 1024 ))
-#define configMAX_TASK_NAME_LEN                    (12)
-#define configUSE_TRACE_FACILITY                   1
-#define configUSE_16_BIT_TICKS                     0
-#define configIDLE_SHOULD_YIELD                    1
-#define configUSE_CO_ROUTINES                      0
-#define configUSE_MUTEXES                          1
-#define configUSE_RECURSIVE_MUTEXES                1
-#define configQUEUE_REGISTRY_SIZE                  0
-#define configUSE_APPLICATION_TASK_TAG             0
-#define configUSE_COUNTING_SEMAPHORES              1
-#define configUSE_ALTERNATIVE_API                  0
-#define configNUM_THREAD_LOCAL_STORAGE_POINTERS    3      /* FreeRTOS+FAT requires 2 pointers if a CWD is supported. */
-#define configRECORD_STACK_HIGH_ADDRESS            1
-
-#define configUSE_DAEMON_TASK_STARTUP_HOOK 1
-
-#define configCPU_CLOCK_HZ				(BSP_ICLK_HZ)
-#define configPERIPHERAL_CLOCK_HZ		(BSP_PCLKB_HZ)
-#define configUSE_QUEUE_SETS			1
-
-/* Hook function related definitions. */
-#define configUSE_TICK_HOOK                        1
-#define configUSE_IDLE_HOOK                        1
-#define configUSE_MALLOC_FAILED_HOOK               1
-#define configCHECK_FOR_STACK_OVERFLOW             2      /* Not applicable to the Win32 port. */
-
-/* Software timer related definitions. */
-#define configUSE_TIMERS                           1
-#define configTIMER_TASK_PRIORITY                  (6)
-#define configTIMER_QUEUE_LENGTH                   5
-#define configTIMER_TASK_STACK_DEPTH               (configMINIMAL_STACK_SIZE)
-
-/* The interrupt priority used by the kernel itself for the tick interrupt and
-the pended interrupt.  This would normally be the lowest priority. */
-#define configKERNEL_INTERRUPT_PRIORITY         1
-
-/* The maximum interrupt priority from which FreeRTOS API calls can be made.
-Interrupts that use a priority above this will not be effected by anything the
-kernel is doing. */
-#define configMAX_SYSCALL_INTERRUPT_PRIORITY    4
-
-/* The peripheral used to generate the tick interrupt is configured as part of
-the application code.  This constant should be set to the vector number of the
-peripheral chosen.  As supplied this is CMT0. */
-#define configTICK_VECTOR						_CMT0_CMI0		//CMT0
-//#define configTICK_VECTOR						_CMT1_CMI1		//CMT1
-//#define configTICK_VECTOR						_CMT2_CMI2		//CMT2
-//#define configTICK_VECTOR						_CMT3_CMI3		//CMT3
-
-/* Event group related definitions. */
-#define configUSE_EVENT_GROUPS                     1
-
-/* Run time stats gathering definitions. */
-unsigned long ulGetRunTimeCounterValue( void );
-void vConfigureTimerForRunTimeStats( void );
-#define configGENERATE_RUN_TIME_STATS    0
-//#define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS()    vConfigureTimerForRunTimeStats()
-//#define portGET_RUN_TIME_COUNTER_VALUE()            ulGetRunTimeCounterValue()
-
-/* Co-routine definitions. */
-#define configUSE_CO_ROUTINES                   0
-#define configMAX_CO_ROUTINE_PRIORITIES         (2)
-
-/* Currently the TCP/IP stack is using dynamic allocation, and the MQTT task is
- * using static allocation. */
-#define configSUPPORT_DYNAMIC_ALLOCATION        1
-#define configSUPPORT_STATIC_ALLOCATION         1
-
-/* Set the following definitions to 1 to include the API function, or zero
- * to exclude the API function. */
-#define INCLUDE_vTaskPrioritySet                1
-#define INCLUDE_uxTaskPriorityGet               1
-#define INCLUDE_vTaskDelete                     1
-#define INCLUDE_vTaskCleanUpResources           0
-#define INCLUDE_vTaskSuspend                    1
-#define INCLUDE_vTaskDelayUntil                 1
-#define INCLUDE_vTaskDelay                      1
-#define INCLUDE_uxTaskGetStackHighWaterMark     1
-#define INCLUDE_xTaskGetSchedulerState          1
-#define INCLUDE_xTimerGetTimerTaskHandle        0
-#define INCLUDE_xTaskGetIdleTaskHandle          0
-#define INCLUDE_xQueueGetMutexHolder            1
-#define INCLUDE_eTaskGetState                   1
-#define INCLUDE_xEventGroupSetBitsFromISR       1
-#define INCLUDE_xTimerPendFunctionCall          1
-#define INCLUDE_xTaskGetCurrentTaskHandle       1
-#define INCLUDE_xTaskAbortDelay                 1
-
-/* This demo makes use of one or more example stats formatting functions.  These
- * format the raw data provided by the uxTaskGetSystemState() function in to human
- * readable ASCII form.  See the notes in the implementation of vTaskList() within
- * FreeRTOS/Source/tasks.c for limitations.  configUSE_STATS_FORMATTING_FUNCTIONS
- * is set to 2 so the formatting functions are included without the stdio.h being
- * included in tasks.c.  That is because this project defines its own sprintf()
- * functions. */
-#define configUSE_STATS_FORMATTING_FUNCTIONS    1
-
-#if defined(ENABLE_UNIT_TESTS) || defined(FREERTOS_ENABLE_UNIT_TESTS)
-/* unity testing */
-#define configASSERT( x ) do { if( ( x ) == 0 ) TEST_ABORT(); } while( 0 )
-#elif defined(CONFIG_FREERTOS_ASSERT_DISABLE) || defined(NDEBUG)
-/* Disable Assert call for release builds. */
-#define configASSERT( x ) ( ( void ) 0 )
-#else /* CONFIG_FREERTOS_ASSERT_FAIL_ABORT or nothing */
-/* Assert call defined for debug builds. */
-extern void vAssertCalled( void );
-#define configASSERT( x ) do { if( ( x ) == 0 ) vAssertCalled(); } while( 0 )
-#endif
-
-/* The function that implements FreeRTOS printf style output, and the macro
- * that maps the configPRINTF() macros to that function. */
-extern void vLoggingPrintf( const char * pcFormat, ... );
-#define configPRINTF( X )    vLoggingPrintf X
-
-/* Non-format version thread-safe print */
-extern void vLoggingPrint( const char * pcMessage );
-#define configPRINT( X )     vLoggingPrint( X )
-
-extern void vOutputString( const char * pcMessage );
-/* Map the logging task's printf to the board specific output function. */
-#define configPRINT_STRING( x )    vOutputString(x)
-
-/* Sets the length of the buffers into which logging messages are written - so
- * also defines the maximum length of each log message. */
-#define configLOGGING_MAX_MESSAGE_LENGTH            192
-
-/* Set to 1 to prepend each log message with a message number, the task name,
- * and a time stamp. */
-#define configLOGGING_INCLUDE_TIME_AND_TASK_NAME    1
-
-/* Application specific definitions follow. **********************************/
-
-/* If configINCLUDE_DEMO_DEBUG_STATS is set to one, then a few basic IP trace
- * macros are defined to gather some UDP stack statistics that can then be viewed
- * through the CLI interface. */
-#define configINCLUDE_DEMO_DEBUG_STATS       1
-
-/* The size of the global output buffer that is available for use when there
- * are multiple command interpreters running at once (for example, one on a UART
- * and one on TCP/IP).  This is done to prevent an output buffer being defined by
- * each implementation - which would waste RAM.  In this case, there is only one
- * command interpreter running, and it has its own local output buffer, so the
- * global buffer is just set to be one byte long as it is not used and should not
- * take up unnecessary RAM. */
-#define configCOMMAND_INT_MAX_OUTPUT_SIZE    850
-
-/* Only used when running in the FreeRTOS Windows simulator.  Defines the
- * priority of the task used to simulate Ethernet interrupts. */
-#define configMAC_ISR_SIMULATOR_PRIORITY     ( configMAX_PRIORITIES - 1 )
-
-/* This demo creates a virtual network connection by accessing the raw Ethernet
- * or WiFi data to and from a real network connection.  Many computers have more
- * than one real network port, and configNETWORK_INTERFACE_TO_USE is used to tell
- * the demo which real port should be used to create the virtual port.  The ports
- * available are displayed on the console when the application is executed.  For
- * example, on my development laptop setting configNETWORK_INTERFACE_TO_USE to 4
- * results in the wired network being used, while setting
- * configNETWORK_INTERFACE_TO_USE to 2 results in the wireless network being
- * used. */
-#define configNETWORK_INTERFACE_TO_USE       2L
-
-/* The address of an echo server that will be used by the two demo echo client
- * tasks:
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_Echo_Clients.html,
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/UDP_Echo_Clients.html. */
-#define configECHO_SERVER_ADDR0              192
-#define configECHO_SERVER_ADDR1              168
-#define configECHO_SERVER_ADDR2              1
-#define configECHO_SERVER_ADDR3              200
-#define configTCP_ECHO_CLIENT_PORT           9999
-
-/* Default MAC address configuration.  The demo creates a virtual network
- * connection that uses this MAC address by accessing the raw Ethernet/WiFi data
- * to and from a real network connection on the host PC.  See the
- * configNETWORK_INTERFACE_TO_USE definition above for information on how to
- * configure the real network connection to use. */
-#define configMAC_ADDR0                      0x74
-#define configMAC_ADDR1                      0x90
-#define configMAC_ADDR2                      0x50
-#define configMAC_ADDR3                      0x00
-#define configMAC_ADDR4                      0x79
-#define configMAC_ADDR5                      0x03
-
-/* Default IP address configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configIP_ADDR0                       192
-#define configIP_ADDR1                       168
-#define configIP_ADDR2                       11
-#define configIP_ADDR3                       12
-
-/* Default gateway IP address configuration.  Used in ipconfigUSE_DHCP is set to
- * 0, or ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configGATEWAY_ADDR0                  172
-#define configGATEWAY_ADDR1                  27
-#define configGATEWAY_ADDR2                  49
-#define configGATEWAY_ADDR3                  1
-
-/* Default DNS server configuration.  OpenDNS addresses are 208.67.222.222 and
- * 208.67.220.220.  Used in ipconfigUSE_DHCP is set to 0, or ipconfigUSE_DHCP is
- * set to 1 but a DNS server cannot be contacted.*/
-#define configDNS_SERVER_ADDR0               143
-#define configDNS_SERVER_ADDR1               103
-#define configDNS_SERVER_ADDR2               47
-#define configDNS_SERVER_ADDR3               193
-
-/* Default netmask configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configNET_MASK0                      255
-#define configNET_MASK1                      255
-#define configNET_MASK2                      255
-#define configNET_MASK3                      0
-
-/* The UDP port to which print messages are sent. */
-#define configPRINT_PORT                     ( 15000 )
-
-#define configPROFILING                      ( 0 )
-
-/* Pseudo random number generater used by some demo tasks. */
-uint32_t ulRand(void);
-#define configRAND32()    ulRand()
-
-/* The platform FreeRTOS is running on. */
-#define configPLATFORM_NAME    "RenesasRX65N"
-
-/* Header required for the tracealyzer recorder library. */
-//#include "trcRecorder.h"
-
-/* When the FIT configurator or the Smart Configurator is used, platform.h has to be used. */
-#define configINCLUDE_PLATFORM_H_INSTEAD_OF_IODEFINE_H  1
-
-#endif /* FREERTOS_CONFIG_H */
diff --git a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/core_http_config.h b/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/core_http_config.h
deleted file mode 100644
index 679a119d..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/core_http_config.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * coreHTTP v3.0.0
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_HTTP_CONFIG_H_
-#define CORE_HTTP_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging config definition and header files inclusion are required in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for HTTP.
- * 3. Include the header file "logging_stack.h", if logging is enabled for HTTP.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the HTTP library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "HTTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_HTTP_CONFIG_ */
\ No newline at end of file
diff --git a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/core_mqtt_agent_config.h b/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/core_mqtt_agent_config.h
deleted file mode 100644
index 9cb54017..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/core_mqtt_agent_config.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * coreMQTT Agent v1.2.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_mqtt_agent_config.h
- * @brief This represents the default values for the configuration macros
- * for the MQTT-Agent library.
- */
-
-#ifndef CORE_MQTT_AGENT_CONFIG_H_
-#define CORE_MQTT_AGENT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT Agent.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT_Agent"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
- /**
- * @brief Maximum time MQTT agent waits in the queue for any pending MQTT
- * operations.
- *
- * The wait time is kept smallest possible to increase the responsiveness of
- * MQTT agent while processing  pending MQTT operations as well as receive
- * packets from network.
- */
-#define MQTT_AGENT_MAX_EVENT_QUEUE_WAIT_TIME    ( 50U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_AGENT_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/core_mqtt_config.h b/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/core_mqtt_config.h
deleted file mode 100644
index 6222626b..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/core_mqtt_config.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * coreMQTT v2.1.1
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_MQTT_CONFIG_H_
-#define CORE_MQTT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief The maximum duration between non-empty network reads while
-* receiving an MQTT packet via the #MQTT_ProcessLoop or #MQTT_ReceiveLoop
-* API functions.
-*
-* When an incoming MQTT packet is detected, the transport receive function
-* may be called multiple times until all of the expected number of bytes of the
-* packet are received. This timeout represents the maximum polling duration that
-* is allowed without any data reception from the network for the incoming packet.
-*
-* If the timeout expires, the #MQTT_ProcessLoop and #MQTT_ReceiveLoop functions
-* return #MQTTRecvFailed.
-*
-* @note If a dummy implementation of the #MQTTGetCurrentTimeFunc_t timer function,
-* is supplied to the library, then #MQTT_RECV_POLLING_TIMEOUT_MS MUST be set to 0.
-*
-* <b>Possible values:</b> Any positive 32 bit integer. Recommended to use a
-* small timeout value. <br>
-* <b>Default value:</b> `10`
-*
-*/
-#define MQTT_RECV_POLLING_TIMEOUT_MS    ( 1000U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/core_pkcs11_config.h b/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/core_pkcs11_config.h
deleted file mode 100644
index e18f347c..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/core_pkcs11_config.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * corePKCS11 v3.5.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_pkcs11_config.h
- * @brief List of configuration macros for the corePKCS11 library along with
- * their custom values.
- */
-
-#ifndef CORE_PKCS11_CONFIG_H_
-#define CORE_PKCS11_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for PKCS #11.
- * 3. Include the header file "logging_stack.h", if logging is enabled for PKCS #11.
- */
-#include "logging_levels.h"
-
-/* Logging configuration for the PKCS #11 library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "PKCS11"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_ERROR
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief Maximum number of sessions that can be stored
-* by the PKCS #11 module.
-*
-* @note The windows test port has an abnormally large value in order to have
-* enough sessions to successfully run all the model based PKCS #11 tests.
-*
-* <b>Possible values:</b> Any positive integer.<br>
-* <b>Default value:</b> 10
-*/
-#define pkcs11configMAX_NUM_OBJECTS    8
-
-/**
-* @brief Set to 1 if a PAL destroy object is implemented.
-*
-* If set to 0, no PAL destroy object is implemented, and this functionality
-* is implemented in the common PKCS #11 layer.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configPAL_DESTROY_SUPPORTED    1
-
-/**
-* @brief Set to 1 if OTA image verification via PKCS #11 module is supported.
-*
-* If set to 0, OTA code signing certificate is built in via
-* aws_ota_codesigner_certificate.h.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configOTA_SUPPORTED    1
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* CORE_PKCS11_CONFIG_H_ include guard. */
diff --git a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/core_sntp_config.h b/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/core_sntp_config.h
deleted file mode 100644
index a6303826..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/core_sntp_config.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * coreSNTP v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_sntp_config.h
- * @brief This file represents the custom values for the configuration macros
- * of the coreSNTP library.
- */
-
-#ifndef CORE_SNTP_CONFIG_H_
-#define CORE_SNTP_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for SNTP.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "SNTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef CORE_SNTP_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/defender_config.h b/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/defender_config.h
deleted file mode 100644
index d0b3d8e4..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/defender_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Defender Client v1.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file defender_config.h
- * @brief Custom config values for the AWS IoT Device Defender Client Library.
- */
-
-#ifndef DEFENDER_CONFIG_H_
-#define DEFENDER_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for Device Defender.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "Defender"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* DEFENDER_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/demo_config.h b/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/demo_config.h
deleted file mode 100644
index 0122f7b8..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/demo_config.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * FreeRTOS V202111.00
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * https://www.FreeRTOS.org
- * https://github.com/FreeRTOS
- *
- */
-
-#ifndef DEMO_CONFIG_H
-#define DEMO_CONFIG_H
-
-/* FreeRTOS include. */
-#include "FreeRTOS.h"
-#include "aws_clientcredential.h"
-#include "aws_clientcredential_keys.h"
-#include "iot_default_root_certificates.h"
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for DEMO.
- * 3. Include the header file "logging_stack.h", if logging is enabled for DEMO.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Demo. */
-#ifndef LIBRARY_LOG_NAME
-#define LIBRARY_LOG_NAME    "MQTTDemo"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-#define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "iot_logging_task.h"
-
-
-/* Select a combination of demos to run
- * These demo has not been evaluated outside of the combination of demos listed below.
- *
- *          PUBSUB demo only :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB and OTA over MQTT demo :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (1)
- *          PUBSUB and OTA over MQTT demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (1)
- */
-/* demo is configured for PUBSUB */
-/* Select demo combination to run. */
-
-/* Please select a provisioning method
- * (0) : Pre-provisioning
- * (1) : Fleet provisioning
- */
-#define ENABLE_FLEET_PROVISIONING_DEMO      (0)
-
-/* Please select whether to enable or disable the OTA demo
- * (0) : OTA demo is disabled
- * (1) : OTA over MQTT demo is enabled
- */
-#define ENABLE_OTA_UPDATE_DEMO              (0)
-
-#define democonfigROOT_CA_PEM               tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief Path of the file containing the provisioning claim certificate. This
- * certificate is used to connect to AWS IoT Core and use Fleet Provisioning
- * APIs to provision the client device. This is used for the "Provisioning by
- * Claim" provisioning workflow.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This certificate should be PEM-encoded. The certificate should be
- * registered on AWS IoT Core beforehand. It should have an AWS IoT policy to
- * allow it to access only the Fleet Provisioning APIs. An example policy for
- * the claim certificates for this demo is available in the
- * example_claim_policy.json file in the demo directory. In the example,
- * replace <aws-region> with your AWS region, <aws-account-id> with your
- * account ID, and <template-name> with the name of your provisioning template.
- *
- */
-#define democonfigCLAIM_CERT_PEM            "...insert here..."
-
-/**
- * @brief Path of the file containing the provisioning claim private key. This
- * key corresponds to the provisioning claim certificate and is used to
- * authenticate with AWS IoT for provisioning by claim.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This private key should be PEM-encoded.
- *
- */
-#define democonfigCLAIM_PRIVATE_KEY_PEM     "...insert here..."
-
-/**
- * @brief An option to disable Server Name Indication.
- *
- * @note When using a local Mosquitto server setup, SNI needs to be disabled
- * for an MQTT broker that only has an IP address but no hostname. However,
- * SNI should be enabled whenever possible.
- */
-#define democonfigDISABLE_SNI                ( pdFALSE )
-
-/**
- * @brief Configuration that indicates if the demo connection is made to the AWS IoT Core MQTT broker.
- *
- * If username/password based authentication is used, the demo will use appropriate TLS ALPN and
- * SNI configurations as required for the Custom Authentication feature of AWS IoT.
- * For more information, refer to the following documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/custom-auth.html#custom-auth-mqtt
- *
- * #define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
- */
-#define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
-
-/**
- * @brief The unique ID used by the demo to differentiate instances.
- *
- *!!! Please note a #defined constant is used for convenience of demonstration
- *!!! only.  Production devices can use something unique to the device that can
- *!!! be read by software, such as a production serial number, instead of a
- *!!! hard coded constant.
- */
-#define democonfigFP_DEMO_ID    "FPDemoID"
-
-/**
- * @brief The MQTT client identifier used in this example.  Each client identifier
- * must be unique so edit as required to ensure no two clients connecting to the
- * same broker use the same client identifier.
- *
- * @note Appending __TIME__ to the client id string will reduce the possibility of a
- * client id collision in the broker. Note that the appended time is the compilation
- * time. This client id can cause collision, if more than one instance of the same
- * binary is used at the same time to connect to the broker.
- */
-#ifndef democonfigCLIENT_IDENTIFIER
-#if (ENABLE_FLEET_PROVISIONING_DEMO == 1)
-    #define democonfigCLIENT_IDENTIFIER    "client"democonfigFP_DEMO_ID
-#else
-    #define democonfigCLIENT_IDENTIFIER    clientcredentialIOT_THING_NAME
-#endif
-#endif
-
-/**
- * @brief Details of the MQTT broker to connect to.
- *
- * This is the Claim's Rest API Endpoint for AWS IoT.
- *
- * @note Your AWS IoT Core endpoint can be found in the AWS IoT console under
- * Settings/Custom Endpoint, or using the describe-endpoint API.
- *
- */
-#define democonfigMQTT_BROKER_ENDPOINT     clientcredentialMQTT_BROKER_ENDPOINT
-
-/**
- * @brief AWS IoT MQTT broker port number.
- *
- * In general, port 8883 is for secured MQTT connections.
- *
- * @note Port 443 requires use of the ALPN TLS extension with the ALPN protocol
- * name. When using port 8883, ALPN is not required.
- */
-#define democonfigMQTT_BROKER_PORT    ( clientcredentialMQTT_BROKER_PORT )
-
-/**
- * @brief Name of the provisioning template to use for the RegisterThing
- * portion of the Fleet Provisioning workflow.
- *
- * For information about provisioning templates, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-template.html#fleet-provision-template
- *
- * The example template used for this demo is available in the
- * example_demo_template.json file in the DemoSetup directory. In the example,
- * replace <provisioned-thing-policy> with the policy provisioned devices
- * should have.  The demo template uses Fn::Join to construct the Thing name by
- * concatenating fp_demo_ and the serial number sent by the demo.
- *
- * @note The provisioning template MUST be created in AWS IoT before running the
- * demo.
- *
- * @note If you followed the manual setup steps on https://freertos.org/iot-fleet-provisioning/demo.html,
- * the provisioning template name is "FleetProvisioningDemoTemplate".
- * However, if you used CloudFormation to set up the demo, the template name is "CF_FleetProvisioningDemoTemplate"
- */
- #define democonfigPROVISIONING_TEMPLATE_NAME    "...insert here..."
-
-/**
- * @brief Subject name to use when creating the certificate signing request (CSR)
- * for provisioning the demo client with using the Fleet Provisioning
- * CreateCertificateFromCsr APIs.
- *
- * This is passed to MbedTLS; see https://tls.mbed.org/api/x509__csr_8h.html#a954eae166b125cea2115b7db8c896e90
- */
-#ifndef democonfigCSR_SUBJECT_NAME
-    #define democonfigCSR_SUBJECT_NAME    "CN="democonfigFP_DEMO_ID
-#endif
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_STACKSIZE        configMINIMAL_STACK_SIZE * 3
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_TASK_PRIORITY    ( tskIDLE_PRIORITY + 1 )
-
-#define democonfigNETWORK_BUFFER_SIZE    ( configMINIMAL_STACK_SIZE * 3 )
-
-#include "core_mqtt.h" /* Include coreMQTT header for MQTT_LIBRARY_VERSION macro. */
-#define democonfigMQTT_LIB    "core-mqtt@"MQTT_LIBRARY_VERSION
-
-#define democonfigDISABLE_SNI       ( pdFALSE )
-
-/**
- * @brief ALPN (Application-Layer Protocol Negotiation) protocol name for AWS IoT MQTT.
- *
- * This will be used if democonfigMQTT_BROKER_PORT is configured as 443 for the AWS IoT MQTT broker.
- * Please see more details about the ALPN protocol for AWS IoT MQTT endpoint
- * in the link below.
- * https://aws.amazon.com/blogs/iot/mqtt-with-tls-client-authentication-on-port-443-why-it-is-useful-and-how-it-works/
- */
-#define AWS_IOT_MQTT_ALPN           "\x0ex-amzn-mqtt-ca"
-
-/**
- * @brief This is the ALPN (Application-Layer Protocol Negotiation) string
- * required by AWS IoT for password-based authentication using TCP port 443.
- */
-#define AWS_IOT_CUSTOM_AUTH_ALPN    "\x04mqtt"
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-/**
- * @brief The name of the operating system that the application is running on.
- * The current value is given as an example. Please update for your specific
- * operating system.
- */
-#define democonfigOS_NAME       "FreeRTOS"
-
-/**
- * @brief The version of the operating system that the application is running
- * on. The current value is given as an example. Please update for your specific
- * operating system version.
- */
-#define democonfigOS_VERSION    "V10.4.3"
-
-/**
- * @brief The name of the hardware platform the application is running on. The
- * current value is given as an example. Please update for your specific
- * hardware platform.
- */
-#define democonfigHARDWARE_PLATFORM_NAME    "CK-RX65N"
-
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING                                 \
-    "?SDK=" democonfigOS_NAME "&Version=" democonfigOS_VERSION \
-    "&MQTTLib=" democonfigMQTT_LIB
-
-/**
- * @brief The length of the MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING_LENGTH    ( ( uint16_t ) ( sizeof( AWS_IOT_METRICS_STRING ) - 1 ) )
-
-
-#ifdef democonfigCLIENT_USERNAME
-
-/**
- * @brief Append the username with the metrics string if #democonfigCLIENT_USERNAME is defined.
- *
- * This is to support both metrics reporting and username/password based client
- * authentication by AWS IoT.
- */
-#define CLIENT_USERNAME_WITH_METRICS    democonfigCLIENT_USERNAME AWS_IOT_METRICS_STRING
-#endif
-
-/**
- * @brief Flag to enable or disable provisioning mode for the demo.
- * Enabling the flags starts a CLI task, so that user can perform provisioning of the device through
- * a serial terminal. Provisioning involves running commands to fetch or set the PKI and configuration
- * information for the device to connect to broker and perform OTA updates. Disabling the flag results
- * in disabling the CLI task and execution of the demo tasks in normal device operation mode.
- */
-#define appmainPROVISIONING_MODE                  ( 1 )
-
-/**
- * @brief Certificate used for validating code signing signatures in the OTA PAL.
- */
-#ifndef otapalconfigCODE_SIGNING_CERTIFICATE
-    #define otapalconfigCODE_SIGNING_CERTIFICATE    "Insert code signing certificate..."
-#endif
-
-/**
- * @brief Major version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MAJOR
-    #define APP_VERSION_MAJOR    0
-#endif
-
-/**
- * @brief Minor version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MINOR
-    #define APP_VERSION_MINOR    9
-#endif
-
-/**
- * @brief Build version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_BUILD
-    #define APP_VERSION_BUILD    2
-#endif
-
-/**
- * @brief Server's root CA certificate.
- *
- * This certificate is used to identify the AWS IoT server and is publicly
- * available. Refer to the AWS documentation available in the link below for
- * information about the Server Root CAs.
- * https://docs.aws.amazon.com/iot/latest/developerguide/server-authentication.html#server-authentication-certs
- *
- * @note The TI C3220 Launchpad board requires that the Root CA have its
- * certificate self-signed. As mentioned in the above link, the Amazon Root CAs
- * are cross-signed by the Starfield Root CA. Thus, ONLY the Starfield Root CA
- * can be used to connect to the ATS endpoints on AWS IoT for the TI board.
- *
- * @note This certificate should be PEM-encoded.
- *
- * Must include the PEM header and footer:
- * "-----BEGIN CERTIFICATE-----\n"\
- * "...base64 data...\n"\
- * "-----END CERTIFICATE-----\n"
- *
- */
-#define democonfigROOT_CA_PEM                   tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief The length of the queue used to hold commands for the agent.
- */
-#define MQTT_AGENT_COMMAND_QUEUE_LENGTH         ( 25 )
-
-/**
- * @brief Dimensions the buffer used to serialise and deserialise MQTT packets.
- * @note Specified in bytes.  Must be large enough to hold the maximum
- * anticipated MQTT payload.
- */
-#define MQTT_AGENT_NETWORK_BUFFER_SIZE          ( 5000 )
-
-#define MQTT_COMMAND_CONTEXTS_POOL_SIZE              ( 10 )
-
-#endif /* DEMO_CONFIG_H */
diff --git a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/fleet_provisioning_config.h b/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/fleet_provisioning_config.h
deleted file mode 100644
index 68b85d66..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/fleet_provisioning_config.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * AWS IoT Fleet Provisioning v1.1.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file fleet_provisioning_config.h
- * @brief Custom config values for the AWS IoT Fleet Provisioning Library.
- */
-
-#ifndef FLEET_PROVISIONING_CONFIG_H_
-#define FLEET_PROVISIONING_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for Fleet Provisioning.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Fleet Provisioning library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "FleetProvisioning"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-/************ End of logging configuration ****************/
-
-#endif /* ifndef FLEET_PROVISIONING_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/rm_littlefs_flash_config.h b/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/rm_littlefs_flash_config.h
deleted file mode 100644
index 94207ffa..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/rm_littlefs_flash_config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/***********************************************************************************************************************
- * Copyright 2023 Renesas Electronics Corporation and/or its affiliates.  All Rights Reserved.
- *
- * This software and documentation are supplied by Renesas Electronics America Inc. and may only be used with products
- * of Renesas Electronics Corp. and its affiliates ("Renesas").  No other uses are authorized.  Renesas products are
- * sold pursuant to Renesas terms and conditions of sale.  Purchasers are solely responsible for the selection and use
- * of Renesas products and Renesas assumes no liability.  No license, express or implied, to any intellectual property
- * right is granted by Renesas. This software is protected under all applicable laws, including copyright laws. Renesas
- * reserves the right to change or discontinue this software and/or this documentation. THE SOFTWARE AND DOCUMENTATION
- * IS DELIVERED TO YOU "AS IS," AND RENESAS MAKES NO REPRESENTATIONS OR WARRANTIES, AND TO THE FULLEST EXTENT
- * PERMISSIBLE UNDER APPLICABLE LAW, DISCLAIMS ALL WARRANTIES, WHETHER EXPLICITLY OR IMPLICITLY, INCLUDING WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT, WITH RESPECT TO THE SOFTWARE OR
- * DOCUMENTATION.  RENESAS SHALL HAVE NO LIABILITY ARISING OUT OF ANY SECURITY VULNERABILITY OR BREACH.  TO THE MAXIMUM
- * EXTENT PERMITTED BY LAW, IN NO EVENT WILL RENESAS BE LIABLE TO YOU IN CONNECTION WITH THE SOFTWARE OR DOCUMENTATION
- * (OR ANY PERSON OR ENTITY CLAIMING RIGHTS DERIVED FROM YOU) FOR ANY LOSS, DAMAGES, OR CLAIMS WHATSOEVER, INCLUDING,
- * WITHOUT LIMITATION, ANY DIRECT, CONSEQUENTIAL, SPECIAL, INDIRECT, PUNITIVE, OR INCIDENTAL DAMAGES; ANY LOST PROFITS,
- * OTHER ECONOMIC DAMAGE, PROPERTY DAMAGE, OR PERSONAL INJURY; AND EVEN IF RENESAS HAS BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH LOSS, DAMAGES, CLAIMS OR COSTS.
- **********************************************************************************************************************/
-
-#ifndef FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-#define FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-
-/***********************************************************************************************************************
- * Includes
- **********************************************************************************************************************/
-#include "rm_littlefs_df_rx65n.h"
-
-#define LFS_FLASH_READ_SIZE				(1)
-#define LFS_FLASH_PROGRAM_SIZE			(4)
-#define LFS_FLASH_BLOCK_SIZE			(128)
-#define LFS_FLASH_BLOCK_COUNT			(70)
-#define RM_LITTLEFS_FLASH_DATA_START	FLASH_DF_BLOCK_0_MACRO
-
-#if LFS_FLASH_BLOCK_SIZE*LFS_FLASH_BLOCK_COUNT + (RM_LITTLEFS_FLASH_DATA_START - FLASH_DF_BLOCK_0_MACRO) > BSP_DATA_FLASH_SIZE_BYTES
-#error "Too many blocks"
-#endif
-
-#endif /* FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/shadow_config.h b/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/shadow_config.h
deleted file mode 100644
index aa948c12..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/shadow_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Shadow v1.3.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file shadow_config.h
- * @brief This represents the custom values for the configuration macros
- * for the Shadow library.
- */
-
-#ifndef SHADOW_CONFIG_H_
-#define SHADOW_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SHADOW"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef SHADOW_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/sigv4_config.h b/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/sigv4_config.h
deleted file mode 100644
index ba277a79..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/sigv4_config.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * SigV4 Library v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file sigv4_config.h
- * @brief The custom values for configuration macros used by the SigV4 Library.
- */
-
-#ifndef SIGV4_CONFIG_H_
-#define SIGV4_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SIGV4"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef SIGV4_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/user_tcp_hook_config.h b/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/user_tcp_hook_config.h
deleted file mode 100644
index 0c1308fe..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/cellular/src/frtos_config/user_tcp_hook_config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**********************************************************************************************************************
- * Copyright (C) 2023 Renesas Electronics Corporation. All rights reserved.
- *
- * DISCLAIMER
- * This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
- * other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
- * applicable laws, including copyright laws.
- * THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
- * THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
- * EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
- * SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS
- * SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
- * this software. By using this software, you agree to the additional terms and conditions found by accessing the
- * following link:
- * http://www.renesas.com/disclaimer
- *********************************************************************************************************************/
-
-#ifndef FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_
-#define FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_
-
-/* The limit of number for CELLULAR_ERR_MODULE_COM when it comes continuously.
- * If counter is over than this limit, hook the reset */
-#define USER_COMM_ERROR_TRIES		3
-
-/*Connection retry limit*/
-#define USER_RECONNECT_TRIES 		3
-
-/*Socket closing retry limit*/
-#define USER_CLOSE_SOCKET_TRIES		3
-
-/*Enable SocketErrorHook*/
-#define USER_TCP_HOOK_ENABLED   	1 /* Default */
-
-/* Reset cellular hardware*/
-#define USER_TCP_HOOK_FUNCTION     SocketErrorHook
-
-#endif /* FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/ether/linker_section_sample.esi b/Configuration/samples/pubsub/ck-rx65n/ether/linker_section_sample.esi
deleted file mode 100644
index fff6ca13..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/ether/linker_section_sample.esi
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<com.renesas.linkersection.model:SectionContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:com.renesas.linkersection.model="http:///LinkerSection.ecore">
-  <sections name="SU">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4"/>
-  </sections>
-  <sections name="SI"/>
-  <sections name="R_1"/>
-  <sections name="B_2"/>
-  <sections name="R"/>
-  <sections name="RPFRAM2"/>
-  <sections name="C_LITTLEFS_MANAGEMENT_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1048576"/>
-  </sections>
-  <sections name="C_USER_APPLICATION_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1057536"/>
-  </sections>
-  <sections name="B_ETHERNET_BUFFERS*">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="8388608"/>
-  </sections>
-  <sections name="B_RX_DESC*"/>
-  <sections name="B_TX_DESC*"/>
-  <sections name="B"/>
-  <sections name="B_1"/>
-  <sections name="R_2"/>
-  <sections name="PResetPRG">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4293919488"/>
-  </sections>
-  <sections name="C_1"/>
-  <sections name="C_2"/>
-  <sections name="C"/>
-  <sections name="C$*"/>
-  <sections name="D*"/>
-  <sections name="W*"/>
-  <sections name="L"/>
-  <sections name="P"/>
-  <sections name="PFRAM2"/>
-  <sections name="EXCEPTVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294967168"/>
-  </sections>
-  <sections name="RESETVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294967292"/>
-  </sections>
-</com.renesas.linkersection.model:SectionContainer>
diff --git a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/FreeRTOSConfig.h b/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/FreeRTOSConfig.h
deleted file mode 100644
index 5662a8c2..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/FreeRTOSConfig.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * FreeRTOS Kernel V10.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * http://aws.amazon.com/freertos
- * http://www.FreeRTOS.org
- */
-
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
-
-
-/* Unity includes. */
-#if defined(FREERTOS_ENABLE_UNIT_TESTS)
-#include "unity_internals.h"
-#elif defined(ENABLE_UNIT_TESTS)
-#include "unity.h"
-#endif
-
-/*-----------------------------------------------------------
-* Application specific definitions.
-*
-* These definitions should be adjusted for your particular hardware and
-* application requirements.
-*
-* THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
-* FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
-* http://www.freertos.org/a00110.html
-*
-* The bottom of this file contains some constants specific to running the UDP
-* stack in this demo.  Constants specific to FreeRTOS+TCP itself (rather than
-* the demo) are contained in FreeRTOSIPConfig.h.
-*----------------------------------------------------------*/
-#define configENABLE_BACKWARD_COMPATIBILITY        1
-#define configUSE_PREEMPTION                       1
-#define configUSE_PORT_OPTIMISED_TASK_SELECTION    0
-#define configMAX_PRIORITIES                       (7)
-#define configTICK_RATE_HZ                         (( TickType_t ) 1000)
-#define configMINIMAL_STACK_SIZE                   (768)
-#define configTOTAL_HEAP_SIZE_N						(256)
-#define configTOTAL_HEAP_SIZE                      (( size_t ) ( configTOTAL_HEAP_SIZE_N * 1024 ))
-#define configMAX_TASK_NAME_LEN                    (12)
-#define configUSE_TRACE_FACILITY                   1
-#define configUSE_16_BIT_TICKS                     0
-#define configIDLE_SHOULD_YIELD                    1
-#define configUSE_CO_ROUTINES                      0
-#define configUSE_MUTEXES                          1
-#define configUSE_RECURSIVE_MUTEXES                1
-#define configQUEUE_REGISTRY_SIZE                  0
-#define configUSE_APPLICATION_TASK_TAG             0
-#define configUSE_COUNTING_SEMAPHORES              1
-#define configUSE_ALTERNATIVE_API                  0
-#define configNUM_THREAD_LOCAL_STORAGE_POINTERS    3      /* FreeRTOS+FAT requires 2 pointers if a CWD is supported. */
-#define configRECORD_STACK_HIGH_ADDRESS            1
-
-#define configUSE_DAEMON_TASK_STARTUP_HOOK 1
-
-#define configCPU_CLOCK_HZ				(BSP_ICLK_HZ)
-#define configPERIPHERAL_CLOCK_HZ		(BSP_PCLKB_HZ)
-#define configUSE_QUEUE_SETS			1
-
-/* Hook function related definitions. */
-#define configUSE_TICK_HOOK                        1
-#define configUSE_IDLE_HOOK                        1
-#define configUSE_MALLOC_FAILED_HOOK               1
-#define configCHECK_FOR_STACK_OVERFLOW             2      /* Not applicable to the Win32 port. */
-
-/* Software timer related definitions. */
-#define configUSE_TIMERS                           1
-#define configTIMER_TASK_PRIORITY                  (6)
-#define configTIMER_QUEUE_LENGTH                   5
-#define configTIMER_TASK_STACK_DEPTH               (configMINIMAL_STACK_SIZE)
-
-/* The interrupt priority used by the kernel itself for the tick interrupt and
-the pended interrupt.  This would normally be the lowest priority. */
-#define configKERNEL_INTERRUPT_PRIORITY         1
-
-/* The maximum interrupt priority from which FreeRTOS API calls can be made.
-Interrupts that use a priority above this will not be effected by anything the
-kernel is doing. */
-#define configMAX_SYSCALL_INTERRUPT_PRIORITY    4
-
-/* The peripheral used to generate the tick interrupt is configured as part of
-the application code.  This constant should be set to the vector number of the
-peripheral chosen.  As supplied this is CMT0. */
-#define configTICK_VECTOR						_CMT0_CMI0		//CMT0
-//#define configTICK_VECTOR						_CMT1_CMI1		//CMT1
-//#define configTICK_VECTOR						_CMT2_CMI2		//CMT2
-//#define configTICK_VECTOR						_CMT3_CMI3		//CMT3
-
-/* Event group related definitions. */
-#define configUSE_EVENT_GROUPS                     1
-
-/* Run time stats gathering definitions. */
-unsigned long ulGetRunTimeCounterValue( void );
-void vConfigureTimerForRunTimeStats( void );
-#define configGENERATE_RUN_TIME_STATS    0
-//#define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS()    vConfigureTimerForRunTimeStats()
-//#define portGET_RUN_TIME_COUNTER_VALUE()            ulGetRunTimeCounterValue()
-
-/* Co-routine definitions. */
-#define configUSE_CO_ROUTINES                   0
-#define configMAX_CO_ROUTINE_PRIORITIES         (2)
-
-/* Currently the TCP/IP stack is using dynamic allocation, and the MQTT task is
- * using static allocation. */
-#define configSUPPORT_DYNAMIC_ALLOCATION        1
-#define configSUPPORT_STATIC_ALLOCATION         1
-
-/* Set the following definitions to 1 to include the API function, or zero
- * to exclude the API function. */
-#define INCLUDE_vTaskPrioritySet                1
-#define INCLUDE_uxTaskPriorityGet               1
-#define INCLUDE_vTaskDelete                     1
-#define INCLUDE_vTaskCleanUpResources           0
-#define INCLUDE_vTaskSuspend                    1
-#define INCLUDE_vTaskDelayUntil                 1
-#define INCLUDE_vTaskDelay                      1
-#define INCLUDE_uxTaskGetStackHighWaterMark     1
-#define INCLUDE_xTaskGetSchedulerState          1
-#define INCLUDE_xTimerGetTimerTaskHandle        0
-#define INCLUDE_xTaskGetIdleTaskHandle          0
-#define INCLUDE_xQueueGetMutexHolder            1
-#define INCLUDE_eTaskGetState                   1
-#define INCLUDE_xEventGroupSetBitsFromISR       1
-#define INCLUDE_xTimerPendFunctionCall          1
-#define INCLUDE_xTaskGetCurrentTaskHandle       1
-#define INCLUDE_xTaskAbortDelay                 1
-
-/* This demo makes use of one or more example stats formatting functions.  These
- * format the raw data provided by the uxTaskGetSystemState() function in to human
- * readable ASCII form.  See the notes in the implementation of vTaskList() within
- * FreeRTOS/Source/tasks.c for limitations.  configUSE_STATS_FORMATTING_FUNCTIONS
- * is set to 2 so the formatting functions are included without the stdio.h being
- * included in tasks.c.  That is because this project defines its own sprintf()
- * functions. */
-#define configUSE_STATS_FORMATTING_FUNCTIONS    1
-
-#if defined(ENABLE_UNIT_TESTS) || defined(FREERTOS_ENABLE_UNIT_TESTS)
-/* unity testing */
-#define configASSERT( x ) do { if( ( x ) == 0 ) TEST_ABORT(); } while( 0 )
-#elif defined(CONFIG_FREERTOS_ASSERT_DISABLE) || defined(NDEBUG)
-/* Disable Assert call for release builds. */
-#define configASSERT( x ) ( ( void ) 0 )
-#else /* CONFIG_FREERTOS_ASSERT_FAIL_ABORT or nothing */
-/* Assert call defined for debug builds. */
-extern void vAssertCalled( void );
-#define configASSERT( x ) do { if( ( x ) == 0 ) vAssertCalled(); } while( 0 )
-#endif
-
-/* The function that implements FreeRTOS printf style output, and the macro
- * that maps the configPRINTF() macros to that function. */
-extern void vLoggingPrintf( const char * pcFormat, ... );
-#define configPRINTF( X )    vLoggingPrintf X
-
-/* Non-format version thread-safe print */
-extern void vLoggingPrint( const char * pcMessage );
-#define configPRINT( X )     vLoggingPrint( X )
-
-extern void vOutputString( const char * pcMessage );
-/* Map the logging task's printf to the board specific output function. */
-#define configPRINT_STRING( x )    vOutputString(x)
-
-/* Sets the length of the buffers into which logging messages are written - so
- * also defines the maximum length of each log message. */
-#define configLOGGING_MAX_MESSAGE_LENGTH            192
-
-/* Set to 1 to prepend each log message with a message number, the task name,
- * and a time stamp. */
-#define configLOGGING_INCLUDE_TIME_AND_TASK_NAME    1
-
-/* Application specific definitions follow. **********************************/
-
-/* If configINCLUDE_DEMO_DEBUG_STATS is set to one, then a few basic IP trace
- * macros are defined to gather some UDP stack statistics that can then be viewed
- * through the CLI interface. */
-#define configINCLUDE_DEMO_DEBUG_STATS       1
-
-/* The size of the global output buffer that is available for use when there
- * are multiple command interpreters running at once (for example, one on a UART
- * and one on TCP/IP).  This is done to prevent an output buffer being defined by
- * each implementation - which would waste RAM.  In this case, there is only one
- * command interpreter running, and it has its own local output buffer, so the
- * global buffer is just set to be one byte long as it is not used and should not
- * take up unnecessary RAM. */
-#define configCOMMAND_INT_MAX_OUTPUT_SIZE    850
-
-/* Only used when running in the FreeRTOS Windows simulator.  Defines the
- * priority of the task used to simulate Ethernet interrupts. */
-#define configMAC_ISR_SIMULATOR_PRIORITY     ( configMAX_PRIORITIES - 1 )
-
-/* This demo creates a virtual network connection by accessing the raw Ethernet
- * or WiFi data to and from a real network connection.  Many computers have more
- * than one real network port, and configNETWORK_INTERFACE_TO_USE is used to tell
- * the demo which real port should be used to create the virtual port.  The ports
- * available are displayed on the console when the application is executed.  For
- * example, on my development laptop setting configNETWORK_INTERFACE_TO_USE to 4
- * results in the wired network being used, while setting
- * configNETWORK_INTERFACE_TO_USE to 2 results in the wireless network being
- * used. */
-#define configNETWORK_INTERFACE_TO_USE       2L
-
-/* The address of an echo server that will be used by the two demo echo client
- * tasks:
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_Echo_Clients.html,
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/UDP_Echo_Clients.html. */
-#define configECHO_SERVER_ADDR0              192
-#define configECHO_SERVER_ADDR1              168
-#define configECHO_SERVER_ADDR2              1
-#define configECHO_SERVER_ADDR3              200
-#define configTCP_ECHO_CLIENT_PORT           9999
-
-/* Default MAC address configuration.  The demo creates a virtual network
- * connection that uses this MAC address by accessing the raw Ethernet/WiFi data
- * to and from a real network connection on the host PC.  See the
- * configNETWORK_INTERFACE_TO_USE definition above for information on how to
- * configure the real network connection to use. */
-#define configMAC_ADDR0                      0x74
-#define configMAC_ADDR1                      0x90
-#define configMAC_ADDR2                      0x50
-#define configMAC_ADDR3                      0x00
-#define configMAC_ADDR4                      0x79
-#define configMAC_ADDR5                      0x03
-
-/* Default IP address configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configIP_ADDR0                       192
-#define configIP_ADDR1                       168
-#define configIP_ADDR2                       11
-#define configIP_ADDR3                       12
-
-/* Default gateway IP address configuration.  Used in ipconfigUSE_DHCP is set to
- * 0, or ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configGATEWAY_ADDR0                  172
-#define configGATEWAY_ADDR1                  27
-#define configGATEWAY_ADDR2                  49
-#define configGATEWAY_ADDR3                  1
-
-/* Default DNS server configuration.  OpenDNS addresses are 208.67.222.222 and
- * 208.67.220.220.  Used in ipconfigUSE_DHCP is set to 0, or ipconfigUSE_DHCP is
- * set to 1 but a DNS server cannot be contacted.*/
-#define configDNS_SERVER_ADDR0               143
-#define configDNS_SERVER_ADDR1               103
-#define configDNS_SERVER_ADDR2               47
-#define configDNS_SERVER_ADDR3               193
-
-/* Default netmask configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configNET_MASK0                      255
-#define configNET_MASK1                      255
-#define configNET_MASK2                      255
-#define configNET_MASK3                      0
-
-/* The UDP port to which print messages are sent. */
-#define configPRINT_PORT                     ( 15000 )
-
-#define configPROFILING                      ( 0 )
-
-/* Pseudo random number generater used by some demo tasks. */
-uint32_t ulRand(void);
-#define configRAND32()    ulRand()
-
-/* The platform FreeRTOS is running on. */
-#define configPLATFORM_NAME    "RenesasRX65N"
-
-/* Header required for the tracealyzer recorder library. */
-//#include "trcRecorder.h"
-
-/* When the FIT configurator or the Smart Configurator is used, platform.h has to be used. */
-#define configINCLUDE_PLATFORM_H_INSTEAD_OF_IODEFINE_H  1
-
-#endif /* FREERTOS_CONFIG_H */
diff --git a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/FreeRTOSIPConfig.h b/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/FreeRTOSIPConfig.h
deleted file mode 100644
index 413f8d38..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/FreeRTOSIPConfig.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * FreeRTOS+TCP V3.1.0
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * http://aws.amazon.com/freertos
- * http://www.FreeRTOS.org
- */
-
-
-/*****************************************************************************
-*
-* See the following URL for configuration information.
-* http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_IP_Configuration.html
-*
-*****************************************************************************/
-#include "r_ether_rx_config.h"
-
-#ifndef FREERTOS_IP_CONFIG_H
-#define FREERTOS_IP_CONFIG_H
-
-/* Define the byte order of the target MCU (the MCU FreeRTOS+TCP is executing
- * on).  Valid options are pdFREERTOS_BIG_ENDIAN and pdFREERTOS_LITTLE_ENDIAN. */
-#define ipconfigBYTE_ORDER                         pdFREERTOS_LITTLE_ENDIAN
-
-/*
- * FreeRTOS debug logging routines.
- * The macro will be called with a printf() format as a parameter.  Users
- * can define their own logging routine as:
- *
- * The FreeRTOS_debug_printf() must be thread-safe but does not have to be
- * interrupt-safe.
- */
-#define FreeRTOS_debug_printf( MSG )    configPRINTF( MSG )
-#define ipconfigHAS_PRINTF    1
-#define FreeRTOS_printf( MSG )    configPRINTF( MSG )
-
-/* 'ipconfigUSE_NETWORK_EVENT_HOOK' indicates if an application hook is available
- * called 'vApplicationIPNetworkEventHook()'.  This function will be called when
- * the network goes up and when it goes down.  See also FREERTOS_IP.h for further
- * explanation. */
-#define ipconfigUSE_NETWORK_EVENT_HOOK    1
-
-/* Define the number of entries in the ARP cache table. */
-#define ipconfigARP_CACHE_ENTRIES    6
-
-/* 'ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS' is an important macro: it
- * determines the number of network buffers that are available in the
- * entire application.
- * Note that the default of 45 may be pretty high for smaller
- * applications.
- * Also note that when the network interface uses zero-copy reception
- * ( ipconfigZERO_COPY_RX_DRIVER ), it will reserve a set of network
- * buffers permanently.
- * For zero-copy transmission, no network buffers are permanently
- * "reserved" for transmission.
- */
-#define ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS    ETHER_CFG_EMAC_TX_DESCRIPTORS
-
-/* Related to the macro 'ipconfigEVENT_QUEUE_LENGTH' here above:
- * when developing a new networking application, it can be helpful
- * to monitor the length of the message queue of the IP-task.
- * This code is only enabled when 'ipconfigCHECK_IP_QUEUE_SPACE'
- * is set to 1.  See also the function 'uxGetMinimumIPQueueSpace()'.
- */
-#define ipconfigCHECK_IP_QUEUE_SPACE    1
-
-/* Set ipconfigUSE_LLMNR to 1 to include LLMNR. */
-#define ipconfigUSE_LLMNR    0
-
-/* Set ipconfigUSE_NBNS to 1 to include NBNS. */
-#define ipconfigUSE_NBNS    0
-
-/* DHCP servers have a table with information about each clients.  One
- * of the fields in this table contains the host name of the DHCP clients.
- * When 'ipconfigDHCP_REGISTER_HOSTNAME' is defined as non-zero, the DHCP
- * driver will call 'pcApplicationHostnameHook()' to obtain the name of
- * the embedded device.
- */
-#define ipconfigDHCP_REGISTER_HOSTNAME    1
-
-/* The results of DNS lookup's can be stored in a cache table. */
-#define ipconfigUSE_DNS_CACHE    1
-
-/* When ipconfigDRIVER_INCLUDED_RX_IP_CHECKSUM is enabled,
- * the network interface is responsible for checking the checksums
- * of the incoming packets.
- * This can be either done in hardware, or by calling the checksum
- * functions.
- */
-#define ipconfigDRIVER_INCLUDED_RX_IP_CHECKSUM    1
-
-/* The macro 'ipconfigSOCKET_HAS_USER_WAKE_CALLBACK' allows to use a call-back
- * function that will be called at the moment one of the above events occurs.
- * Use the socket option 'FREERTOS_SO_WAKEUP_CALLBACK' to install a function
- * of the type 'void callback( Socket_t pxSocket )'.
- * Note that the call-back function runs in the IP-task, so very little things
- * can be done.  Better not to call any networking API, because that could
- * easily lead to a deadlock situation.
- */
-#define ipconfigSOCKET_HAS_USER_WAKE_CALLBACK    1
-
-/* TCP only: if the 'ipconfigTCP_KEEP_ALIVE' macro is defined as 1,
- * sockets in state "ESTABLISHED" can be protected using keep-alive packets.
- * These packets will be sent as soon as there hasn't been any activity
- * for a while.
- * The macro 'ipconfigTCP_KEEP_ALIVE_INTERVAL' determines the interval at
- * which keep-alive packets are sent.
- */
-#define ipconfigTCP_KEEP_ALIVE    1
-
-#endif /* FREERTOS_IP_CONFIG_H */
diff --git a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/core_http_config.h b/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/core_http_config.h
deleted file mode 100644
index 679a119d..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/core_http_config.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * coreHTTP v3.0.0
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_HTTP_CONFIG_H_
-#define CORE_HTTP_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging config definition and header files inclusion are required in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for HTTP.
- * 3. Include the header file "logging_stack.h", if logging is enabled for HTTP.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the HTTP library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "HTTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_HTTP_CONFIG_ */
\ No newline at end of file
diff --git a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/core_mqtt_agent_config.h b/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/core_mqtt_agent_config.h
deleted file mode 100644
index 9cb54017..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/core_mqtt_agent_config.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * coreMQTT Agent v1.2.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_mqtt_agent_config.h
- * @brief This represents the default values for the configuration macros
- * for the MQTT-Agent library.
- */
-
-#ifndef CORE_MQTT_AGENT_CONFIG_H_
-#define CORE_MQTT_AGENT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT Agent.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT_Agent"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
- /**
- * @brief Maximum time MQTT agent waits in the queue for any pending MQTT
- * operations.
- *
- * The wait time is kept smallest possible to increase the responsiveness of
- * MQTT agent while processing  pending MQTT operations as well as receive
- * packets from network.
- */
-#define MQTT_AGENT_MAX_EVENT_QUEUE_WAIT_TIME    ( 50U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_AGENT_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/core_mqtt_config.h b/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/core_mqtt_config.h
deleted file mode 100644
index 6222626b..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/core_mqtt_config.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * coreMQTT v2.1.1
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_MQTT_CONFIG_H_
-#define CORE_MQTT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief The maximum duration between non-empty network reads while
-* receiving an MQTT packet via the #MQTT_ProcessLoop or #MQTT_ReceiveLoop
-* API functions.
-*
-* When an incoming MQTT packet is detected, the transport receive function
-* may be called multiple times until all of the expected number of bytes of the
-* packet are received. This timeout represents the maximum polling duration that
-* is allowed without any data reception from the network for the incoming packet.
-*
-* If the timeout expires, the #MQTT_ProcessLoop and #MQTT_ReceiveLoop functions
-* return #MQTTRecvFailed.
-*
-* @note If a dummy implementation of the #MQTTGetCurrentTimeFunc_t timer function,
-* is supplied to the library, then #MQTT_RECV_POLLING_TIMEOUT_MS MUST be set to 0.
-*
-* <b>Possible values:</b> Any positive 32 bit integer. Recommended to use a
-* small timeout value. <br>
-* <b>Default value:</b> `10`
-*
-*/
-#define MQTT_RECV_POLLING_TIMEOUT_MS    ( 1000U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/core_pkcs11_config.h b/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/core_pkcs11_config.h
deleted file mode 100644
index e18f347c..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/core_pkcs11_config.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * corePKCS11 v3.5.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_pkcs11_config.h
- * @brief List of configuration macros for the corePKCS11 library along with
- * their custom values.
- */
-
-#ifndef CORE_PKCS11_CONFIG_H_
-#define CORE_PKCS11_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for PKCS #11.
- * 3. Include the header file "logging_stack.h", if logging is enabled for PKCS #11.
- */
-#include "logging_levels.h"
-
-/* Logging configuration for the PKCS #11 library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "PKCS11"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_ERROR
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief Maximum number of sessions that can be stored
-* by the PKCS #11 module.
-*
-* @note The windows test port has an abnormally large value in order to have
-* enough sessions to successfully run all the model based PKCS #11 tests.
-*
-* <b>Possible values:</b> Any positive integer.<br>
-* <b>Default value:</b> 10
-*/
-#define pkcs11configMAX_NUM_OBJECTS    8
-
-/**
-* @brief Set to 1 if a PAL destroy object is implemented.
-*
-* If set to 0, no PAL destroy object is implemented, and this functionality
-* is implemented in the common PKCS #11 layer.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configPAL_DESTROY_SUPPORTED    1
-
-/**
-* @brief Set to 1 if OTA image verification via PKCS #11 module is supported.
-*
-* If set to 0, OTA code signing certificate is built in via
-* aws_ota_codesigner_certificate.h.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configOTA_SUPPORTED    1
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* CORE_PKCS11_CONFIG_H_ include guard. */
diff --git a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/core_sntp_config.h b/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/core_sntp_config.h
deleted file mode 100644
index a6303826..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/core_sntp_config.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * coreSNTP v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_sntp_config.h
- * @brief This file represents the custom values for the configuration macros
- * of the coreSNTP library.
- */
-
-#ifndef CORE_SNTP_CONFIG_H_
-#define CORE_SNTP_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for SNTP.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "SNTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef CORE_SNTP_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/defender_config.h b/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/defender_config.h
deleted file mode 100644
index d0b3d8e4..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/defender_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Defender Client v1.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file defender_config.h
- * @brief Custom config values for the AWS IoT Device Defender Client Library.
- */
-
-#ifndef DEFENDER_CONFIG_H_
-#define DEFENDER_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for Device Defender.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "Defender"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* DEFENDER_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/demo_config.h b/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/demo_config.h
deleted file mode 100644
index 0122f7b8..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/demo_config.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * FreeRTOS V202111.00
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * https://www.FreeRTOS.org
- * https://github.com/FreeRTOS
- *
- */
-
-#ifndef DEMO_CONFIG_H
-#define DEMO_CONFIG_H
-
-/* FreeRTOS include. */
-#include "FreeRTOS.h"
-#include "aws_clientcredential.h"
-#include "aws_clientcredential_keys.h"
-#include "iot_default_root_certificates.h"
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for DEMO.
- * 3. Include the header file "logging_stack.h", if logging is enabled for DEMO.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Demo. */
-#ifndef LIBRARY_LOG_NAME
-#define LIBRARY_LOG_NAME    "MQTTDemo"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-#define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "iot_logging_task.h"
-
-
-/* Select a combination of demos to run
- * These demo has not been evaluated outside of the combination of demos listed below.
- *
- *          PUBSUB demo only :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB and OTA over MQTT demo :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (1)
- *          PUBSUB and OTA over MQTT demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (1)
- */
-/* demo is configured for PUBSUB */
-/* Select demo combination to run. */
-
-/* Please select a provisioning method
- * (0) : Pre-provisioning
- * (1) : Fleet provisioning
- */
-#define ENABLE_FLEET_PROVISIONING_DEMO      (0)
-
-/* Please select whether to enable or disable the OTA demo
- * (0) : OTA demo is disabled
- * (1) : OTA over MQTT demo is enabled
- */
-#define ENABLE_OTA_UPDATE_DEMO              (0)
-
-#define democonfigROOT_CA_PEM               tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief Path of the file containing the provisioning claim certificate. This
- * certificate is used to connect to AWS IoT Core and use Fleet Provisioning
- * APIs to provision the client device. This is used for the "Provisioning by
- * Claim" provisioning workflow.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This certificate should be PEM-encoded. The certificate should be
- * registered on AWS IoT Core beforehand. It should have an AWS IoT policy to
- * allow it to access only the Fleet Provisioning APIs. An example policy for
- * the claim certificates for this demo is available in the
- * example_claim_policy.json file in the demo directory. In the example,
- * replace <aws-region> with your AWS region, <aws-account-id> with your
- * account ID, and <template-name> with the name of your provisioning template.
- *
- */
-#define democonfigCLAIM_CERT_PEM            "...insert here..."
-
-/**
- * @brief Path of the file containing the provisioning claim private key. This
- * key corresponds to the provisioning claim certificate and is used to
- * authenticate with AWS IoT for provisioning by claim.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This private key should be PEM-encoded.
- *
- */
-#define democonfigCLAIM_PRIVATE_KEY_PEM     "...insert here..."
-
-/**
- * @brief An option to disable Server Name Indication.
- *
- * @note When using a local Mosquitto server setup, SNI needs to be disabled
- * for an MQTT broker that only has an IP address but no hostname. However,
- * SNI should be enabled whenever possible.
- */
-#define democonfigDISABLE_SNI                ( pdFALSE )
-
-/**
- * @brief Configuration that indicates if the demo connection is made to the AWS IoT Core MQTT broker.
- *
- * If username/password based authentication is used, the demo will use appropriate TLS ALPN and
- * SNI configurations as required for the Custom Authentication feature of AWS IoT.
- * For more information, refer to the following documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/custom-auth.html#custom-auth-mqtt
- *
- * #define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
- */
-#define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
-
-/**
- * @brief The unique ID used by the demo to differentiate instances.
- *
- *!!! Please note a #defined constant is used for convenience of demonstration
- *!!! only.  Production devices can use something unique to the device that can
- *!!! be read by software, such as a production serial number, instead of a
- *!!! hard coded constant.
- */
-#define democonfigFP_DEMO_ID    "FPDemoID"
-
-/**
- * @brief The MQTT client identifier used in this example.  Each client identifier
- * must be unique so edit as required to ensure no two clients connecting to the
- * same broker use the same client identifier.
- *
- * @note Appending __TIME__ to the client id string will reduce the possibility of a
- * client id collision in the broker. Note that the appended time is the compilation
- * time. This client id can cause collision, if more than one instance of the same
- * binary is used at the same time to connect to the broker.
- */
-#ifndef democonfigCLIENT_IDENTIFIER
-#if (ENABLE_FLEET_PROVISIONING_DEMO == 1)
-    #define democonfigCLIENT_IDENTIFIER    "client"democonfigFP_DEMO_ID
-#else
-    #define democonfigCLIENT_IDENTIFIER    clientcredentialIOT_THING_NAME
-#endif
-#endif
-
-/**
- * @brief Details of the MQTT broker to connect to.
- *
- * This is the Claim's Rest API Endpoint for AWS IoT.
- *
- * @note Your AWS IoT Core endpoint can be found in the AWS IoT console under
- * Settings/Custom Endpoint, or using the describe-endpoint API.
- *
- */
-#define democonfigMQTT_BROKER_ENDPOINT     clientcredentialMQTT_BROKER_ENDPOINT
-
-/**
- * @brief AWS IoT MQTT broker port number.
- *
- * In general, port 8883 is for secured MQTT connections.
- *
- * @note Port 443 requires use of the ALPN TLS extension with the ALPN protocol
- * name. When using port 8883, ALPN is not required.
- */
-#define democonfigMQTT_BROKER_PORT    ( clientcredentialMQTT_BROKER_PORT )
-
-/**
- * @brief Name of the provisioning template to use for the RegisterThing
- * portion of the Fleet Provisioning workflow.
- *
- * For information about provisioning templates, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-template.html#fleet-provision-template
- *
- * The example template used for this demo is available in the
- * example_demo_template.json file in the DemoSetup directory. In the example,
- * replace <provisioned-thing-policy> with the policy provisioned devices
- * should have.  The demo template uses Fn::Join to construct the Thing name by
- * concatenating fp_demo_ and the serial number sent by the demo.
- *
- * @note The provisioning template MUST be created in AWS IoT before running the
- * demo.
- *
- * @note If you followed the manual setup steps on https://freertos.org/iot-fleet-provisioning/demo.html,
- * the provisioning template name is "FleetProvisioningDemoTemplate".
- * However, if you used CloudFormation to set up the demo, the template name is "CF_FleetProvisioningDemoTemplate"
- */
- #define democonfigPROVISIONING_TEMPLATE_NAME    "...insert here..."
-
-/**
- * @brief Subject name to use when creating the certificate signing request (CSR)
- * for provisioning the demo client with using the Fleet Provisioning
- * CreateCertificateFromCsr APIs.
- *
- * This is passed to MbedTLS; see https://tls.mbed.org/api/x509__csr_8h.html#a954eae166b125cea2115b7db8c896e90
- */
-#ifndef democonfigCSR_SUBJECT_NAME
-    #define democonfigCSR_SUBJECT_NAME    "CN="democonfigFP_DEMO_ID
-#endif
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_STACKSIZE        configMINIMAL_STACK_SIZE * 3
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_TASK_PRIORITY    ( tskIDLE_PRIORITY + 1 )
-
-#define democonfigNETWORK_BUFFER_SIZE    ( configMINIMAL_STACK_SIZE * 3 )
-
-#include "core_mqtt.h" /* Include coreMQTT header for MQTT_LIBRARY_VERSION macro. */
-#define democonfigMQTT_LIB    "core-mqtt@"MQTT_LIBRARY_VERSION
-
-#define democonfigDISABLE_SNI       ( pdFALSE )
-
-/**
- * @brief ALPN (Application-Layer Protocol Negotiation) protocol name for AWS IoT MQTT.
- *
- * This will be used if democonfigMQTT_BROKER_PORT is configured as 443 for the AWS IoT MQTT broker.
- * Please see more details about the ALPN protocol for AWS IoT MQTT endpoint
- * in the link below.
- * https://aws.amazon.com/blogs/iot/mqtt-with-tls-client-authentication-on-port-443-why-it-is-useful-and-how-it-works/
- */
-#define AWS_IOT_MQTT_ALPN           "\x0ex-amzn-mqtt-ca"
-
-/**
- * @brief This is the ALPN (Application-Layer Protocol Negotiation) string
- * required by AWS IoT for password-based authentication using TCP port 443.
- */
-#define AWS_IOT_CUSTOM_AUTH_ALPN    "\x04mqtt"
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-/**
- * @brief The name of the operating system that the application is running on.
- * The current value is given as an example. Please update for your specific
- * operating system.
- */
-#define democonfigOS_NAME       "FreeRTOS"
-
-/**
- * @brief The version of the operating system that the application is running
- * on. The current value is given as an example. Please update for your specific
- * operating system version.
- */
-#define democonfigOS_VERSION    "V10.4.3"
-
-/**
- * @brief The name of the hardware platform the application is running on. The
- * current value is given as an example. Please update for your specific
- * hardware platform.
- */
-#define democonfigHARDWARE_PLATFORM_NAME    "CK-RX65N"
-
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING                                 \
-    "?SDK=" democonfigOS_NAME "&Version=" democonfigOS_VERSION \
-    "&MQTTLib=" democonfigMQTT_LIB
-
-/**
- * @brief The length of the MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING_LENGTH    ( ( uint16_t ) ( sizeof( AWS_IOT_METRICS_STRING ) - 1 ) )
-
-
-#ifdef democonfigCLIENT_USERNAME
-
-/**
- * @brief Append the username with the metrics string if #democonfigCLIENT_USERNAME is defined.
- *
- * This is to support both metrics reporting and username/password based client
- * authentication by AWS IoT.
- */
-#define CLIENT_USERNAME_WITH_METRICS    democonfigCLIENT_USERNAME AWS_IOT_METRICS_STRING
-#endif
-
-/**
- * @brief Flag to enable or disable provisioning mode for the demo.
- * Enabling the flags starts a CLI task, so that user can perform provisioning of the device through
- * a serial terminal. Provisioning involves running commands to fetch or set the PKI and configuration
- * information for the device to connect to broker and perform OTA updates. Disabling the flag results
- * in disabling the CLI task and execution of the demo tasks in normal device operation mode.
- */
-#define appmainPROVISIONING_MODE                  ( 1 )
-
-/**
- * @brief Certificate used for validating code signing signatures in the OTA PAL.
- */
-#ifndef otapalconfigCODE_SIGNING_CERTIFICATE
-    #define otapalconfigCODE_SIGNING_CERTIFICATE    "Insert code signing certificate..."
-#endif
-
-/**
- * @brief Major version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MAJOR
-    #define APP_VERSION_MAJOR    0
-#endif
-
-/**
- * @brief Minor version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MINOR
-    #define APP_VERSION_MINOR    9
-#endif
-
-/**
- * @brief Build version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_BUILD
-    #define APP_VERSION_BUILD    2
-#endif
-
-/**
- * @brief Server's root CA certificate.
- *
- * This certificate is used to identify the AWS IoT server and is publicly
- * available. Refer to the AWS documentation available in the link below for
- * information about the Server Root CAs.
- * https://docs.aws.amazon.com/iot/latest/developerguide/server-authentication.html#server-authentication-certs
- *
- * @note The TI C3220 Launchpad board requires that the Root CA have its
- * certificate self-signed. As mentioned in the above link, the Amazon Root CAs
- * are cross-signed by the Starfield Root CA. Thus, ONLY the Starfield Root CA
- * can be used to connect to the ATS endpoints on AWS IoT for the TI board.
- *
- * @note This certificate should be PEM-encoded.
- *
- * Must include the PEM header and footer:
- * "-----BEGIN CERTIFICATE-----\n"\
- * "...base64 data...\n"\
- * "-----END CERTIFICATE-----\n"
- *
- */
-#define democonfigROOT_CA_PEM                   tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief The length of the queue used to hold commands for the agent.
- */
-#define MQTT_AGENT_COMMAND_QUEUE_LENGTH         ( 25 )
-
-/**
- * @brief Dimensions the buffer used to serialise and deserialise MQTT packets.
- * @note Specified in bytes.  Must be large enough to hold the maximum
- * anticipated MQTT payload.
- */
-#define MQTT_AGENT_NETWORK_BUFFER_SIZE          ( 5000 )
-
-#define MQTT_COMMAND_CONTEXTS_POOL_SIZE              ( 10 )
-
-#endif /* DEMO_CONFIG_H */
diff --git a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/fleet_provisioning_config.h b/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/fleet_provisioning_config.h
deleted file mode 100644
index 68b85d66..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/fleet_provisioning_config.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * AWS IoT Fleet Provisioning v1.1.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file fleet_provisioning_config.h
- * @brief Custom config values for the AWS IoT Fleet Provisioning Library.
- */
-
-#ifndef FLEET_PROVISIONING_CONFIG_H_
-#define FLEET_PROVISIONING_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for Fleet Provisioning.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Fleet Provisioning library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "FleetProvisioning"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-/************ End of logging configuration ****************/
-
-#endif /* ifndef FLEET_PROVISIONING_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/rm_littlefs_flash_config.h b/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/rm_littlefs_flash_config.h
deleted file mode 100644
index 94207ffa..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/rm_littlefs_flash_config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/***********************************************************************************************************************
- * Copyright 2023 Renesas Electronics Corporation and/or its affiliates.  All Rights Reserved.
- *
- * This software and documentation are supplied by Renesas Electronics America Inc. and may only be used with products
- * of Renesas Electronics Corp. and its affiliates ("Renesas").  No other uses are authorized.  Renesas products are
- * sold pursuant to Renesas terms and conditions of sale.  Purchasers are solely responsible for the selection and use
- * of Renesas products and Renesas assumes no liability.  No license, express or implied, to any intellectual property
- * right is granted by Renesas. This software is protected under all applicable laws, including copyright laws. Renesas
- * reserves the right to change or discontinue this software and/or this documentation. THE SOFTWARE AND DOCUMENTATION
- * IS DELIVERED TO YOU "AS IS," AND RENESAS MAKES NO REPRESENTATIONS OR WARRANTIES, AND TO THE FULLEST EXTENT
- * PERMISSIBLE UNDER APPLICABLE LAW, DISCLAIMS ALL WARRANTIES, WHETHER EXPLICITLY OR IMPLICITLY, INCLUDING WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT, WITH RESPECT TO THE SOFTWARE OR
- * DOCUMENTATION.  RENESAS SHALL HAVE NO LIABILITY ARISING OUT OF ANY SECURITY VULNERABILITY OR BREACH.  TO THE MAXIMUM
- * EXTENT PERMITTED BY LAW, IN NO EVENT WILL RENESAS BE LIABLE TO YOU IN CONNECTION WITH THE SOFTWARE OR DOCUMENTATION
- * (OR ANY PERSON OR ENTITY CLAIMING RIGHTS DERIVED FROM YOU) FOR ANY LOSS, DAMAGES, OR CLAIMS WHATSOEVER, INCLUDING,
- * WITHOUT LIMITATION, ANY DIRECT, CONSEQUENTIAL, SPECIAL, INDIRECT, PUNITIVE, OR INCIDENTAL DAMAGES; ANY LOST PROFITS,
- * OTHER ECONOMIC DAMAGE, PROPERTY DAMAGE, OR PERSONAL INJURY; AND EVEN IF RENESAS HAS BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH LOSS, DAMAGES, CLAIMS OR COSTS.
- **********************************************************************************************************************/
-
-#ifndef FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-#define FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-
-/***********************************************************************************************************************
- * Includes
- **********************************************************************************************************************/
-#include "rm_littlefs_df_rx65n.h"
-
-#define LFS_FLASH_READ_SIZE				(1)
-#define LFS_FLASH_PROGRAM_SIZE			(4)
-#define LFS_FLASH_BLOCK_SIZE			(128)
-#define LFS_FLASH_BLOCK_COUNT			(70)
-#define RM_LITTLEFS_FLASH_DATA_START	FLASH_DF_BLOCK_0_MACRO
-
-#if LFS_FLASH_BLOCK_SIZE*LFS_FLASH_BLOCK_COUNT + (RM_LITTLEFS_FLASH_DATA_START - FLASH_DF_BLOCK_0_MACRO) > BSP_DATA_FLASH_SIZE_BYTES
-#error "Too many blocks"
-#endif
-
-#endif /* FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/shadow_config.h b/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/shadow_config.h
deleted file mode 100644
index aa948c12..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/shadow_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Shadow v1.3.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file shadow_config.h
- * @brief This represents the custom values for the configuration macros
- * for the Shadow library.
- */
-
-#ifndef SHADOW_CONFIG_H_
-#define SHADOW_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SHADOW"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef SHADOW_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/sigv4_config.h b/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/sigv4_config.h
deleted file mode 100644
index ba277a79..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/ether/src/frtos_config/sigv4_config.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * SigV4 Library v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file sigv4_config.h
- * @brief The custom values for configuration macros used by the SigV4 Library.
- */
-
-#ifndef SIGV4_CONFIG_H_
-#define SIGV4_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SIGV4"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef SIGV4_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/wifi/linker_section_sample.esi b/Configuration/samples/pubsub/ck-rx65n/wifi/linker_section_sample.esi
deleted file mode 100644
index 3371ded6..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/wifi/linker_section_sample.esi
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<com.renesas.linkersection.model:SectionContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:com.renesas.linkersection.model="http:///LinkerSection.ecore">
-  <sections name="SU">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4"/>
-  </sections>
-  <sections name="SI"/>
-  <sections name="R_1"/>
-  <sections name="B_2"/>
-  <sections name="R"/>
-  <sections name="RPFRAM2"/>
-  <sections name="C_LITTLEFS_MANAGEMENT_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1048576"/>
-  </sections>
-  <sections name="C_USER_APPLICATION_AREA">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1057536"/>
-  </sections>
-  <sections name="B">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="8388608"/>
-  </sections>
-  <sections name="B_1"/>
-  <sections name="R_2"/>
-  <sections name="PResetPRG">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4293919488"/>
-  </sections>
-  <sections name="C_1"/>
-  <sections name="C_2"/>
-  <sections name="C"/>
-  <sections name="C$*"/>
-  <sections name="D*"/>
-  <sections name="W*"/>
-  <sections name="L"/>
-  <sections name="P"/>
-  <sections name="PFRAM2"/>
-  <sections name="EXCEPTVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294967168"/>
-  </sections>
-  <sections name="RESETVECT">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294967292"/>
-  </sections>
-</com.renesas.linkersection.model:SectionContainer>
diff --git a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/FreeRTOSConfig.h b/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/FreeRTOSConfig.h
deleted file mode 100644
index 5662a8c2..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/FreeRTOSConfig.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * FreeRTOS Kernel V10.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * http://aws.amazon.com/freertos
- * http://www.FreeRTOS.org
- */
-
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
-
-
-/* Unity includes. */
-#if defined(FREERTOS_ENABLE_UNIT_TESTS)
-#include "unity_internals.h"
-#elif defined(ENABLE_UNIT_TESTS)
-#include "unity.h"
-#endif
-
-/*-----------------------------------------------------------
-* Application specific definitions.
-*
-* These definitions should be adjusted for your particular hardware and
-* application requirements.
-*
-* THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
-* FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
-* http://www.freertos.org/a00110.html
-*
-* The bottom of this file contains some constants specific to running the UDP
-* stack in this demo.  Constants specific to FreeRTOS+TCP itself (rather than
-* the demo) are contained in FreeRTOSIPConfig.h.
-*----------------------------------------------------------*/
-#define configENABLE_BACKWARD_COMPATIBILITY        1
-#define configUSE_PREEMPTION                       1
-#define configUSE_PORT_OPTIMISED_TASK_SELECTION    0
-#define configMAX_PRIORITIES                       (7)
-#define configTICK_RATE_HZ                         (( TickType_t ) 1000)
-#define configMINIMAL_STACK_SIZE                   (768)
-#define configTOTAL_HEAP_SIZE_N						(256)
-#define configTOTAL_HEAP_SIZE                      (( size_t ) ( configTOTAL_HEAP_SIZE_N * 1024 ))
-#define configMAX_TASK_NAME_LEN                    (12)
-#define configUSE_TRACE_FACILITY                   1
-#define configUSE_16_BIT_TICKS                     0
-#define configIDLE_SHOULD_YIELD                    1
-#define configUSE_CO_ROUTINES                      0
-#define configUSE_MUTEXES                          1
-#define configUSE_RECURSIVE_MUTEXES                1
-#define configQUEUE_REGISTRY_SIZE                  0
-#define configUSE_APPLICATION_TASK_TAG             0
-#define configUSE_COUNTING_SEMAPHORES              1
-#define configUSE_ALTERNATIVE_API                  0
-#define configNUM_THREAD_LOCAL_STORAGE_POINTERS    3      /* FreeRTOS+FAT requires 2 pointers if a CWD is supported. */
-#define configRECORD_STACK_HIGH_ADDRESS            1
-
-#define configUSE_DAEMON_TASK_STARTUP_HOOK 1
-
-#define configCPU_CLOCK_HZ				(BSP_ICLK_HZ)
-#define configPERIPHERAL_CLOCK_HZ		(BSP_PCLKB_HZ)
-#define configUSE_QUEUE_SETS			1
-
-/* Hook function related definitions. */
-#define configUSE_TICK_HOOK                        1
-#define configUSE_IDLE_HOOK                        1
-#define configUSE_MALLOC_FAILED_HOOK               1
-#define configCHECK_FOR_STACK_OVERFLOW             2      /* Not applicable to the Win32 port. */
-
-/* Software timer related definitions. */
-#define configUSE_TIMERS                           1
-#define configTIMER_TASK_PRIORITY                  (6)
-#define configTIMER_QUEUE_LENGTH                   5
-#define configTIMER_TASK_STACK_DEPTH               (configMINIMAL_STACK_SIZE)
-
-/* The interrupt priority used by the kernel itself for the tick interrupt and
-the pended interrupt.  This would normally be the lowest priority. */
-#define configKERNEL_INTERRUPT_PRIORITY         1
-
-/* The maximum interrupt priority from which FreeRTOS API calls can be made.
-Interrupts that use a priority above this will not be effected by anything the
-kernel is doing. */
-#define configMAX_SYSCALL_INTERRUPT_PRIORITY    4
-
-/* The peripheral used to generate the tick interrupt is configured as part of
-the application code.  This constant should be set to the vector number of the
-peripheral chosen.  As supplied this is CMT0. */
-#define configTICK_VECTOR						_CMT0_CMI0		//CMT0
-//#define configTICK_VECTOR						_CMT1_CMI1		//CMT1
-//#define configTICK_VECTOR						_CMT2_CMI2		//CMT2
-//#define configTICK_VECTOR						_CMT3_CMI3		//CMT3
-
-/* Event group related definitions. */
-#define configUSE_EVENT_GROUPS                     1
-
-/* Run time stats gathering definitions. */
-unsigned long ulGetRunTimeCounterValue( void );
-void vConfigureTimerForRunTimeStats( void );
-#define configGENERATE_RUN_TIME_STATS    0
-//#define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS()    vConfigureTimerForRunTimeStats()
-//#define portGET_RUN_TIME_COUNTER_VALUE()            ulGetRunTimeCounterValue()
-
-/* Co-routine definitions. */
-#define configUSE_CO_ROUTINES                   0
-#define configMAX_CO_ROUTINE_PRIORITIES         (2)
-
-/* Currently the TCP/IP stack is using dynamic allocation, and the MQTT task is
- * using static allocation. */
-#define configSUPPORT_DYNAMIC_ALLOCATION        1
-#define configSUPPORT_STATIC_ALLOCATION         1
-
-/* Set the following definitions to 1 to include the API function, or zero
- * to exclude the API function. */
-#define INCLUDE_vTaskPrioritySet                1
-#define INCLUDE_uxTaskPriorityGet               1
-#define INCLUDE_vTaskDelete                     1
-#define INCLUDE_vTaskCleanUpResources           0
-#define INCLUDE_vTaskSuspend                    1
-#define INCLUDE_vTaskDelayUntil                 1
-#define INCLUDE_vTaskDelay                      1
-#define INCLUDE_uxTaskGetStackHighWaterMark     1
-#define INCLUDE_xTaskGetSchedulerState          1
-#define INCLUDE_xTimerGetTimerTaskHandle        0
-#define INCLUDE_xTaskGetIdleTaskHandle          0
-#define INCLUDE_xQueueGetMutexHolder            1
-#define INCLUDE_eTaskGetState                   1
-#define INCLUDE_xEventGroupSetBitsFromISR       1
-#define INCLUDE_xTimerPendFunctionCall          1
-#define INCLUDE_xTaskGetCurrentTaskHandle       1
-#define INCLUDE_xTaskAbortDelay                 1
-
-/* This demo makes use of one or more example stats formatting functions.  These
- * format the raw data provided by the uxTaskGetSystemState() function in to human
- * readable ASCII form.  See the notes in the implementation of vTaskList() within
- * FreeRTOS/Source/tasks.c for limitations.  configUSE_STATS_FORMATTING_FUNCTIONS
- * is set to 2 so the formatting functions are included without the stdio.h being
- * included in tasks.c.  That is because this project defines its own sprintf()
- * functions. */
-#define configUSE_STATS_FORMATTING_FUNCTIONS    1
-
-#if defined(ENABLE_UNIT_TESTS) || defined(FREERTOS_ENABLE_UNIT_TESTS)
-/* unity testing */
-#define configASSERT( x ) do { if( ( x ) == 0 ) TEST_ABORT(); } while( 0 )
-#elif defined(CONFIG_FREERTOS_ASSERT_DISABLE) || defined(NDEBUG)
-/* Disable Assert call for release builds. */
-#define configASSERT( x ) ( ( void ) 0 )
-#else /* CONFIG_FREERTOS_ASSERT_FAIL_ABORT or nothing */
-/* Assert call defined for debug builds. */
-extern void vAssertCalled( void );
-#define configASSERT( x ) do { if( ( x ) == 0 ) vAssertCalled(); } while( 0 )
-#endif
-
-/* The function that implements FreeRTOS printf style output, and the macro
- * that maps the configPRINTF() macros to that function. */
-extern void vLoggingPrintf( const char * pcFormat, ... );
-#define configPRINTF( X )    vLoggingPrintf X
-
-/* Non-format version thread-safe print */
-extern void vLoggingPrint( const char * pcMessage );
-#define configPRINT( X )     vLoggingPrint( X )
-
-extern void vOutputString( const char * pcMessage );
-/* Map the logging task's printf to the board specific output function. */
-#define configPRINT_STRING( x )    vOutputString(x)
-
-/* Sets the length of the buffers into which logging messages are written - so
- * also defines the maximum length of each log message. */
-#define configLOGGING_MAX_MESSAGE_LENGTH            192
-
-/* Set to 1 to prepend each log message with a message number, the task name,
- * and a time stamp. */
-#define configLOGGING_INCLUDE_TIME_AND_TASK_NAME    1
-
-/* Application specific definitions follow. **********************************/
-
-/* If configINCLUDE_DEMO_DEBUG_STATS is set to one, then a few basic IP trace
- * macros are defined to gather some UDP stack statistics that can then be viewed
- * through the CLI interface. */
-#define configINCLUDE_DEMO_DEBUG_STATS       1
-
-/* The size of the global output buffer that is available for use when there
- * are multiple command interpreters running at once (for example, one on a UART
- * and one on TCP/IP).  This is done to prevent an output buffer being defined by
- * each implementation - which would waste RAM.  In this case, there is only one
- * command interpreter running, and it has its own local output buffer, so the
- * global buffer is just set to be one byte long as it is not used and should not
- * take up unnecessary RAM. */
-#define configCOMMAND_INT_MAX_OUTPUT_SIZE    850
-
-/* Only used when running in the FreeRTOS Windows simulator.  Defines the
- * priority of the task used to simulate Ethernet interrupts. */
-#define configMAC_ISR_SIMULATOR_PRIORITY     ( configMAX_PRIORITIES - 1 )
-
-/* This demo creates a virtual network connection by accessing the raw Ethernet
- * or WiFi data to and from a real network connection.  Many computers have more
- * than one real network port, and configNETWORK_INTERFACE_TO_USE is used to tell
- * the demo which real port should be used to create the virtual port.  The ports
- * available are displayed on the console when the application is executed.  For
- * example, on my development laptop setting configNETWORK_INTERFACE_TO_USE to 4
- * results in the wired network being used, while setting
- * configNETWORK_INTERFACE_TO_USE to 2 results in the wireless network being
- * used. */
-#define configNETWORK_INTERFACE_TO_USE       2L
-
-/* The address of an echo server that will be used by the two demo echo client
- * tasks:
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_Echo_Clients.html,
- * http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/UDP_Echo_Clients.html. */
-#define configECHO_SERVER_ADDR0              192
-#define configECHO_SERVER_ADDR1              168
-#define configECHO_SERVER_ADDR2              1
-#define configECHO_SERVER_ADDR3              200
-#define configTCP_ECHO_CLIENT_PORT           9999
-
-/* Default MAC address configuration.  The demo creates a virtual network
- * connection that uses this MAC address by accessing the raw Ethernet/WiFi data
- * to and from a real network connection on the host PC.  See the
- * configNETWORK_INTERFACE_TO_USE definition above for information on how to
- * configure the real network connection to use. */
-#define configMAC_ADDR0                      0x74
-#define configMAC_ADDR1                      0x90
-#define configMAC_ADDR2                      0x50
-#define configMAC_ADDR3                      0x00
-#define configMAC_ADDR4                      0x79
-#define configMAC_ADDR5                      0x03
-
-/* Default IP address configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configIP_ADDR0                       192
-#define configIP_ADDR1                       168
-#define configIP_ADDR2                       11
-#define configIP_ADDR3                       12
-
-/* Default gateway IP address configuration.  Used in ipconfigUSE_DHCP is set to
- * 0, or ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configGATEWAY_ADDR0                  172
-#define configGATEWAY_ADDR1                  27
-#define configGATEWAY_ADDR2                  49
-#define configGATEWAY_ADDR3                  1
-
-/* Default DNS server configuration.  OpenDNS addresses are 208.67.222.222 and
- * 208.67.220.220.  Used in ipconfigUSE_DHCP is set to 0, or ipconfigUSE_DHCP is
- * set to 1 but a DNS server cannot be contacted.*/
-#define configDNS_SERVER_ADDR0               143
-#define configDNS_SERVER_ADDR1               103
-#define configDNS_SERVER_ADDR2               47
-#define configDNS_SERVER_ADDR3               193
-
-/* Default netmask configuration.  Used in ipconfigUSE_DHCP is set to 0, or
- * ipconfigUSE_DHCP is set to 1 but a DNS server cannot be contacted. */
-#define configNET_MASK0                      255
-#define configNET_MASK1                      255
-#define configNET_MASK2                      255
-#define configNET_MASK3                      0
-
-/* The UDP port to which print messages are sent. */
-#define configPRINT_PORT                     ( 15000 )
-
-#define configPROFILING                      ( 0 )
-
-/* Pseudo random number generater used by some demo tasks. */
-uint32_t ulRand(void);
-#define configRAND32()    ulRand()
-
-/* The platform FreeRTOS is running on. */
-#define configPLATFORM_NAME    "RenesasRX65N"
-
-/* Header required for the tracealyzer recorder library. */
-//#include "trcRecorder.h"
-
-/* When the FIT configurator or the Smart Configurator is used, platform.h has to be used. */
-#define configINCLUDE_PLATFORM_H_INSTEAD_OF_IODEFINE_H  1
-
-#endif /* FREERTOS_CONFIG_H */
diff --git a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/core_http_config.h b/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/core_http_config.h
deleted file mode 100644
index 679a119d..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/core_http_config.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * coreHTTP v3.0.0
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_HTTP_CONFIG_H_
-#define CORE_HTTP_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging config definition and header files inclusion are required in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for HTTP.
- * 3. Include the header file "logging_stack.h", if logging is enabled for HTTP.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the HTTP library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "HTTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_HTTP_CONFIG_ */
\ No newline at end of file
diff --git a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/core_mqtt_agent_config.h b/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/core_mqtt_agent_config.h
deleted file mode 100644
index 9cb54017..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/core_mqtt_agent_config.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * coreMQTT Agent v1.2.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_mqtt_agent_config.h
- * @brief This represents the default values for the configuration macros
- * for the MQTT-Agent library.
- */
-
-#ifndef CORE_MQTT_AGENT_CONFIG_H_
-#define CORE_MQTT_AGENT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT Agent.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT_Agent"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
- /**
- * @brief Maximum time MQTT agent waits in the queue for any pending MQTT
- * operations.
- *
- * The wait time is kept smallest possible to increase the responsiveness of
- * MQTT agent while processing  pending MQTT operations as well as receive
- * packets from network.
- */
-#define MQTT_AGENT_MAX_EVENT_QUEUE_WAIT_TIME    ( 50U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_AGENT_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/core_mqtt_config.h b/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/core_mqtt_config.h
deleted file mode 100644
index 6222626b..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/core_mqtt_config.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * coreMQTT v2.1.1
- * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CORE_MQTT_CONFIG_H_
-#define CORE_MQTT_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for MQTT.
- * 3. Include the header file "logging_stack.h", if logging is enabled for MQTT.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the MQTT library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "MQTT"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief The maximum duration between non-empty network reads while
-* receiving an MQTT packet via the #MQTT_ProcessLoop or #MQTT_ReceiveLoop
-* API functions.
-*
-* When an incoming MQTT packet is detected, the transport receive function
-* may be called multiple times until all of the expected number of bytes of the
-* packet are received. This timeout represents the maximum polling duration that
-* is allowed without any data reception from the network for the incoming packet.
-*
-* If the timeout expires, the #MQTT_ProcessLoop and #MQTT_ReceiveLoop functions
-* return #MQTTRecvFailed.
-*
-* @note If a dummy implementation of the #MQTTGetCurrentTimeFunc_t timer function,
-* is supplied to the library, then #MQTT_RECV_POLLING_TIMEOUT_MS MUST be set to 0.
-*
-* <b>Possible values:</b> Any positive 32 bit integer. Recommended to use a
-* small timeout value. <br>
-* <b>Default value:</b> `10`
-*
-*/
-#define MQTT_RECV_POLLING_TIMEOUT_MS    ( 1000U )
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef CORE_MQTT_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/core_pkcs11_config.h b/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/core_pkcs11_config.h
deleted file mode 100644
index e18f347c..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/core_pkcs11_config.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * corePKCS11 v3.5.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_pkcs11_config.h
- * @brief List of configuration macros for the corePKCS11 library along with
- * their custom values.
- */
-
-#ifndef CORE_PKCS11_CONFIG_H_
-#define CORE_PKCS11_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for PKCS #11.
- * 3. Include the header file "logging_stack.h", if logging is enabled for PKCS #11.
- */
-#include "logging_levels.h"
-
-/* Logging configuration for the PKCS #11 library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "PKCS11"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_ERROR
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/**
-* @brief Maximum number of sessions that can be stored
-* by the PKCS #11 module.
-*
-* @note The windows test port has an abnormally large value in order to have
-* enough sessions to successfully run all the model based PKCS #11 tests.
-*
-* <b>Possible values:</b> Any positive integer.<br>
-* <b>Default value:</b> 10
-*/
-#define pkcs11configMAX_NUM_OBJECTS    8
-
-/**
-* @brief Set to 1 if a PAL destroy object is implemented.
-*
-* If set to 0, no PAL destroy object is implemented, and this functionality
-* is implemented in the common PKCS #11 layer.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configPAL_DESTROY_SUPPORTED    1
-
-/**
-* @brief Set to 1 if OTA image verification via PKCS #11 module is supported.
-*
-* If set to 0, OTA code signing certificate is built in via
-* aws_ota_codesigner_certificate.h.
-*
-* <b>Possible values:</b> `0` or `1`<br>
-* <b>Default value:</b> `0`
-*/
-#define pkcs11configOTA_SUPPORTED    1
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* CORE_PKCS11_CONFIG_H_ include guard. */
diff --git a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/core_sntp_config.h b/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/core_sntp_config.h
deleted file mode 100644
index a6303826..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/core_sntp_config.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * coreSNTP v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file core_sntp_config.h
- * @brief This file represents the custom values for the configuration macros
- * of the coreSNTP library.
- */
-
-#ifndef CORE_SNTP_CONFIG_H_
-#define CORE_SNTP_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for SNTP.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "SNTP"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef CORE_SNTP_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/defender_config.h b/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/defender_config.h
deleted file mode 100644
index d0b3d8e4..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/defender_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Defender Client v1.3.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file defender_config.h
- * @brief Custom config values for the AWS IoT Device Defender Client Library.
- */
-
-#ifndef DEFENDER_CONFIG_H_
-#define DEFENDER_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for Device Defender.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Defender library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "Defender"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* DEFENDER_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/demo_config.h b/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/demo_config.h
deleted file mode 100644
index 0122f7b8..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/demo_config.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * FreeRTOS V202111.00
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * https://www.FreeRTOS.org
- * https://github.com/FreeRTOS
- *
- */
-
-#ifndef DEMO_CONFIG_H
-#define DEMO_CONFIG_H
-
-/* FreeRTOS include. */
-#include "FreeRTOS.h"
-#include "aws_clientcredential.h"
-#include "aws_clientcredential_keys.h"
-#include "iot_default_root_certificates.h"
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for DEMO.
- * 3. Include the header file "logging_stack.h", if logging is enabled for DEMO.
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Demo. */
-#ifndef LIBRARY_LOG_NAME
-#define LIBRARY_LOG_NAME    "MQTTDemo"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-#define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "iot_logging_task.h"
-
-
-/* Select a combination of demos to run
- * These demo has not been evaluated outside of the combination of demos listed below.
- *
- *          PUBSUB demo only :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (0)
- *          PUBSUB and OTA over MQTT demo :
- *             ENABLE_FLEET_PROVISIONING_DEMO (0) + ENABLE_OTA_UPDATE_DEMO (1)
- *          PUBSUB and OTA over MQTT demo with fleet provisioning :
- *             ENABLE_FLEET_PROVISIONING_DEMO (1) + ENABLE_OTA_UPDATE_DEMO (1)
- */
-/* demo is configured for PUBSUB */
-/* Select demo combination to run. */
-
-/* Please select a provisioning method
- * (0) : Pre-provisioning
- * (1) : Fleet provisioning
- */
-#define ENABLE_FLEET_PROVISIONING_DEMO      (0)
-
-/* Please select whether to enable or disable the OTA demo
- * (0) : OTA demo is disabled
- * (1) : OTA over MQTT demo is enabled
- */
-#define ENABLE_OTA_UPDATE_DEMO              (0)
-
-#define democonfigROOT_CA_PEM               tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief Path of the file containing the provisioning claim certificate. This
- * certificate is used to connect to AWS IoT Core and use Fleet Provisioning
- * APIs to provision the client device. This is used for the "Provisioning by
- * Claim" provisioning workflow.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This certificate should be PEM-encoded. The certificate should be
- * registered on AWS IoT Core beforehand. It should have an AWS IoT policy to
- * allow it to access only the Fleet Provisioning APIs. An example policy for
- * the claim certificates for this demo is available in the
- * example_claim_policy.json file in the demo directory. In the example,
- * replace <aws-region> with your AWS region, <aws-account-id> with your
- * account ID, and <template-name> with the name of your provisioning template.
- *
- */
-#define democonfigCLAIM_CERT_PEM            "...insert here..."
-
-/**
- * @brief Path of the file containing the provisioning claim private key. This
- * key corresponds to the provisioning claim certificate and is used to
- * authenticate with AWS IoT for provisioning by claim.
- *
- * For information about provisioning by claim, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#claim-based
- *
- * @note This private key should be PEM-encoded.
- *
- */
-#define democonfigCLAIM_PRIVATE_KEY_PEM     "...insert here..."
-
-/**
- * @brief An option to disable Server Name Indication.
- *
- * @note When using a local Mosquitto server setup, SNI needs to be disabled
- * for an MQTT broker that only has an IP address but no hostname. However,
- * SNI should be enabled whenever possible.
- */
-#define democonfigDISABLE_SNI                ( pdFALSE )
-
-/**
- * @brief Configuration that indicates if the demo connection is made to the AWS IoT Core MQTT broker.
- *
- * If username/password based authentication is used, the demo will use appropriate TLS ALPN and
- * SNI configurations as required for the Custom Authentication feature of AWS IoT.
- * For more information, refer to the following documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/custom-auth.html#custom-auth-mqtt
- *
- * #define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
- */
-#define democonfigUSE_AWS_IOT_CORE_BROKER    ( 1 )
-
-/**
- * @brief The unique ID used by the demo to differentiate instances.
- *
- *!!! Please note a #defined constant is used for convenience of demonstration
- *!!! only.  Production devices can use something unique to the device that can
- *!!! be read by software, such as a production serial number, instead of a
- *!!! hard coded constant.
- */
-#define democonfigFP_DEMO_ID    "FPDemoID"
-
-/**
- * @brief The MQTT client identifier used in this example.  Each client identifier
- * must be unique so edit as required to ensure no two clients connecting to the
- * same broker use the same client identifier.
- *
- * @note Appending __TIME__ to the client id string will reduce the possibility of a
- * client id collision in the broker. Note that the appended time is the compilation
- * time. This client id can cause collision, if more than one instance of the same
- * binary is used at the same time to connect to the broker.
- */
-#ifndef democonfigCLIENT_IDENTIFIER
-#if (ENABLE_FLEET_PROVISIONING_DEMO == 1)
-    #define democonfigCLIENT_IDENTIFIER    "client"democonfigFP_DEMO_ID
-#else
-    #define democonfigCLIENT_IDENTIFIER    clientcredentialIOT_THING_NAME
-#endif
-#endif
-
-/**
- * @brief Details of the MQTT broker to connect to.
- *
- * This is the Claim's Rest API Endpoint for AWS IoT.
- *
- * @note Your AWS IoT Core endpoint can be found in the AWS IoT console under
- * Settings/Custom Endpoint, or using the describe-endpoint API.
- *
- */
-#define democonfigMQTT_BROKER_ENDPOINT     clientcredentialMQTT_BROKER_ENDPOINT
-
-/**
- * @brief AWS IoT MQTT broker port number.
- *
- * In general, port 8883 is for secured MQTT connections.
- *
- * @note Port 443 requires use of the ALPN TLS extension with the ALPN protocol
- * name. When using port 8883, ALPN is not required.
- */
-#define democonfigMQTT_BROKER_PORT    ( clientcredentialMQTT_BROKER_PORT )
-
-/**
- * @brief Name of the provisioning template to use for the RegisterThing
- * portion of the Fleet Provisioning workflow.
- *
- * For information about provisioning templates, see the following AWS documentation:
- * https://docs.aws.amazon.com/iot/latest/developerguide/provision-template.html#fleet-provision-template
- *
- * The example template used for this demo is available in the
- * example_demo_template.json file in the DemoSetup directory. In the example,
- * replace <provisioned-thing-policy> with the policy provisioned devices
- * should have.  The demo template uses Fn::Join to construct the Thing name by
- * concatenating fp_demo_ and the serial number sent by the demo.
- *
- * @note The provisioning template MUST be created in AWS IoT before running the
- * demo.
- *
- * @note If you followed the manual setup steps on https://freertos.org/iot-fleet-provisioning/demo.html,
- * the provisioning template name is "FleetProvisioningDemoTemplate".
- * However, if you used CloudFormation to set up the demo, the template name is "CF_FleetProvisioningDemoTemplate"
- */
- #define democonfigPROVISIONING_TEMPLATE_NAME    "...insert here..."
-
-/**
- * @brief Subject name to use when creating the certificate signing request (CSR)
- * for provisioning the demo client with using the Fleet Provisioning
- * CreateCertificateFromCsr APIs.
- *
- * This is passed to MbedTLS; see https://tls.mbed.org/api/x509__csr_8h.html#a954eae166b125cea2115b7db8c896e90
- */
-#ifndef democonfigCSR_SUBJECT_NAME
-    #define democonfigCSR_SUBJECT_NAME    "CN="democonfigFP_DEMO_ID
-#endif
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_STACKSIZE        configMINIMAL_STACK_SIZE * 3
-
-/**
- * @brief Set the stack size of the main demo task.
- *
- * In the Windows port, this stack only holds a structure. The actual
- * stack is created by an operating system thread.
- */
-#define democonfigDEMO_TASK_PRIORITY    ( tskIDLE_PRIORITY + 1 )
-
-#define democonfigNETWORK_BUFFER_SIZE    ( configMINIMAL_STACK_SIZE * 3 )
-
-#include "core_mqtt.h" /* Include coreMQTT header for MQTT_LIBRARY_VERSION macro. */
-#define democonfigMQTT_LIB    "core-mqtt@"MQTT_LIBRARY_VERSION
-
-#define democonfigDISABLE_SNI       ( pdFALSE )
-
-/**
- * @brief ALPN (Application-Layer Protocol Negotiation) protocol name for AWS IoT MQTT.
- *
- * This will be used if democonfigMQTT_BROKER_PORT is configured as 443 for the AWS IoT MQTT broker.
- * Please see more details about the ALPN protocol for AWS IoT MQTT endpoint
- * in the link below.
- * https://aws.amazon.com/blogs/iot/mqtt-with-tls-client-authentication-on-port-443-why-it-is-useful-and-how-it-works/
- */
-#define AWS_IOT_MQTT_ALPN           "\x0ex-amzn-mqtt-ca"
-
-/**
- * @brief This is the ALPN (Application-Layer Protocol Negotiation) string
- * required by AWS IoT for password-based authentication using TCP port 443.
- */
-#define AWS_IOT_CUSTOM_AUTH_ALPN    "\x04mqtt"
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-/**
- * @brief The name of the operating system that the application is running on.
- * The current value is given as an example. Please update for your specific
- * operating system.
- */
-#define democonfigOS_NAME       "FreeRTOS"
-
-/**
- * @brief The version of the operating system that the application is running
- * on. The current value is given as an example. Please update for your specific
- * operating system version.
- */
-#define democonfigOS_VERSION    "V10.4.3"
-
-/**
- * @brief The name of the hardware platform the application is running on. The
- * current value is given as an example. Please update for your specific
- * hardware platform.
- */
-#define democonfigHARDWARE_PLATFORM_NAME    "CK-RX65N"
-
-/**
- * @brief The MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING                                 \
-    "?SDK=" democonfigOS_NAME "&Version=" democonfigOS_VERSION \
-    "&MQTTLib=" democonfigMQTT_LIB
-
-/**
- * @brief The length of the MQTT metrics string expected by AWS IoT.
- */
-#define AWS_IOT_METRICS_STRING_LENGTH    ( ( uint16_t ) ( sizeof( AWS_IOT_METRICS_STRING ) - 1 ) )
-
-
-#ifdef democonfigCLIENT_USERNAME
-
-/**
- * @brief Append the username with the metrics string if #democonfigCLIENT_USERNAME is defined.
- *
- * This is to support both metrics reporting and username/password based client
- * authentication by AWS IoT.
- */
-#define CLIENT_USERNAME_WITH_METRICS    democonfigCLIENT_USERNAME AWS_IOT_METRICS_STRING
-#endif
-
-/**
- * @brief Flag to enable or disable provisioning mode for the demo.
- * Enabling the flags starts a CLI task, so that user can perform provisioning of the device through
- * a serial terminal. Provisioning involves running commands to fetch or set the PKI and configuration
- * information for the device to connect to broker and perform OTA updates. Disabling the flag results
- * in disabling the CLI task and execution of the demo tasks in normal device operation mode.
- */
-#define appmainPROVISIONING_MODE                  ( 1 )
-
-/**
- * @brief Certificate used for validating code signing signatures in the OTA PAL.
- */
-#ifndef otapalconfigCODE_SIGNING_CERTIFICATE
-    #define otapalconfigCODE_SIGNING_CERTIFICATE    "Insert code signing certificate..."
-#endif
-
-/**
- * @brief Major version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MAJOR
-    #define APP_VERSION_MAJOR    0
-#endif
-
-/**
- * @brief Minor version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_MINOR
-    #define APP_VERSION_MINOR    9
-#endif
-
-/**
- * @brief Build version of the firmware.
- *
- * This is used in the OTA demo to set the appFirmwareVersion variable that is
- * declared in the ota_appversion32.h file in the OTA library.
- */
-#ifndef APP_VERSION_BUILD
-    #define APP_VERSION_BUILD    2
-#endif
-
-/**
- * @brief Server's root CA certificate.
- *
- * This certificate is used to identify the AWS IoT server and is publicly
- * available. Refer to the AWS documentation available in the link below for
- * information about the Server Root CAs.
- * https://docs.aws.amazon.com/iot/latest/developerguide/server-authentication.html#server-authentication-certs
- *
- * @note The TI C3220 Launchpad board requires that the Root CA have its
- * certificate self-signed. As mentioned in the above link, the Amazon Root CAs
- * are cross-signed by the Starfield Root CA. Thus, ONLY the Starfield Root CA
- * can be used to connect to the ATS endpoints on AWS IoT for the TI board.
- *
- * @note This certificate should be PEM-encoded.
- *
- * Must include the PEM header and footer:
- * "-----BEGIN CERTIFICATE-----\n"\
- * "...base64 data...\n"\
- * "-----END CERTIFICATE-----\n"
- *
- */
-#define democonfigROOT_CA_PEM                   tlsSTARFIELD_ROOT_CERTIFICATE_PEM
-
-/**
- * @brief The length of the queue used to hold commands for the agent.
- */
-#define MQTT_AGENT_COMMAND_QUEUE_LENGTH         ( 25 )
-
-/**
- * @brief Dimensions the buffer used to serialise and deserialise MQTT packets.
- * @note Specified in bytes.  Must be large enough to hold the maximum
- * anticipated MQTT payload.
- */
-#define MQTT_AGENT_NETWORK_BUFFER_SIZE          ( 5000 )
-
-#define MQTT_COMMAND_CONTEXTS_POOL_SIZE              ( 10 )
-
-#endif /* DEMO_CONFIG_H */
diff --git a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/fleet_provisioning_config.h b/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/fleet_provisioning_config.h
deleted file mode 100644
index 68b85d66..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/fleet_provisioning_config.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * AWS IoT Fleet Provisioning v1.1.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file fleet_provisioning_config.h
- * @brief Custom config values for the AWS IoT Fleet Provisioning Library.
- */
-
-#ifndef FLEET_PROVISIONING_CONFIG_H_
-#define FLEET_PROVISIONING_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Include logging header files and define logging macros in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
- * the logging configuration for Fleet Provisioning.
- * 3. Include the header file "logging_stack.h".
- */
-
-#include "logging_levels.h"
-
-/* Logging configuration for the Fleet Provisioning library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME    "FleetProvisioning"
-#endif
-
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-/************ End of logging configuration ****************/
-
-#endif /* ifndef FLEET_PROVISIONING_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/rm_littlefs_flash_config.h b/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/rm_littlefs_flash_config.h
deleted file mode 100644
index 94207ffa..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/rm_littlefs_flash_config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/***********************************************************************************************************************
- * Copyright 2023 Renesas Electronics Corporation and/or its affiliates.  All Rights Reserved.
- *
- * This software and documentation are supplied by Renesas Electronics America Inc. and may only be used with products
- * of Renesas Electronics Corp. and its affiliates ("Renesas").  No other uses are authorized.  Renesas products are
- * sold pursuant to Renesas terms and conditions of sale.  Purchasers are solely responsible for the selection and use
- * of Renesas products and Renesas assumes no liability.  No license, express or implied, to any intellectual property
- * right is granted by Renesas. This software is protected under all applicable laws, including copyright laws. Renesas
- * reserves the right to change or discontinue this software and/or this documentation. THE SOFTWARE AND DOCUMENTATION
- * IS DELIVERED TO YOU "AS IS," AND RENESAS MAKES NO REPRESENTATIONS OR WARRANTIES, AND TO THE FULLEST EXTENT
- * PERMISSIBLE UNDER APPLICABLE LAW, DISCLAIMS ALL WARRANTIES, WHETHER EXPLICITLY OR IMPLICITLY, INCLUDING WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT, WITH RESPECT TO THE SOFTWARE OR
- * DOCUMENTATION.  RENESAS SHALL HAVE NO LIABILITY ARISING OUT OF ANY SECURITY VULNERABILITY OR BREACH.  TO THE MAXIMUM
- * EXTENT PERMITTED BY LAW, IN NO EVENT WILL RENESAS BE LIABLE TO YOU IN CONNECTION WITH THE SOFTWARE OR DOCUMENTATION
- * (OR ANY PERSON OR ENTITY CLAIMING RIGHTS DERIVED FROM YOU) FOR ANY LOSS, DAMAGES, OR CLAIMS WHATSOEVER, INCLUDING,
- * WITHOUT LIMITATION, ANY DIRECT, CONSEQUENTIAL, SPECIAL, INDIRECT, PUNITIVE, OR INCIDENTAL DAMAGES; ANY LOST PROFITS,
- * OTHER ECONOMIC DAMAGE, PROPERTY DAMAGE, OR PERSONAL INJURY; AND EVEN IF RENESAS HAS BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH LOSS, DAMAGES, CLAIMS OR COSTS.
- **********************************************************************************************************************/
-
-#ifndef FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-#define FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_
-
-/***********************************************************************************************************************
- * Includes
- **********************************************************************************************************************/
-#include "rm_littlefs_df_rx65n.h"
-
-#define LFS_FLASH_READ_SIZE				(1)
-#define LFS_FLASH_PROGRAM_SIZE			(4)
-#define LFS_FLASH_BLOCK_SIZE			(128)
-#define LFS_FLASH_BLOCK_COUNT			(70)
-#define RM_LITTLEFS_FLASH_DATA_START	FLASH_DF_BLOCK_0_MACRO
-
-#if LFS_FLASH_BLOCK_SIZE*LFS_FLASH_BLOCK_COUNT + (RM_LITTLEFS_FLASH_DATA_START - FLASH_DF_BLOCK_0_MACRO) > BSP_DATA_FLASH_SIZE_BYTES
-#error "Too many blocks"
-#endif
-
-#endif /* FRTOS_CONFIG_RM_LITTLEFS_FLASH_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/shadow_config.h b/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/shadow_config.h
deleted file mode 100644
index aa948c12..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/shadow_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * AWS IoT Device Shadow v1.3.0
- * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file shadow_config.h
- * @brief This represents the custom values for the configuration macros
- * for the Shadow library.
- */
-
-#ifndef SHADOW_CONFIG_H_
-#define SHADOW_CONFIG_H_
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SHADOW"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-#endif /* ifndef SHADOW_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/sigv4_config.h b/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/sigv4_config.h
deleted file mode 100644
index ba277a79..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/sigv4_config.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * SigV4 Library v1.2.0
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
- * Modifications Copyright (C) 2023 Renesas Electronics Corporation. or its affiliates.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file sigv4_config.h
- * @brief The custom values for configuration macros used by the SigV4 Library.
- */
-
-#ifndef SIGV4_CONFIG_H_
-#define SIGV4_CONFIG_H_
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    extern "C" {
-#endif
-/* *INDENT-ON* */
-
-/**************************************************/
-/******* DO NOT CHANGE the following order ********/
-/**************************************************/
-
-/* Logging related header files are required to be included in the following order:
- * 1. Include the header file "logging_levels.h".
- * 2. Define LIBRARY_LOG_NAME and  LIBRARY_LOG_LEVEL.
- * 3. Include the header file "logging_stack.h".
- */
-
-/* Include header that defines log levels. */
-#include "logging_levels.h"
-
-/* Configure name and log level for the Shadow library. */
-#ifndef LIBRARY_LOG_NAME
-    #define LIBRARY_LOG_NAME     "SIGV4"
-#endif
-#ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_INFO
-#endif
-
-#include "logging_stack.h"
-
-/************ End of logging configuration ****************/
-
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-    }
-#endif
-/* *INDENT-ON* */
-
-#endif /* ifndef SIGV4_CONFIG_H_ */
diff --git a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/user_tcp_hook_config.h b/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/user_tcp_hook_config.h
deleted file mode 100644
index abe7b80b..00000000
--- a/Configuration/samples/pubsub/ck-rx65n/wifi/src/frtos_config/user_tcp_hook_config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**********************************************************************************************************************
- * Copyright (C) 2023 Renesas Electronics Corporation. All rights reserved.
- *
- * DISCLAIMER
- * This software is supplied by Renesas Electronics Corporation and is only intended for use with Renesas products. No
- * other uses are authorized. This software is owned by Renesas Electronics Corporation and is protected under all
- * applicable laws, including copyright laws.
- * THIS SOFTWARE IS PROVIDED "AS IS" AND RENESAS MAKES NO WARRANTIES REGARDING
- * THIS SOFTWARE, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ALL SUCH WARRANTIES ARE EXPRESSLY DISCLAIMED. TO THE MAXIMUM
- * EXTENT PERMITTED NOT PROHIBITED BY LAW, NEITHER RENESAS ELECTRONICS CORPORATION NOR ANY OF ITS AFFILIATED COMPANIES
- * SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES FOR ANY REASON RELATED TO THIS
- * SOFTWARE, EVEN IF RENESAS OR ITS AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * Renesas reserves the right, without notice, to make changes to this software and to discontinue the availability of
- * this software. By using this software, you agree to the additional terms and conditions found by accessing the
- * following link:
- * http://www.renesas.com/disclaimer
- *********************************************************************************************************************/
-
-#ifndef FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_
-#define FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_
-
-/* The limit of number for WIFI_ERR_MODULE_COM when it comes continuously.
- * If counter is over than this limit, hook the reset */
-#define USER_COMM_ERROR_TRIES		3
-
-/*Connection retry limit*/
-#define USER_RECONNECT_TRIES 		3
-
-/*Socket closing retry limit*/
-#define USER_CLOSE_SOCKET_TRIES		3
-
-/*Enable SocketErrorHook*/
-#define USER_TCP_HOOK_ENABLED   	1 /* Default */
-
-#endif /* FRTOS_CONFIG_USER_TCP_HOOK_CONFIG_H_ */