diff --git a/docs/en/esp32s2.rst b/docs/en/esp32s2.rst
index c0e350cfba6..daab93f5dca 100644
--- a/docs/en/esp32s2.rst
+++ b/docs/en/esp32s2.rst
@@ -35,7 +35,7 @@ Building a project for ESP32-S2
 
    For some examples this is because required hardware is not included in ESP32-S2 so it cannot be supported. For some examples this is because the example has not yet been updated for ESP32-S2.
 
-   If building an example, please check the example CMakeLists.txt file for the clause ``SUPPORTED_TARGETS esp32``. If this is present, the example won't work on ESP32-S2.
+   If building an example, please check the README file for the ``Supported Targets`` table. If no ESP32-S2 listed, the example won't work on ESP32-S2.
 
 .. highlight:: bash
 
diff --git a/docs/en/get-started/index.rst b/docs/en/get-started/index.rst
index eba6fb66681..d31cb984dad 100644
--- a/docs/en/get-started/index.rst
+++ b/docs/en/get-started/index.rst
@@ -588,13 +588,7 @@ Now you are ready to try some other :idf:`examples`, or go straight to developin
 
     Some of examples do not support {IDF_TARGET_NAME} because required hardware is not included in {IDF_TARGET_NAME} so it cannot be supported.
 
-    .. only:: esp32
-
-        If building an example, please check the example CMakeLists.txt file for the clause ``SUPPORTED_TARGETS esp32``. If this is present including ``esp32`` target, or ``SUPPORTED_TARGETS`` does not exist at all, the example will work on {IDF_TARGET_NAME}.
-
-    .. only:: esp32s2
-
-        If building an example, please check the example CMakeLists.txt file for the clause ``SUPPORTED_TARGETS esp32s2``. If this is present including ``esp32s2`` target, or ``SUPPORTED_TARGETS`` does not exist at all, the example will work on {IDF_TARGET_NAME}.
+    If building an example, please check the README file for the ``Supported Targets`` table. If this is present including {IDF_TARGET_NAME} target, or the table does not exist at all, the example will work on {IDF_TARGET_NAME}.
 
 
 Updating ESP-IDF
diff --git a/examples/bluetooth/bluedroid/ble/ble_ancs/CMakeLists.txt b/examples/bluetooth/bluedroid/ble/ble_ancs/CMakeLists.txt
index ecfe4e5ad89..84faba94ed1 100644
--- a/examples/bluetooth/bluedroid/ble/ble_ancs/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/ble/ble_ancs/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ble_ancs)
diff --git a/examples/bluetooth/bluedroid/ble/ble_ancs/README.md b/examples/bluetooth/bluedroid/ble/ble_ancs/README.md
index 06a7f4625e2..270ecc8583f 100644
--- a/examples/bluetooth/bluedroid/ble/ble_ancs/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_ancs/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP-IDF BLE ANCS Example
 ==========================
 
diff --git a/examples/bluetooth/bluedroid/ble/ble_compatibility_test/CMakeLists.txt b/examples/bluetooth/bluedroid/ble/ble_compatibility_test/CMakeLists.txt
index e4a204ce562..a1bc6f47bab 100644
--- a/examples/bluetooth/bluedroid/ble/ble_compatibility_test/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/ble/ble_compatibility_test/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ble_compatibility_test)
diff --git a/examples/bluetooth/bluedroid/ble/ble_compatibility_test/README.md b/examples/bluetooth/bluedroid/ble/ble_compatibility_test/README.md
index 3102fc5e57a..091476ddb64 100644
--- a/examples/bluetooth/bluedroid/ble/ble_compatibility_test/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_compatibility_test/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP-IDF BLE Compatibility Test Example
 =======================================
 
diff --git a/examples/bluetooth/bluedroid/ble/ble_eddystone/CMakeLists.txt b/examples/bluetooth/bluedroid/ble/ble_eddystone/CMakeLists.txt
index 2961c2927fe..9c5943ef06e 100644
--- a/examples/bluetooth/bluedroid/ble/ble_eddystone/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/ble/ble_eddystone/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ble_eddystone_demo)
diff --git a/examples/bluetooth/bluedroid/ble/ble_eddystone/README.md b/examples/bluetooth/bluedroid/ble/ble_eddystone/README.md
index a379b9cf650..c4a54ed4f01 100644
--- a/examples/bluetooth/bluedroid/ble/ble_eddystone/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_eddystone/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP-IDF Eddystone demo
 ========================
 This example demonstrates Eddystone-compatible BLE scanning of eddystone frame,including UID,URL.
diff --git a/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/CMakeLists.txt b/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/CMakeLists.txt
index 0a407a5df4e..f8c948007c0 100644
--- a/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(hidd_demos)
diff --git a/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/README.md b/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/README.md
index 9510f17c53f..433e89cb0c6 100644
--- a/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP-IDF BLE HID device demo
 ========================
 This example Implemented BLE HID device profile related functions, in which the HID device has 
diff --git a/examples/bluetooth/bluedroid/ble/ble_ibeacon/CMakeLists.txt b/examples/bluetooth/bluedroid/ble/ble_ibeacon/CMakeLists.txt
index 2f80f9c0241..dce22425d5e 100644
--- a/examples/bluetooth/bluedroid/ble/ble_ibeacon/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/ble/ble_ibeacon/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ble_ibeacon_demo)
diff --git a/examples/bluetooth/bluedroid/ble/ble_ibeacon/README.md b/examples/bluetooth/bluedroid/ble/ble_ibeacon/README.md
index 04b09711b1e..2fc16a49cdd 100644
--- a/examples/bluetooth/bluedroid/ble/ble_ibeacon/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_ibeacon/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # ESP-IDF iBeacon demo
 
 From welcoming people as they arrive at a sporting event to providing information about a nearby museum exhibit, iBeacon opens a new world of possibilities for location awareness, and countless opportunities for interactivity between iOS devices and iBeacon hardware.
diff --git a/examples/bluetooth/bluedroid/ble/ble_spp_client/CMakeLists.txt b/examples/bluetooth/bluedroid/ble/ble_spp_client/CMakeLists.txt
index aa98c946721..301d8408e78 100644
--- a/examples/bluetooth/bluedroid/ble/ble_spp_client/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/ble/ble_spp_client/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(spp_client_demo)
diff --git a/examples/bluetooth/bluedroid/ble/ble_spp_client/README.md b/examples/bluetooth/bluedroid/ble/ble_spp_client/README.md
index a3847312669..bb9bf146366 100644
--- a/examples/bluetooth/bluedroid/ble/ble_spp_client/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_spp_client/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # ESP-IDF SPP GATT CLIENT demo
 
   In Bluetooth classic (BR/EDR) systems, a Serial Port Profile (SPP) is an adopted profile defined by the Bluetooth Special Interest Group (SIG) used to emulate a serial port connection over a Bluetooth wireless connection. For BLE systems, an adopted SPP profile over BLE is not defined, thus emulation of a serial port must be implemented as a vendor-specific custom profile.
diff --git a/examples/bluetooth/bluedroid/ble/ble_spp_server/CMakeLists.txt b/examples/bluetooth/bluedroid/ble/ble_spp_server/CMakeLists.txt
index 7e461f590be..b4dcebe6afe 100644
--- a/examples/bluetooth/bluedroid/ble/ble_spp_server/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/ble/ble_spp_server/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ble_spp_server_demo)
diff --git a/examples/bluetooth/bluedroid/ble/ble_spp_server/README.md b/examples/bluetooth/bluedroid/ble/ble_spp_server/README.md
index ab46f531ba3..d9d8b7fb170 100644
--- a/examples/bluetooth/bluedroid/ble/ble_spp_server/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_spp_server/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ## ESP-IDF GATT SERVER SPP demo
 
 For description of this application please refer to [ESP-IDF GATT CLIENT SPP demo](../ble_spp_client/README.md)
diff --git a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/CMakeLists.txt b/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/CMakeLists.txt
index 41add49707a..3a592ef4f0b 100644
--- a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/CMakeLists.txt
@@ -2,6 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(throughput_client_demo)
diff --git a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/README.md b/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/README.md
index d38c4ca5edd..bd8f61ae032 100644
--- a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP-IDF BLE throughput GATT CLIENT demo
 ========================
 
