diff --git a/components/esp32c3/ld/esp32c3.project.ld.in b/components/esp32c3/ld/esp32c3.project.ld.in
index aa74835ef8..fdf6be2881 100644
--- a/components/esp32c3/ld/esp32c3.project.ld.in
+++ b/components/esp32c3/ld/esp32c3.project.ld.in
@@ -280,7 +280,7 @@ SECTIONS
     . = SIZEOF(.flash.text);
     . = ALIGN(0x10000) + 0x20;
     _rodata_reserved_start = .;
-  } > drom0_0_seg
+  } > default_rodata_seg
 
   /* When modifying the alignment, don't forget to update tls_section_alignment in pxPortInitialiseStack */
   .flash.rodata : ALIGN(0x10)
diff --git a/components/esp32s3/ld/esp32s3.project.ld.in b/components/esp32s3/ld/esp32s3.project.ld.in
index 81f49f1284..b1d19cae40 100644
--- a/components/esp32s3/ld/esp32s3.project.ld.in
+++ b/components/esp32s3/ld/esp32s3.project.ld.in
@@ -311,7 +311,7 @@ SECTIONS
     . = SIZEOF(.flash.text);
     . = ALIGN(0x10000) + 0x20;
     _rodata_reserved_start = .;
-  } > drom0_0_seg
+  } > default_rodata_seg
 
   /* When modifying the alignment, don't forget to update tls_section_alignment in pxPortInitialiseStack */
   .flash.rodata : ALIGN(0x10)
diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
index d2bb9fdd88..2c284c27bf 100644
--- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
+++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
@@ -120,7 +120,7 @@ PROVIDE( esp_rom_spiflash_config_readmode = 0x40000154 );
 PROVIDE( esp_rom_spiflash_read_status = 0x40000158 );
 PROVIDE( esp_rom_spiflash_read_statushigh = 0x4000015c );
 PROVIDE( esp_rom_spiflash_write_status = 0x40000160 );
-PROVIDE( spi_flash_attach = 0x40000164 );
+PROVIDE( esp_rom_spiflash_attach = 0x40000164 );
 PROVIDE( spi_flash_get_chip_size = 0x40000168 );
 PROVIDE( spi_flash_guard_set = 0x4000016c );
 PROVIDE( spi_flash_guard_get = 0x40000170 );
diff --git a/components/esp_rom/esp32s2/ld/esp32s2.rom.ld b/components/esp_rom/esp32s2/ld/esp32s2.rom.ld
index 8781a9c8c3..20a6d3c2a9 100644
--- a/components/esp_rom/esp32s2/ld/esp32s2.rom.ld
+++ b/components/esp_rom/esp32s2/ld/esp32s2.rom.ld
@@ -611,7 +611,7 @@ PROVIDE ( SPIEraseArea = 0x40017470 );
 PROVIDE ( SPIEraseBlock = 0x4001710c );
 PROVIDE ( SPIEraseChip = 0x400170ec );
 PROVIDE ( SPIEraseSector = 0x4001716c );
-PROVIDE ( spi_flash_attach = 0x40017004 );
+PROVIDE ( esp_rom_spiflash_attach = 0x40017004 );
 PROVIDE ( spi_flash_boot_attach = 0x40016fc0 );
 PROVIDE ( spi_flash_check_suspend_cb = 0x3ffffd58 );
 PROVIDE ( SPI_flashchip_data = 0x3ffffd3c );
diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
index 8bf3c8589e..6fe65f54fb 100644
--- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
+++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
@@ -1955,7 +1955,7 @@ PROVIDE ( spi_cache_mode_switch = 0x4004d9f0 );
 PROVIDE ( spi_common_set_dummy_output = 0x4004dcac );
 PROVIDE ( spi_common_set_flash_cs_timing = 0x4004dbf8 );
 PROVIDE ( spi_dummy_len_fix = 0x4004cb30 );
-PROVIDE ( spi_flash_attach = 0x4004e100 );
+PROVIDE ( esp_rom_spiflash_attach = 0x4004e100 );
 PROVIDE ( spi_flash_boot_attach = 0x4004e0a0 );
 PROVIDE ( spi_flash_chip_gd_get_io_mode = 0x4004f248 );
 PROVIDE ( spi_flash_chip_gd_probe = 0x4004f1d8 );
diff --git a/components/esp_system/port/cpu_start.c b/components/esp_system/port/cpu_start.c
index e14cef2c4e..9461f673f6 100644
--- a/components/esp_system/port/cpu_start.c
+++ b/components/esp_system/port/cpu_start.c
@@ -85,11 +85,20 @@
 
 #include "bootloader_mem.h"
 
-#if CONFIG_IDF_TARGET_ESP32
 #if CONFIG_APP_BUILD_TYPE_ELF_RAM
+#if CONFIG_IDF_TARGET_ESP32
 #include "esp32/rom/spi_flash.h"