diff --git a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/CMakeLists.txt b/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/CMakeLists.txt
index ddbd1b498ac..adcc12d731f 100644
--- a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/CMakeLists.txt
@@ -2,6 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(throughput_server_demo)
diff --git a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/README.md b/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/README.md
index 1dc21211c8a..8d43423f46d 100644
--- a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/README.md
+++ b/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP-IDF BLE throughput GATT SERVER demo
 ========================
 
diff --git a/examples/bluetooth/bluedroid/ble/blufi/CMakeLists.txt b/examples/bluetooth/bluedroid/ble/blufi/CMakeLists.txt
index 850040d3aa5..b85d34bbbfc 100644
--- a/examples/bluetooth/bluedroid/ble/blufi/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/ble/blufi/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(blufi_demo)
diff --git a/examples/bluetooth/bluedroid/ble/blufi/README.md b/examples/bluetooth/bluedroid/ble/blufi/README.md
index c8246023ae2..7c1430175ad 100644
--- a/examples/bluetooth/bluedroid/ble/blufi/README.md
+++ b/examples/bluetooth/bluedroid/ble/blufi/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP-IDF Blufi demo
 =======================
 
diff --git a/examples/bluetooth/bluedroid/ble/gatt_client/CMakeLists.txt b/examples/bluetooth/bluedroid/ble/gatt_client/CMakeLists.txt
index ea402345d52..d32eb6bee14 100644
--- a/examples/bluetooth/bluedroid/ble/gatt_client/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/ble/gatt_client/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(gatt_client_demo)
diff --git a/examples/bluetooth/bluedroid/ble/gatt_client/README.md b/examples/bluetooth/bluedroid/ble/gatt_client/README.md
index cacdbaf76fd..309feff4c03 100644
--- a/examples/bluetooth/bluedroid/ble/gatt_client/README.md
+++ b/examples/bluetooth/bluedroid/ble/gatt_client/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP-IDF Gatt Client Demo
 ========================
 
diff --git a/examples/bluetooth/bluedroid/ble/gatt_security_client/CMakeLists.txt b/examples/bluetooth/bluedroid/ble/gatt_security_client/CMakeLists.txt
index c61323685fd..8f468d76448 100644
--- a/examples/bluetooth/bluedroid/ble/gatt_security_client/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/ble/gatt_security_client/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(sec_gattc_demo)
diff --git a/examples/bluetooth/bluedroid/ble/gatt_security_client/README.md b/examples/bluetooth/bluedroid/ble/gatt_security_client/README.md
index 07bd019c39e..7f05ed4018d 100644
--- a/examples/bluetooth/bluedroid/ble/gatt_security_client/README.md
+++ b/examples/bluetooth/bluedroid/ble/gatt_security_client/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP-IDF Gatt Security Client Demo
 ========================
 
diff --git a/examples/bluetooth/bluedroid/ble/gatt_security_server/CMakeLists.txt b/examples/bluetooth/bluedroid/ble/gatt_security_server/CMakeLists.txt
index 1406a6bb204..8e9d61ff9fa 100644
--- a/examples/bluetooth/bluedroid/ble/gatt_security_server/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/ble/gatt_security_server/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(sec_gatts_demo)
diff --git a/examples/bluetooth/bluedroid/ble/gatt_security_server/README.md b/examples/bluetooth/bluedroid/ble/gatt_security_server/README.md
index 61067098d38..516b697dd28 100644
--- a/examples/bluetooth/bluedroid/ble/gatt_security_server/README.md
+++ b/examples/bluetooth/bluedroid/ble/gatt_security_server/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP-IDF Gatt Security Server Demo
 ========================
 
diff --git a/examples/bluetooth/bluedroid/ble/gatt_server/CMakeLists.txt b/examples/bluetooth/bluedroid/ble/gatt_server/CMakeLists.txt
index 352a6e6af1f..fb1760c1efb 100644
--- a/examples/bluetooth/bluedroid/ble/gatt_server/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/ble/gatt_server/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(gatt_server_demos)
diff --git a/examples/bluetooth/bluedroid/ble/gatt_server/README.md b/examples/bluetooth/bluedroid/ble/gatt_server/README.md
index 5bda20a975c..3a677eda0b6 100644
--- a/examples/bluetooth/bluedroid/ble/gatt_server/README.md
+++ b/examples/bluetooth/bluedroid/ble/gatt_server/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP-IDF Gatt Server Demo
 ========================
 
diff --git a/examples/bluetooth/bluedroid/ble/gatt_server_service_table/CMakeLists.txt b/examples/bluetooth/bluedroid/ble/gatt_server_service_table/CMakeLists.txt
index 4ac44203849..d6dc6a416be 100644
--- a/examples/bluetooth/bluedroid/ble/gatt_server_service_table/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/ble/gatt_server_service_table/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(gatt_server_service_table_demo)
diff --git a/examples/bluetooth/bluedroid/ble/gatt_server_service_table/README.md b/examples/bluetooth/bluedroid/ble/gatt_server_service_table/README.md
index 0c086f0d583..7467053cb48 100644
--- a/examples/bluetooth/bluedroid/ble/gatt_server_service_table/README.md
+++ b/examples/bluetooth/bluedroid/ble/gatt_server_service_table/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP-IDF Gatt Server Service Table Demo
 ===============================================
 
diff --git a/examples/bluetooth/bluedroid/ble/gattc_multi_connect/CMakeLists.txt b/examples/bluetooth/bluedroid/ble/gattc_multi_connect/CMakeLists.txt
index c8f4695b4e4..6a7a6b3b8d0 100644
--- a/examples/bluetooth/bluedroid/ble/gattc_multi_connect/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/ble/gattc_multi_connect/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(gatt_multi_connect)
diff --git a/examples/bluetooth/bluedroid/ble/gattc_multi_connect/README.md b/examples/bluetooth/bluedroid/ble/gattc_multi_connect/README.md
index 11b1c7b78c0..5a65af9af3a 100644
--- a/examples/bluetooth/bluedroid/ble/gattc_multi_connect/README.md
+++ b/examples/bluetooth/bluedroid/ble/gattc_multi_connect/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP-IDF Gatt Client Multi Connection Demo
 ========================
 
diff --git a/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/CMakeLists.txt b/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/CMakeLists.txt
index 72fb9f87ddf..cc8e45027dd 100644
--- a/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/CMakeLists.txt
@@ -2,6 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(a2dp_sink)
diff --git a/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/README.md b/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/README.md
index cd57b59d7e7..5a6274be326 100644
--- a/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/README.md
+++ b/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP-IDF A2DP-SINK demo
 ======================
 
diff --git a/examples/bluetooth/bluedroid/classic_bt/a2dp_source/CMakeLists.txt b/examples/bluetooth/bluedroid/classic_bt/a2dp_source/CMakeLists.txt
index 55e21f6d43a..7c4e2152888 100644
--- a/examples/bluetooth/bluedroid/classic_bt/a2dp_source/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/classic_bt/a2dp_source/CMakeLists.txt
@@ -2,6 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(a2dp_source)
diff --git a/examples/bluetooth/bluedroid/classic_bt/a2dp_source/README.md b/examples/bluetooth/bluedroid/classic_bt/a2dp_source/README.md
index 05e0594dbc1..f5a61c5abb9 100644
--- a/examples/bluetooth/bluedroid/classic_bt/a2dp_source/README.md
+++ b/examples/bluetooth/bluedroid/classic_bt/a2dp_source/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP-IDF A2DP-SOURCE demo
 ========================
 
diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_discovery/CMakeLists.txt b/examples/bluetooth/bluedroid/classic_bt/bt_discovery/CMakeLists.txt
index 41e349588c5..6b73adc360d 100644
--- a/examples/bluetooth/bluedroid/classic_bt/bt_discovery/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/classic_bt/bt_discovery/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(bt_discovery)
diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_discovery/README.rst b/examples/bluetooth/bluedroid/classic_bt/bt_discovery/README.rst
index d5c857344cf..8c5e1f0cb0a 100644
--- a/examples/bluetooth/bluedroid/classic_bt/bt_discovery/README.rst
+++ b/examples/bluetooth/bluedroid/classic_bt/bt_discovery/README.rst
@@ -1,3 +1,7 @@
+================= =====
+Supported Targets ESP32
+================= =====
+
 ESP-IDF BT-INQUIRY demo
 ======================
 
diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_spp_acceptor/CMakeLists.txt b/examples/bluetooth/bluedroid/classic_bt/bt_spp_acceptor/CMakeLists.txt
index 9fa9ebddd52..8b26ee3f56b 100644
--- a/examples/bluetooth/bluedroid/classic_bt/bt_spp_acceptor/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/classic_bt/bt_spp_acceptor/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(bt_spp_acceptor_demo)
diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_spp_acceptor/README.rst b/examples/bluetooth/bluedroid/classic_bt/bt_spp_acceptor/README.rst
index d33e3536727..4fbc8830339 100644
--- a/examples/bluetooth/bluedroid/classic_bt/bt_spp_acceptor/README.rst
+++ b/examples/bluetooth/bluedroid/classic_bt/bt_spp_acceptor/README.rst
@@ -1,3 +1,7 @@
+================= =====
+Supported Targets ESP32
+================= =====
+
 ESP-IDF BT-SPP-ACCEPTOR demo
 ======================
 
diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_spp_initiator/CMakeLists.txt b/examples/bluetooth/bluedroid/classic_bt/bt_spp_initiator/CMakeLists.txt
index c3f95222a96..4ee5f07788e 100644
--- a/examples/bluetooth/bluedroid/classic_bt/bt_spp_initiator/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/classic_bt/bt_spp_initiator/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(bt_spp_initiator_demo)
diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_spp_initiator/README.rst b/examples/bluetooth/bluedroid/classic_bt/bt_spp_initiator/README.rst
index 07bf513a1c9..543f43faecb 100644
--- a/examples/bluetooth/bluedroid/classic_bt/bt_spp_initiator/README.rst
+++ b/examples/bluetooth/bluedroid/classic_bt/bt_spp_initiator/README.rst
@@ -1,3 +1,7 @@
+================= =====
+Supported Targets ESP32
+================= =====
+
 ESP-IDF BT-SPP-INITATOR demo
 ======================
 
diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_acceptor/CMakeLists.txt b/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_acceptor/CMakeLists.txt
index a55bcd7e36c..46030210a00 100644
--- a/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_acceptor/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_acceptor/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(bt_spp_vfs_acceptor_demo)
diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_acceptor/README.rst b/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_acceptor/README.rst
index b45593eb621..f4ecf95d334 100644
--- a/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_acceptor/README.rst
+++ b/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_acceptor/README.rst
@@ -1,3 +1,7 @@
+================= =====
+Supported Targets ESP32
+================= =====
+
 ESP-IDF BT-SPP-VFS-ACCEPTOR demo
 ======================
 
diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_initiator/CMakeLists.txt b/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_initiator/CMakeLists.txt
index 94758343c3f..a133903920e 100644
--- a/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_initiator/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_initiator/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(bt_spp_vfs_initiator_demo)
diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_initiator/README.rst b/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_initiator/README.rst
index 38d9804b9cc..4f2f0eb4c67 100644
--- a/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_initiator/README.rst
+++ b/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_initiator/README.rst
@@ -1,3 +1,7 @@
+================= =====
+Supported Targets ESP32
+================= =====
+
 ESP-IDF BT-SPP-VFS-INITATOR demo
 ======================
 
diff --git a/examples/bluetooth/bluedroid/classic_bt/hfp_ag/CMakeLists.txt b/examples/bluetooth/bluedroid/classic_bt/hfp_ag/CMakeLists.txt
index f724b15561a..ab8aa0ac173 100644
--- a/examples/bluetooth/bluedroid/classic_bt/hfp_ag/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/classic_bt/hfp_ag/CMakeLists.txt
@@ -2,6 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(hfp_ag)
diff --git a/examples/bluetooth/bluedroid/classic_bt/hfp_ag/README.md b/examples/bluetooth/bluedroid/classic_bt/hfp_ag/README.md
index 9abc13b3092..d858278095e 100644
--- a/examples/bluetooth/bluedroid/classic_bt/hfp_ag/README.md
+++ b/examples/bluetooth/bluedroid/classic_bt/hfp_ag/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # Hands-Free Audio Gateway
 
 This example is to show how to use the APIs of Hands-Free (HF) Audio Gateway (AG) Component and the effects of them by providing a set of commands. You can use this example to communicate with a Hands-Free Unit (e.g. a headphone set). This example uses UART for user commands.
diff --git a/examples/bluetooth/bluedroid/classic_bt/hfp_hf/CMakeLists.txt b/examples/bluetooth/bluedroid/classic_bt/hfp_hf/CMakeLists.txt
index d1af489a914..372d040e395 100644
--- a/examples/bluetooth/bluedroid/classic_bt/hfp_hf/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/classic_bt/hfp_hf/CMakeLists.txt
@@ -2,6 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(hfp_hf)
diff --git a/examples/bluetooth/bluedroid/classic_bt/hfp_hf/README.md b/examples/bluetooth/bluedroid/classic_bt/hfp_hf/README.md
index b5be04d72a7..010180f5250 100644
--- a/examples/bluetooth/bluedroid/classic_bt/hfp_hf/README.md
+++ b/examples/bluetooth/bluedroid/classic_bt/hfp_hf/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # Hands-Free Unit
 
 This example is to show how to use the APIs of Hands-Free (HF) Unit Component and the effects of them by providing a set of commands. You can use this example to communicate with an Audio Gateway (AG) device (e.g. a smart phone). This example uses UART for user commands.
diff --git a/examples/bluetooth/bluedroid/coex/a2dp_gatts_coex/CMakeLists.txt b/examples/bluetooth/bluedroid/coex/a2dp_gatts_coex/CMakeLists.txt
index b54d4610c33..3c9fa474c11 100644
--- a/examples/bluetooth/bluedroid/coex/a2dp_gatts_coex/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/coex/a2dp_gatts_coex/CMakeLists.txt
@@ -2,6 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(bt_ble_coex)
diff --git a/examples/bluetooth/bluedroid/coex/a2dp_gatts_coex/README.md b/examples/bluetooth/bluedroid/coex/a2dp_gatts_coex/README.md
index c36b22737df..d5a3be3b44d 100644
--- a/examples/bluetooth/bluedroid/coex/a2dp_gatts_coex/README.md
+++ b/examples/bluetooth/bluedroid/coex/a2dp_gatts_coex/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP-IDF A2DP-GATTS_COEX demo
 ======================
 This demo showcases APIs to create a GATT service and A2DP profile and demonstrates BLE and classic Bluetooth coexistence.
diff --git a/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/CMakeLists.txt b/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/CMakeLists.txt
index 7f8c0724936..f520a3ae27d 100644
--- a/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/CMakeLists.txt
+++ b/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/CMakeLists.txt
@@ -3,5 +3,4 @@
 cmake_minimum_required(VERSION 3.5)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(SUPPORTED_TARGETS esp32)
 project(gattc_gatts_coex)