+#endif // CONFIG_IDF_TARGET_ESP32
+#if CONFIG_IDF_TARGET_ESP32S2
+#include "esp32s2/rom/spi_flash.h"
+#endif // CONFIG_IDF_TARGET_ESP32S2
+#if CONFIG_IDF_TARGET_ESP32S3
+#include "esp32s3/rom/spi_flash.h"
+#endif // CONFIG_IDF_TARGET_ESP32S3
+#if CONFIG_IDF_TARGET_ESP32C3
+#include "esp32c3/rom/spi_flash.h"
+#endif // CONFIG_IDF_TARGET_ESP32C3
 #endif // CONFIG_APP_BUILD_TYPE_ELF_RAM
-#endif
 
 #include "esp_private/startup_internal.h"
 #include "esp_private/system_internal.h"
diff --git a/tools/ci/python_packages/ttfw_idf/CIScanTests.py b/tools/ci/python_packages/ttfw_idf/CIScanTests.py
index 91f11b3ee7..ed66fc88ad 100644
--- a/tools/ci/python_packages/ttfw_idf/CIScanTests.py
+++ b/tools/ci/python_packages/ttfw_idf/CIScanTests.py
@@ -126,34 +126,33 @@ def main():
     scan_info_dict = defaultdict(dict)
     # store the test cases dir, exclude these folders when scan for standalone apps
     default_exclude = args.exclude if args.exclude else []
-    exclude_apps = deepcopy(default_exclude)
 
     build_system = args.build_system.lower()
     build_system_class = BUILD_SYSTEMS[build_system]
 
-    if build_test_case_apps:
-        for target in SUPPORTED_TARGETS:
-            target_dict = scan_info_dict[target]
-            test_case_apps = target_dict['test_case_apps'] = set()
+    for target in SUPPORTED_TARGETS:
+        exclude_apps = deepcopy(default_exclude)
+
+        if build_test_case_apps:
+            scan_info_dict[target]['test_case_apps'] = set()
             for case in test_cases:
                 app_dir = case.case_info['app_dir']
                 app_target = case.case_info['target']
                 if app_target.lower() != target.lower():
                     continue
-                test_case_apps.update(find_apps(build_system_class, app_dir, True, default_exclude, target.lower()))
-                exclude_apps.append(app_dir)
-    else:
-        for target in SUPPORTED_TARGETS:
+                _apps = find_apps(build_system_class, app_dir, True, exclude_apps, target.lower())
+                if _apps:
+                    scan_info_dict[target]['test_case_apps'].update(_apps)
+                    exclude_apps.append(app_dir)
+        else:
             scan_info_dict[target]['test_case_apps'] = set()
 
-    if build_standalone_apps:
-        for target in SUPPORTED_TARGETS:
-            target_dict = scan_info_dict[target]
-            standalone_apps = target_dict['standalone_apps'] = set()
+        if build_standalone_apps:
+            scan_info_dict[target]['standalone_apps'] = set()
             for path in paths:
-                standalone_apps.update(find_apps(build_system_class, path, True, exclude_apps, target.lower()))
-    else:
-        for target in SUPPORTED_TARGETS:
+                scan_info_dict[target]['standalone_apps'].update(
+                    find_apps(build_system_class, path, True, exclude_apps, target.lower()))
+        else:
             scan_info_dict[target]['standalone_apps'] = set()
 
     test_case_apps_preserve_default = True if build_system == 'cmake' else False
diff --git a/tools/test_apps/protocols/pppos/README.md b/tools/test_apps/protocols/pppos/README.md
index 6aed00816e..ee208f221d 100644
--- a/tools/test_apps/protocols/pppos/README.md
+++ b/tools/test_apps/protocols/pppos/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 | ESP32-S2 |
+| ----------------- | ----- | -------- |
+
 # PPP over Serial test
 
 Testing connection of PPP client (ESP) to PPP server (raspberry pi)
diff --git a/tools/test_apps/system/memprot/README.md b/tools/test_apps/system/memprot/README.md
new file mode 100644
index 0000000000..5d650cc9d3
--- /dev/null
+++ b/tools/test_apps/system/memprot/README.md
@@ -0,0 +1,2 @@
+| Supported Targets | ESP32-S2 |
+| ----------------- | -------- |
diff --git a/tools/test_apps/system/monitor_ide_integration/README.md b/tools/test_apps/system/monitor_ide_integration/README.md
new file mode 100644
index 0000000000..ac8bb22c88
--- /dev/null
+++ b/tools/test_apps/system/monitor_ide_integration/README.md
@@ -0,0 +1,2 @@
+| Supported Targets | ESP32 | ESP32-S2 |
+| ----------------- | ----- | -------- |
diff --git a/tools/test_apps/system/panic/README.md b/tools/test_apps/system/panic/README.md
new file mode 100644
index 0000000000..ac8bb22c88
--- /dev/null
+++ b/tools/test_apps/system/panic/README.md
@@ -0,0 +1,2 @@
+| Supported Targets | ESP32 | ESP32-S2 |
+| ----------------- | ----- | -------- |