diff --git a/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/README.md b/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/README.md
index 0fb1bf6ce1c..5c979c98f1e 100644
--- a/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/README.md
+++ b/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP-IDF Gattc and Gatts Coexistence example
 ==============================================
 
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/CMakeLists.txt
index 92c0e4115ab..af50d633252 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/CMakeLists.txt
@@ -4,5 +4,4 @@ cmake_minimum_required(VERSION 3.5)
 
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(SUPPORTED_TARGETS esp32)
 project(ble_mesh_coex_test)
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/README.md b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/README.md
index 7950f4c141d..4c9ebb15115 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/README.md
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # Example of BLE Mesh and TCP Server/Client Coexistence
 
 This example introduces how to test the basic functions of `BLE Mesh data interface` and `TCP Server/Client Coexistence`. `BLE Mesh data interface` is GAP scanning and advertising.
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_node/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_node/CMakeLists.txt
index 5e425b2aeab..74361e558c1 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_node/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_node/CMakeLists.txt
@@ -3,5 +3,4 @@
 cmake_minimum_required(VERSION 3.5)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(SUPPORTED_TARGETS esp32)
 project(ble_mesh_console_node)
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_node/README.md b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_node/README.md
index 0bb260c8167..86a244b8f7d 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_node/README.md
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_node/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # ble mesh node console demo
 ## Introduction  
 This demo implements ble mesh node basic features.Based on this demo, node can be scaned and proved by provisioner, reply get/set message to provisioner.  
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_provisioner/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_provisioner/CMakeLists.txt
index 14941a14e51..6ce28d7d57c 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_provisioner/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_provisioner/CMakeLists.txt
@@ -3,5 +3,4 @@
 cmake_minimum_required(VERSION 3.5)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(SUPPORTED_TARGETS esp32)
 project(ble_mesh_console_provisioner)
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_provisioner/README.md b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_provisioner/README.md
index 3925d93cf42..4167e9f4474 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_provisioner/README.md
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_provisioner/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # ble mesh provisioner demo
 ## Introduction  
 This demo implements ble mesh provisioner basic features.Based on this demo, provisioner can scan and prove unprovisioned device, send set/get message. Also can define new model.  
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/CMakeLists.txt
index a6d283cdff5..1dcfafdf925 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/CMakeLists.txt
@@ -5,5 +5,4 @@ cmake_minimum_required(VERSION 3.5)
 set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(SUPPORTED_TARGETS esp32)
 project(ble_mesh_fast_prov_client)
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/README.md b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/README.md
index d49238e9743..6cc441c3e7e 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/README.md
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP BLE Mesh Fast Provisioning Client example
 ========================
 
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/CMakeLists.txt
index 06fb4f74615..c09547f94d4 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/CMakeLists.txt
@@ -5,5 +5,4 @@ cmake_minimum_required(VERSION 3.5)
 set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(SUPPORTED_TARGETS esp32)
 project(ble_mesh_fast_prov_server)
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/README.md b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/README.md
index e12c5d3fb4e..460dd2f5891 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/README.md
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP BLE Mesh Fast Provisioning Server example
 ========================
 
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/CMakeLists.txt
index d42dfe18f9b..4b36e55e66a 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/CMakeLists.txt
@@ -3,5 +3,4 @@
 cmake_minimum_required(VERSION 3.5)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(SUPPORTED_TARGETS esp32)
 project(onoff_client)
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/README.md b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/README.md
index 38aa2caee1e..8c8ed9483af 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/README.md
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP BLE Mesh Client Model Demo
 ========================
 
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/CMakeLists.txt
index 3730f665e6c..a2c34bc8cf6 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/CMakeLists.txt
@@ -3,5 +3,4 @@
 cmake_minimum_required(VERSION 3.5)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(SUPPORTED_TARGETS esp32)
 project(onoff_server)
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/README.md b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/README.md
index 85b2147ee50..ec145628dd8 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/README.md
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP BLE Mesh Node demo
 ==========================
 
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/CMakeLists.txt
index 503adacea5f..dfffbf786fd 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/CMakeLists.txt
@@ -3,5 +3,4 @@
 cmake_minimum_required(VERSION 3.5)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(SUPPORTED_TARGETS esp32)
 project(ble_mesh_provisioner)
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/README.md b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/README.md
index 2ccf84fd30c..6bdf901ca80 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/README.md
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP BLE Mesh Provisioner demo
 ================================
 
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/CMakeLists.txt
index 9ed701d4069..20d516299e1 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/CMakeLists.txt
@@ -3,5 +3,4 @@
 cmake_minimum_required(VERSION 3.5)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(SUPPORTED_TARGETS esp32)
 project(vendor_client)
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/README.md b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/README.md
index 5a6ac057d3a..caa0ce49425 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/README.md
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP BLE Mesh Vendor Client Example
 ==================================
 
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/CMakeLists.txt
index fcb29360b64..63488f00ea3 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/CMakeLists.txt
@@ -3,5 +3,4 @@
 cmake_minimum_required(VERSION 3.5)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(SUPPORTED_TARGETS esp32)
 project(vendor_server)
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/README.md b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/README.md
index ff4d30fd1e2..1b643349ece 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/README.md
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP BLE Mesh Vendor Server Example
 ==================================
 
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/CMakeLists.txt
index d8b0116ab63..537339edb8e 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/CMakeLists.txt
@@ -5,5 +5,4 @@ cmake_minimum_required(VERSION 3.5)
 set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(SUPPORTED_TARGETS esp32)
 project(ble_mesh_wifi_coexist)
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/README.md b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/README.md
index 8173486ffa1..a580a042224 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/README.md
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP BLE Mesh and WiFi Coexist example
 ========================
 
diff --git a/examples/bluetooth/esp_ble_mesh/common_vendor_models/README.md b/examples/bluetooth/esp_ble_mesh/common_vendor_models/README.md
new file mode 100644
index 00000000000..f708a1985a3
--- /dev/null
+++ b/examples/bluetooth/esp_ble_mesh/common_vendor_models/README.md
@@ -0,0 +1,2 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
diff --git a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/CMakeLists.txt
index 9ca35d25696..cb92f4b374b 100644
--- a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/CMakeLists.txt
+++ b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/CMakeLists.txt
@@ -3,5 +3,4 @@
 cmake_minimum_required(VERSION 3.5)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(SUPPORTED_TARGETS esp32)
 project(fast_prov_vendor_model)
diff --git a/examples/bluetooth/hci/controller_hci_uart/CMakeLists.txt b/examples/bluetooth/hci/controller_hci_uart/CMakeLists.txt
index 088a6f52372..49c95f4da40 100644
--- a/examples/bluetooth/hci/controller_hci_uart/CMakeLists.txt
+++ b/examples/bluetooth/hci/controller_hci_uart/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(controller_hci_uart)
diff --git a/examples/bluetooth/hci/controller_hci_uart/README.md b/examples/bluetooth/hci/controller_hci_uart/README.md
index f51c6c2c689..e7a7d8b1a14 100644
--- a/examples/bluetooth/hci/controller_hci_uart/README.md
+++ b/examples/bluetooth/hci/controller_hci_uart/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP-IDF UART HCI Controller
 ===========================
 
diff --git a/examples/bluetooth/hci/controller_vhci_ble_adv/CMakeLists.txt b/examples/bluetooth/hci/controller_vhci_ble_adv/CMakeLists.txt
index 2a4b8872a19..22b94847f6e 100644
--- a/examples/bluetooth/hci/controller_vhci_ble_adv/CMakeLists.txt
+++ b/examples/bluetooth/hci/controller_vhci_ble_adv/CMakeLists.txt
@@ -2,6 +2,5 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ble_adv)
diff --git a/examples/bluetooth/hci/controller_vhci_ble_adv/README.md b/examples/bluetooth/hci/controller_vhci_ble_adv/README.md
index 6db914225d8..ae6fb26decf 100644
--- a/examples/bluetooth/hci/controller_vhci_ble_adv/README.md
+++ b/examples/bluetooth/hci/controller_vhci_ble_adv/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ESP-IDF VHCI ble_advertising app
 ================================
 
diff --git a/examples/bluetooth/nimble/blecent/CMakeLists.txt b/examples/bluetooth/nimble/blecent/CMakeLists.txt
index 4df574b9d5b..b3ac70b41ad 100644
--- a/examples/bluetooth/nimble/blecent/CMakeLists.txt
+++ b/examples/bluetooth/nimble/blecent/CMakeLists.txt
@@ -3,5 +3,4 @@
 cmake_minimum_required(VERSION 3.5)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(SUPPORTED_TARGETS esp32)
 project(blecent)
diff --git a/examples/bluetooth/nimble/blecent/README.md b/examples/bluetooth/nimble/blecent/README.md
index 7724aba48f2..9886ddb62b4 100644
--- a/examples/bluetooth/nimble/blecent/README.md
+++ b/examples/bluetooth/nimble/blecent/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # BLE central example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/bluetooth/nimble/blehr/CMakeLists.txt b/examples/bluetooth/nimble/blehr/CMakeLists.txt
index 6e02bcff333..62f79f52311 100644
--- a/examples/bluetooth/nimble/blehr/CMakeLists.txt
+++ b/examples/bluetooth/nimble/blehr/CMakeLists.txt
@@ -3,5 +3,4 @@
 cmake_minimum_required(VERSION 3.5)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(SUPPORTED_TARGETS esp32)
 project(blehr)
diff --git a/examples/bluetooth/nimble/blehr/README.md b/examples/bluetooth/nimble/blehr/README.md
index 067769dccc7..496c48c7541 100644
--- a/examples/bluetooth/nimble/blehr/README.md
+++ b/examples/bluetooth/nimble/blehr/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # BLE Heart Rate Measurement example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/bluetooth/nimble/blemesh/CMakeLists.txt b/examples/bluetooth/nimble/blemesh/CMakeLists.txt
index 6250e13e126..f022ba3d275 100644
--- a/examples/bluetooth/nimble/blemesh/CMakeLists.txt
+++ b/examples/bluetooth/nimble/blemesh/CMakeLists.txt
@@ -3,5 +3,4 @@
 cmake_minimum_required(VERSION 3.5)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(SUPPORTED_TARGETS esp32)
 project(blemesh)
diff --git a/examples/bluetooth/nimble/blemesh/README.md b/examples/bluetooth/nimble/blemesh/README.md
index 7775e7abeb7..4b5435d1a58 100644
--- a/examples/bluetooth/nimble/blemesh/README.md
+++ b/examples/bluetooth/nimble/blemesh/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # BLE Mesh example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/bluetooth/nimble/bleprph/CMakeLists.txt b/examples/bluetooth/nimble/bleprph/CMakeLists.txt
index f400e730be0..6e3fbcae384 100644
--- a/examples/bluetooth/nimble/bleprph/CMakeLists.txt
+++ b/examples/bluetooth/nimble/bleprph/CMakeLists.txt
@@ -3,5 +3,4 @@
 cmake_minimum_required(VERSION 3.5)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(SUPPORTED_TARGETS esp32)
 project(bleprph)
diff --git a/examples/bluetooth/nimble/bleprph/README.md b/examples/bluetooth/nimble/bleprph/README.md
index 0fb0ee494a3..d1bfee47874 100644
--- a/examples/bluetooth/nimble/bleprph/README.md
+++ b/examples/bluetooth/nimble/bleprph/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # BLE peripheral example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/build_system/cmake/idf_as_lib/CMakeLists.txt b/examples/build_system/cmake/idf_as_lib/CMakeLists.txt
index 5da04579c97..888ab840dc5 100644
--- a/examples/build_system/cmake/idf_as_lib/CMakeLists.txt
+++ b/examples/build_system/cmake/idf_as_lib/CMakeLists.txt
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.5)
 
 project(idf_as_lib C)
 
-set(SUPPORTED_TARGETS esp32)
 if("${TARGET}" STREQUAL "esp32")
     # Include for ESP-IDF build system functions
     include($ENV{IDF_PATH}/tools/cmake/idf.cmake)
diff --git a/examples/build_system/cmake/idf_as_lib/README.md b/examples/build_system/cmake/idf_as_lib/README.md
index 4ba61e0bdcf..35788a35d80 100644
--- a/examples/build_system/cmake/idf_as_lib/README.md
+++ b/examples/build_system/cmake/idf_as_lib/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # Using ESP-IDF in Custom CMake Projects
 
 This example illustrates using ESP-IDF components as libraries in custom CMake projects. The application
diff --git a/examples/peripherals/adc/CMakeLists.txt b/examples/peripherals/adc/CMakeLists.txt
index c272a001425..b01d6352185 100644
--- a/examples/peripherals/adc/CMakeLists.txt
+++ b/examples/peripherals/adc/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(adc)
diff --git a/examples/peripherals/adc/README.md b/examples/peripherals/adc/README.md
index b392e995707..67822f23591 100644
--- a/examples/peripherals/adc/README.md
+++ b/examples/peripherals/adc/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # ADC1 Example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/peripherals/adc2/CMakeLists.txt b/examples/peripherals/adc2/CMakeLists.txt
index 3b4af7e7090..7ea7329c1e3 100644
--- a/examples/peripherals/adc2/CMakeLists.txt
+++ b/examples/peripherals/adc2/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(adc2)
diff --git a/examples/peripherals/adc2/README.md b/examples/peripherals/adc2/README.md
index 71f564249f1..7045e977e71 100644
--- a/examples/peripherals/adc2/README.md
+++ b/examples/peripherals/adc2/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # ADC2 Example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/peripherals/can/can_alert_and_recovery/CMakeLists.txt b/examples/peripherals/can/can_alert_and_recovery/CMakeLists.txt
index cbe58fcb0f3..4d4838176f3 100644
--- a/examples/peripherals/can/can_alert_and_recovery/CMakeLists.txt
+++ b/examples/peripherals/can/can_alert_and_recovery/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(can_alert_and_recovery_example)
diff --git a/examples/peripherals/can/can_alert_and_recovery/README.md b/examples/peripherals/can/can_alert_and_recovery/README.md
index b54d6e91424..1feb7a575cc 100644
--- a/examples/peripherals/can/can_alert_and_recovery/README.md
+++ b/examples/peripherals/can/can_alert_and_recovery/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # CAN Alert and Recovery Example
 
 ## Overview
diff --git a/examples/peripherals/can/can_network/README.md b/examples/peripherals/can/can_network/README.md
index 71fbd6427b3..2e25d2b6dc0 100644
--- a/examples/peripherals/can/can_network/README.md
+++ b/examples/peripherals/can/can_network/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # CAN Network Example
 
 ## Overview
diff --git a/examples/peripherals/can/can_network/can_network_listen_only/CMakeLists.txt b/examples/peripherals/can/can_network/can_network_listen_only/CMakeLists.txt
index c5b0c8d4a59..42617e10ffa 100644
--- a/examples/peripherals/can/can_network/can_network_listen_only/CMakeLists.txt
+++ b/examples/peripherals/can/can_network/can_network_listen_only/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(can_network_listen_only)
diff --git a/examples/peripherals/can/can_network/can_network_master/CMakeLists.txt b/examples/peripherals/can/can_network/can_network_master/CMakeLists.txt
index e440673224e..33ac7b660be 100644
--- a/examples/peripherals/can/can_network/can_network_master/CMakeLists.txt
+++ b/examples/peripherals/can/can_network/can_network_master/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(can_network_master)
diff --git a/examples/peripherals/can/can_network/can_network_slave/CMakeLists.txt b/examples/peripherals/can/can_network/can_network_slave/CMakeLists.txt
index 6c5137f0f8f..1550db15648 100644
--- a/examples/peripherals/can/can_network/can_network_slave/CMakeLists.txt
+++ b/examples/peripherals/can/can_network/can_network_slave/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(can_network_slave)
diff --git a/examples/peripherals/can/can_self_test/CMakeLists.txt b/examples/peripherals/can/can_self_test/CMakeLists.txt
index 216e8edf504..027060e221d 100644
--- a/examples/peripherals/can/can_self_test/CMakeLists.txt
+++ b/examples/peripherals/can/can_self_test/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(can_self_test_example)
diff --git a/examples/peripherals/can/can_self_test/README.md b/examples/peripherals/can/can_self_test/README.md
index 13e5e52e5c9..3be285d501a 100644
--- a/examples/peripherals/can/can_self_test/README.md
+++ b/examples/peripherals/can/can_self_test/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # CAN Self Test Example
 
 ## Overview
diff --git a/examples/peripherals/i2c/i2c_tools/CMakeLists.txt b/examples/peripherals/i2c/i2c_tools/CMakeLists.txt
index 7fd3cf67e08..53f2a254f20 100644
--- a/examples/peripherals/i2c/i2c_tools/CMakeLists.txt
+++ b/examples/peripherals/i2c/i2c_tools/CMakeLists.txt
@@ -4,6 +4,5 @@ cmake_minimum_required(VERSION 3.5)
 
 set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/system/console/components)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(i2c-tools)
diff --git a/examples/peripherals/i2c/i2c_tools/README.md b/examples/peripherals/i2c/i2c_tools/README.md
index 24eaa35e202..070f2ff4a5b 100644
--- a/examples/peripherals/i2c/i2c_tools/README.md
+++ b/examples/peripherals/i2c/i2c_tools/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # I2C Tools Example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/peripherals/i2s/CMakeLists.txt b/examples/peripherals/i2s/CMakeLists.txt
index 8edbb549015..19c5f883081 100644
--- a/examples/peripherals/i2s/CMakeLists.txt
+++ b/examples/peripherals/i2s/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(esp32-i2s-driver-example)
diff --git a/examples/peripherals/i2s/README.md b/examples/peripherals/i2s/README.md
index 37d51437f1c..79cc5515dbb 100644
--- a/examples/peripherals/i2s/README.md
+++ b/examples/peripherals/i2s/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # I2S Example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/peripherals/i2s_adc_dac/CMakeLists.txt b/examples/peripherals/i2s_adc_dac/CMakeLists.txt
index 4d8f5ef280c..4b27d7cd687 100644
--- a/examples/peripherals/i2s_adc_dac/CMakeLists.txt
+++ b/examples/peripherals/i2s_adc_dac/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(i2s-adc-dac)
diff --git a/examples/peripherals/i2s_adc_dac/README.md b/examples/peripherals/i2s_adc_dac/README.md
index c3c85b6c741..50db57d8da1 100644
--- a/examples/peripherals/i2s_adc_dac/README.md
+++ b/examples/peripherals/i2s_adc_dac/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # I2S Built-in ADC/DAC Example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/peripherals/mcpwm/mcpwm_basic_config/CMakeLists.txt b/examples/peripherals/mcpwm/mcpwm_basic_config/CMakeLists.txt
index 520e4048891..53eb976ea44 100644
--- a/examples/peripherals/mcpwm/mcpwm_basic_config/CMakeLists.txt
+++ b/examples/peripherals/mcpwm/mcpwm_basic_config/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(mcpwm_basic_config)
diff --git a/examples/peripherals/mcpwm/mcpwm_basic_config/README.md b/examples/peripherals/mcpwm/mcpwm_basic_config/README.md
index 4b9e7a426ed..319aad78f11 100644
--- a/examples/peripherals/mcpwm/mcpwm_basic_config/README.md
+++ b/examples/peripherals/mcpwm/mcpwm_basic_config/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # MCPWM basic config Example
 
 This example will show you how to use each submodule of MCPWM unit
diff --git a/examples/peripherals/mcpwm/mcpwm_bldc_control/CMakeLists.txt b/examples/peripherals/mcpwm/mcpwm_bldc_control/CMakeLists.txt
index 67bb8beeaa9..10ed869e1b9 100644
--- a/examples/peripherals/mcpwm/mcpwm_bldc_control/CMakeLists.txt
+++ b/examples/peripherals/mcpwm/mcpwm_bldc_control/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(mcpwm_bldc_control_hall_sensor)
diff --git a/examples/peripherals/mcpwm/mcpwm_bldc_control/README.md b/examples/peripherals/mcpwm/mcpwm_bldc_control/README.md
index bcdbb706ef6..a5fe0ede277 100644
--- a/examples/peripherals/mcpwm/mcpwm_bldc_control/README.md
+++ b/examples/peripherals/mcpwm/mcpwm_bldc_control/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # MCPWM BLDC motor control(hall sensor feedback) Example
 
 This example will show you how to use MCPWM module to control bldc motor with hall sensor feedback
diff --git a/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/CMakeLists.txt b/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/CMakeLists.txt
index ee6ca0a9720..a4baf8b40ca 100644
--- a/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/CMakeLists.txt
+++ b/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(mcpwm_brushed_dc_control)
diff --git a/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/README.md b/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/README.md
index 1781459a7c2..8b11c6b4344 100644
--- a/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/README.md
+++ b/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # MCPWM brushed dc motor control Example
 
 This example will show you how to use MCPWM module to control brushed dc motor, you need to make connection between ESP32 and motor driver
diff --git a/examples/peripherals/mcpwm/mcpwm_servo_control/CMakeLists.txt b/examples/peripherals/mcpwm/mcpwm_servo_control/CMakeLists.txt
index dc9beaffbd8..524c0ec97ce 100644
--- a/examples/peripherals/mcpwm/mcpwm_servo_control/CMakeLists.txt
+++ b/examples/peripherals/mcpwm/mcpwm_servo_control/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(mcpwm_servo_control)
diff --git a/examples/peripherals/mcpwm/mcpwm_servo_control/README.md b/examples/peripherals/mcpwm/mcpwm_servo_control/README.md
index 7913609371e..262539d6bb2 100644
--- a/examples/peripherals/mcpwm/mcpwm_servo_control/README.md
+++ b/examples/peripherals/mcpwm/mcpwm_servo_control/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # MCPWM servo motor control Example
 
 This example will show you how to use MCPWM module to control servo motor
diff --git a/examples/peripherals/pcnt/CMakeLists.txt b/examples/peripherals/pcnt/CMakeLists.txt
index 6858785c804..8f9d35a794b 100644
--- a/examples/peripherals/pcnt/CMakeLists.txt
+++ b/examples/peripherals/pcnt/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(pcnt)
diff --git a/examples/peripherals/pcnt/README.md b/examples/peripherals/pcnt/README.md
index 84721c562bd..afcbaf52db5 100644
--- a/examples/peripherals/pcnt/README.md
+++ b/examples/peripherals/pcnt/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # PCNT Example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/peripherals/sdio/README.md b/examples/peripherals/sdio/README.md
index 39ef48a16a4..162c6963e41 100644
--- a/examples/peripherals/sdio/README.md
+++ b/examples/peripherals/sdio/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 ### SDIO Example
 
 ## Introduction
diff --git a/examples/peripherals/sdio/host/CMakeLists.txt b/examples/peripherals/sdio/host/CMakeLists.txt
index a3ab5fba966..fb1d9a33efe 100644
--- a/examples/peripherals/sdio/host/CMakeLists.txt
+++ b/examples/peripherals/sdio/host/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(sdio_host)
diff --git a/examples/peripherals/sdio/slave/CMakeLists.txt b/examples/peripherals/sdio/slave/CMakeLists.txt
index 2f2080d041b..c9944539775 100644
--- a/examples/peripherals/sdio/slave/CMakeLists.txt
+++ b/examples/peripherals/sdio/slave/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(sdio_slave)
diff --git a/examples/peripherals/timer_group/CMakeLists.txt b/examples/peripherals/timer_group/CMakeLists.txt
index 989d76a457b..247819ef30b 100644
--- a/examples/peripherals/timer_group/CMakeLists.txt
+++ b/examples/peripherals/timer_group/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(timer_group)
diff --git a/examples/peripherals/timer_group/README.md b/examples/peripherals/timer_group/README.md
index 08135b3a39b..c02ad8fe8e0 100644
--- a/examples/peripherals/timer_group/README.md
+++ b/examples/peripherals/timer_group/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # Example: timer_group
 
 This example uses the timer group driver to generate timer interrupts at two specified alarm intervals.
diff --git a/examples/peripherals/usb/tusb_sample_descriptor/CMakeLists.txt b/examples/peripherals/usb/tusb_sample_descriptor/CMakeLists.txt
index 53658eb7366..dcf556f080d 100644
--- a/examples/peripherals/usb/tusb_sample_descriptor/CMakeLists.txt
+++ b/examples/peripherals/usb/tusb_sample_descriptor/CMakeLists.txt
@@ -3,5 +3,4 @@
 cmake_minimum_required(VERSION 3.5)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(SUPPORTED_TARGETS esp32s2)
 project(tusb_sample_descriptor)
diff --git a/examples/peripherals/usb/tusb_sample_descriptor/README.md b/examples/peripherals/usb/tusb_sample_descriptor/README.md
index 0c3171fba05..8f9b08df11c 100644
--- a/examples/peripherals/usb/tusb_sample_descriptor/README.md
+++ b/examples/peripherals/usb/tusb_sample_descriptor/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32-S2 |
+| ----------------- | -------- |
+
 # TinyUSB Sample Descriptor
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/peripherals/wave_gen/CMakeLists.txt b/examples/peripherals/wave_gen/CMakeLists.txt
index 5c8812bb090..e69e6f20763 100644
--- a/examples/peripherals/wave_gen/CMakeLists.txt
+++ b/examples/peripherals/wave_gen/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(wave_gen)
diff --git a/examples/peripherals/wave_gen/README.md b/examples/peripherals/wave_gen/README.md
index 810e99354c8..cb6f0d46cf9 100644
--- a/examples/peripherals/wave_gen/README.md
+++ b/examples/peripherals/wave_gen/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # Wave generator Example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/protocols/sntp/CMakeLists.txt b/examples/protocols/sntp/CMakeLists.txt
index 5676bb76069..48ca89b291e 100644
--- a/examples/protocols/sntp/CMakeLists.txt
+++ b/examples/protocols/sntp/CMakeLists.txt
@@ -6,6 +6,5 @@ cmake_minimum_required(VERSION 3.5)
 # This example uses an extra component for common functions such as Wi-Fi and Ethernet connection.
 set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(sntp)
diff --git a/examples/protocols/sntp/README.md b/examples/protocols/sntp/README.md
index 6e5edb41e25..c2450486006 100644
--- a/examples/protocols/sntp/README.md
+++ b/examples/protocols/sntp/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # Example: using LwIP SNTP module and time functions
 
 This example demonstrates the use of LwIP SNTP module to obtain time from Internet servers. See the README.md file in the upper level 'examples' directory for more information about examples.
diff --git a/examples/provisioning/legacy/ble_prov/CMakeLists.txt b/examples/provisioning/legacy/ble_prov/CMakeLists.txt
index 63178e923f1..30012d3e4df 100644
--- a/examples/provisioning/legacy/ble_prov/CMakeLists.txt
+++ b/examples/provisioning/legacy/ble_prov/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ble_prov)
diff --git a/examples/provisioning/legacy/ble_prov/README.md b/examples/provisioning/legacy/ble_prov/README.md
index 949035aaf93..05e65ad9db0 100644
--- a/examples/provisioning/legacy/ble_prov/README.md
+++ b/examples/provisioning/legacy/ble_prov/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # BLE based Provisioning Example (Legacy)
 
 > Note: It is recommended to use the new `wifi_prov_mgr` example which is based on the simpler `wifi_provisioning` APIs. Check this example only if you wish to use lower level provisioning and protocomm APIs and want more control over the handlers.
diff --git a/examples/security/flash_encryption/CMakeLists.txt b/examples/security/flash_encryption/CMakeLists.txt
index 05e3e744f84..08764b82405 100644
--- a/examples/security/flash_encryption/CMakeLists.txt
+++ b/examples/security/flash_encryption/CMakeLists.txt
@@ -2,6 +2,6 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)  # Flash encryption not currently supported for ESP32-S2
+# Flash encryption not currently supported for ESP32-S2
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(flash_encryption)
diff --git a/examples/security/flash_encryption/README.md b/examples/security/flash_encryption/README.md
index 3df704a6564..3d0e808fde0 100644
--- a/examples/security/flash_encryption/README.md
+++ b/examples/security/flash_encryption/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # Flash Encryption
 
 The example checks if the flash encryption feature is enabled/disabled and if enabled prints the flash encryption mode (DEVELOPMENT / RELEASE) and FLASH_CRYPT_CNT eFuse value.
diff --git a/examples/storage/ext_flash_fatfs/CMakeLists.txt b/examples/storage/ext_flash_fatfs/CMakeLists.txt
index 1023f764fa4..e88d6f9a362 100644
--- a/examples/storage/ext_flash_fatfs/CMakeLists.txt
+++ b/examples/storage/ext_flash_fatfs/CMakeLists.txt
@@ -2,6 +2,6 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)  # external SPI flash driver not currently supported for ESP32-S2
+# external SPI flash driver not currently supported for ESP32-S2
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ext_flash_fatfs)
diff --git a/examples/storage/ext_flash_fatfs/README.md b/examples/storage/ext_flash_fatfs/README.md
index fcc54e76faa..88dedb70529 100644
--- a/examples/storage/ext_flash_fatfs/README.md
+++ b/examples/storage/ext_flash_fatfs/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # FAT FS on External Flash example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/system/app_trace_to_host/CMakeLists.txt b/examples/system/app_trace_to_host/CMakeLists.txt
index abe6c893802..b490018a3b7 100644
--- a/examples/system/app_trace_to_host/CMakeLists.txt
+++ b/examples/system/app_trace_to_host/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(app_trace_to_host)
diff --git a/examples/system/app_trace_to_host/README.md b/examples/system/app_trace_to_host/README.md
index e88012ba3f4..84eafa1497e 100644
--- a/examples/system/app_trace_to_host/README.md
+++ b/examples/system/app_trace_to_host/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # Application Level Tracing Example (Logging to Host)
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/system/esp_timer/CMakeLists.txt b/examples/system/esp_timer/CMakeLists.txt
index 18d67a05486..4222f063cb1 100644
--- a/examples/system/esp_timer/CMakeLists.txt
+++ b/examples/system/esp_timer/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(esp_timer_example)
diff --git a/examples/system/esp_timer/README.md b/examples/system/esp_timer/README.md
index 94901758492..69a789d6b47 100644
--- a/examples/system/esp_timer/README.md
+++ b/examples/system/esp_timer/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # High Resolution Timer Example (`esp_timer`) 
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/system/gcov/CMakeLists.txt b/examples/system/gcov/CMakeLists.txt
index b924db3493e..e40ee66d506 100644
--- a/examples/system/gcov/CMakeLists.txt
+++ b/examples/system/gcov/CMakeLists.txt
@@ -2,7 +2,6 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(gcov_example)
 
diff --git a/examples/system/gcov/README.md b/examples/system/gcov/README.md
index 8045566d868..9b3532df136 100644
--- a/examples/system/gcov/README.md
+++ b/examples/system/gcov/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # Blink Example With Coverage Info (Gcov)
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/system/himem/CMakeLists.txt b/examples/system/himem/CMakeLists.txt
index b3740d8de59..4297397b638 100644
--- a/examples/system/himem/CMakeLists.txt
+++ b/examples/system/himem/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(himem_test)
diff --git a/examples/system/himem/README.md b/examples/system/himem/README.md
index d8401c04337..029a3089bd6 100644
--- a/examples/system/himem/README.md
+++ b/examples/system/himem/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # Himem API Example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/system/light_sleep/CMakeLists.txt b/examples/system/light_sleep/CMakeLists.txt
index 253a31a0050..ed39e967141 100644
--- a/examples/system/light_sleep/CMakeLists.txt
+++ b/examples/system/light_sleep/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(light_sleep_example)
diff --git a/examples/system/light_sleep/README.md b/examples/system/light_sleep/README.md
index c9212067c6c..c64be0e50c5 100644
--- a/examples/system/light_sleep/README.md
+++ b/examples/system/light_sleep/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # Light Sleep Example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/system/ulp/CMakeLists.txt b/examples/system/ulp/CMakeLists.txt
index 7d05840a721..c24d801b3da 100644
--- a/examples/system/ulp/CMakeLists.txt
+++ b/examples/system/ulp/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ulp-example)
\ No newline at end of file
diff --git a/examples/system/ulp/README.md b/examples/system/ulp/README.md
index d76506a5d44..a9d0d287896 100644
--- a/examples/system/ulp/README.md
+++ b/examples/system/ulp/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # ULP Pulse Counting Example
 
 This example demonstrates how to program the ULP coprocessor to count pulses on an IO while the main CPUs are either running some other code or are in deep sleep. See the README.md file in the upper level 'examples' directory for more information about examples.
diff --git a/examples/system/ulp_adc/CMakeLists.txt b/examples/system/ulp_adc/CMakeLists.txt
index db2a3ea6883..7037f86d8ab 100644
--- a/examples/system/ulp_adc/CMakeLists.txt
+++ b/examples/system/ulp_adc/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ulp-adc-example)
\ No newline at end of file
diff --git a/examples/system/ulp_adc/README.md b/examples/system/ulp_adc/README.md
index 7948dd4821d..b27ef2772d1 100644
--- a/examples/system/ulp_adc/README.md
+++ b/examples/system/ulp_adc/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # ULP ADC Example
 
 This example demonstrates how to use the ULP coprocessor to poll ADC in deep sleep.
diff --git a/examples/wifi/espnow/CMakeLists.txt b/examples/wifi/espnow/CMakeLists.txt
index bd72a76709c..73c190ccbd1 100644
--- a/examples/wifi/espnow/CMakeLists.txt
+++ b/examples/wifi/espnow/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(espnow_example)
diff --git a/examples/wifi/espnow/README.md b/examples/wifi/espnow/README.md
index 5b375c99bac..4983e0954f1 100644
--- a/examples/wifi/espnow/README.md
+++ b/examples/wifi/espnow/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # ESPNOW Example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/wifi/iperf/CMakeLists.txt b/examples/wifi/iperf/CMakeLists.txt
index e2869fde66e..c6c13f2929c 100644
--- a/examples/wifi/iperf/CMakeLists.txt
+++ b/examples/wifi/iperf/CMakeLists.txt
@@ -4,6 +4,5 @@ cmake_minimum_required(VERSION 3.5)
 
 set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/system/console/components)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(iperf)
diff --git a/examples/wifi/iperf/README.md b/examples/wifi/iperf/README.md
index ce7247f0519..ffe84e43bcd 100644
--- a/examples/wifi/iperf/README.md
+++ b/examples/wifi/iperf/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # Iperf Example
 
 ## Note about iperf version
diff --git a/examples/wifi/power_save/CMakeLists.txt b/examples/wifi/power_save/CMakeLists.txt
index 414c768947a..a9a182fe6f1 100644
--- a/examples/wifi/power_save/CMakeLists.txt
+++ b/examples/wifi/power_save/CMakeLists.txt
@@ -2,6 +2,5 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(power_save)
diff --git a/examples/wifi/power_save/README.md b/examples/wifi/power_save/README.md
index 6d34570148d..f719f00b90f 100644
--- a/examples/wifi/power_save/README.md
+++ b/examples/wifi/power_save/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # Wifi Power Save Example
 
 This example shows how to use power save mode of wifi.
diff --git a/examples/wifi/simple_sniffer/CMakeLists.txt b/examples/wifi/simple_sniffer/CMakeLists.txt
index bb06c01895d..2ec8c4d9c67 100644
--- a/examples/wifi/simple_sniffer/CMakeLists.txt
+++ b/examples/wifi/simple_sniffer/CMakeLists.txt
@@ -4,6 +4,5 @@ cmake_minimum_required(VERSION 3.5)
 
 set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/system/console/components)
 
-set(SUPPORTED_TARGETS esp32)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(simple_sniffer)
diff --git a/examples/wifi/simple_sniffer/README.md b/examples/wifi/simple_sniffer/README.md
index 7c8ba2d4a94..a54076633fc 100644
--- a/examples/wifi/simple_sniffer/README.md
+++ b/examples/wifi/simple_sniffer/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # Simple Sniffer Example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/tools/find_build_apps/cmake.py b/tools/find_build_apps/cmake.py
index 5a8ebffbc16..edaa7b2a0f2 100644
--- a/tools/find_build_apps/cmake.py
+++ b/tools/find_build_apps/cmake.py
@@ -4,6 +4,7 @@ import subprocess
 import logging
 import shutil
 import re
+
 from .common import BuildSystem, BuildItem, BuildError
 
 BUILD_SYSTEM_CMAKE = "cmake"
@@ -13,7 +14,12 @@ IDF_PY = "idf.py"
 # there is no equivalent for the project CMakeLists files. This seems to be the best option...
 CMAKE_PROJECT_LINE = r"include($ENV{IDF_PATH}/tools/cmake/project.cmake)"
 
-SUPPORTED_TARGETS_REGEX = re.compile(r"set\(\s*SUPPORTED_TARGETS\s+([a-z_0-9\- ]+)\s*\)")
+SUPPORTED_TARGETS_REGEX = re.compile(r'Supported [Tt]argets((?:[\s|]+(?:ESP[0-9A-Z\-]+))+)')
+
+FORMAL_TO_USUAL = {
+    'ESP32': 'esp32',
+    'ESP32-S2': 'esp32s2',
+}
 
 
 class CMakeBuildSystem(BuildSystem):
@@ -137,6 +143,32 @@ class CMakeBuildSystem(BuildSystem):
         with open(cmakelists_path, "r") as cmakelists_file:
             return cmakelists_file.read()
 
+    @staticmethod
+    def _read_readme(app_path):
+        # Markdown supported targets should be:
+        # e.g. | Supported Targets | ESP32 |
+        #      | ----------------- | ----- |
+        # reStructuredText supported targets should be:
+        # e.g. ================= =====
+        #      Supported Targets ESP32
+        #      ================= =====
+        def get_md_or_rst(app_path):
+            readme_path = os.path.join(app_path, 'README.md')
+            if not os.path.exists(readme_path):
+                readme_path = os.path.join(app_path, 'README.rst')
+                if not os.path.exists(readme_path):
+                    return None
+            return readme_path
+
+        readme_path = get_md_or_rst(app_path)
+        # Handle sub apps situation, e.g. master-slave
+        if not readme_path:
+            readme_path = get_md_or_rst(os.path.dirname(app_path))
+        if not readme_path:
+            return None
+        with open(readme_path, "r") as readme_file:
+            return readme_file.read()
+
     @staticmethod
     def is_app(path):
         cmakelists_file_content = CMakeBuildSystem._read_cmakelists(path)
@@ -148,13 +180,25 @@ class CMakeBuildSystem(BuildSystem):
 
     @staticmethod
     def supported_targets(app_path):
-        cmakelists_file_content = CMakeBuildSystem._read_cmakelists(app_path)
-        if not cmakelists_file_content:
+        readme_file_content = CMakeBuildSystem._read_readme(app_path)
+        if not readme_file_content:
             return None
-        match = re.findall(SUPPORTED_TARGETS_REGEX, cmakelists_file_content)
+        match = re.findall(SUPPORTED_TARGETS_REGEX, readme_file_content)
         if not match:
             return None
         if len(match) > 1:
             raise NotImplementedError("Can't determine the value of SUPPORTED_TARGETS in {}".format(app_path))
-        targets = match[0].split(" ")
+        support_str = match[0].strip()
+
+        targets = []
+        for part in support_str.split('|'):
+            for inner in part.split(' '):
+                inner = inner.strip()
+                if not inner:
+                    continue
+                elif inner in FORMAL_TO_USUAL:
+                    targets.append(FORMAL_TO_USUAL[inner])
+                else:
+                    raise NotImplementedError("Can't recognize value of target {} in {}, now we only support '{}'"
+                                              .format(inner, app_path, ', '.join(FORMAL_TO_USUAL.keys())))
         return targets
diff --git a/tools/test_apps/security/secure_boot/CMakeLists.txt b/tools/test_apps/security/secure_boot/CMakeLists.txt
index 803addc1257..3639f725384 100644
--- a/tools/test_apps/security/secure_boot/CMakeLists.txt
+++ b/tools/test_apps/security/secure_boot/CMakeLists.txt
@@ -2,6 +2,6 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(SUPPORTED_TARGETS esp32)  # Secure Boot not currently supported for ESP32-S2beta
+# Secure Boot not currently supported for ESP32-S2
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(secure_boot)
diff --git a/tools/test_apps/security/secure_boot/README.md b/tools/test_apps/security/secure_boot/README.md
index b713a194541..44f9534b166 100644
--- a/tools/test_apps/security/secure_boot/README.md
+++ b/tools/test_apps/security/secure_boot/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 |
+| ----------------- | ----- |
+
 # Secure Boot
 
 The example checks if the secure boot feature is enabled/disabled and if enabled prints the secure boot version (Version 1 / Version 2) and FLASH_CRYPT_CNT eFuse value.