From de798541dce20f0dfc4709d5540dfec1ef87e2e4 Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <ivan@espressif.com>
Date: Tue, 15 Dec 2020 18:24:07 +0100
Subject: [PATCH 1/2] tools: use riscv32-esp-elf toolchain for ESP32-S2 RISC-V
 ULP

riscv32-esp-elf toolchain (used for ESP32-C3) can also be used for
ESP32-S2 RISC-V ULP coprocessor.

This removes the riscv-none-embed-gcc toolchain which was originally
used for the ULP, and updates the docs and CMake files to use
riscv32-esp-elf.

Some flags are cleaned up and workarounds removed from CMake toolchain
file.
---
 .../cmake/toolchain-esp32s2-ulp-riscv.cmake   | 25 ++++-----
 docs/en/api-guides/tools/idf-tools-notes.inc  |  5 --
 docs/en/api-guides/ulp-risc-v.rst             | 10 ++--
 .../api-guides/tools/idf-tools-notes.inc      |  5 --
 docs/zh_CN/api-guides/ulp-risc-v.rst          | 11 ++--
 tools/ci/config/build.yml                     |  6 --
 tools/tools.json                              | 56 +++++++++----------
 7 files changed, 46 insertions(+), 72 deletions(-)

diff --git a/components/ulp/cmake/toolchain-esp32s2-ulp-riscv.cmake b/components/ulp/cmake/toolchain-esp32s2-ulp-riscv.cmake
index 15d6145ded..5e1b497b6a 100644
--- a/components/ulp/cmake/toolchain-esp32s2-ulp-riscv.cmake
+++ b/components/ulp/cmake/toolchain-esp32s2-ulp-riscv.cmake
@@ -1,18 +1,15 @@
 # CMake toolchain file for ULP-RISC-V
 set(CMAKE_SYSTEM_NAME Generic)
 
-# Not best solution, needs to figure why the compiler detection
-# fails in CI
-set(CMAKE_C_COMPILER_FORCED TRUE)
-set(CMAKE_CXX_COMPILER_FORCED TRUE)
+set(CMAKE_C_COMPILER "riscv32-esp-elf-gcc")
+set(CMAKE_CXX_COMPILER "riscv32-esp-elf-g++")
+set(CMAKE_ASM_COMPILER "riscv32-esp-elf-gcc")
 
-set(CMAKE_C_COMPILER "riscv-none-embed-gcc")
-set(CMAKE_ASM_COMPILER "riscv-none-embed-gcc")
-
-if(NOT ASM_DIALECT)
-    set(ASM_DIALECT "")
-endif()
-
-set(CMAKE_C_FLAGS "-Os -march=rv32imc -mdiv -fdata-sections -ffunction-sections")
-set(CMAKE_ASM_FLAGS "-march=rv32imc -mdiv -x assembler-with-cpp -fdata-sections -ffunction-sections")
-set(CMAKE_EXE_LINKER_FLAGS "-march=rv32imc --specs=nano.specs --specs=nosys.specs")
+set(CMAKE_C_FLAGS "-Os -march=rv32imc -mdiv -fdata-sections -ffunction-sections"
+    CACHE STRING "C Compiler Base Flags")
+set(CMAKE_CXX_FLAGS "-Os -march=rv32imc -mdiv -fdata-sections -ffunction-sections"
+    CACHE STRING "C++ Compiler Base Flags")
+set(CMAKE_ASM_FLAGS "-march=rv32imc -x assembler-with-cpp"
+    CACHE STRING "Assembler Base Flags")
+set(CMAKE_EXE_LINKER_FLAGS "-march=rv32imc --specs=nano.specs --specs=nosys.specs"
+    CACHE STRING "Linker Base Flags")
diff --git a/docs/en/api-guides/tools/idf-tools-notes.inc b/docs/en/api-guides/tools/idf-tools-notes.inc
index 41ca6e01d4..9b076e96a3 100644
--- a/docs/en/api-guides/tools/idf-tools-notes.inc
+++ b/docs/en/api-guides/tools/idf-tools-notes.inc
@@ -25,11 +25,6 @@
 .. tool-esp32s2ulp-elf-notes
 
 
----
-
-.. tool-riscv-none-embed-gcc-notes
-
-
 ---
 
 .. tool-openocd-esp32-notes
diff --git a/docs/en/api-guides/ulp-risc-v.rst b/docs/en/api-guides/ulp-risc-v.rst
index b058fd30f5..3b3e559464 100644
--- a/docs/en/api-guides/ulp-risc-v.rst
+++ b/docs/en/api-guides/ulp-risc-v.rst
@@ -11,11 +11,11 @@ The ULP-RISC-V coprocessor is a variant of the ULP, present in ESP32-S2. Similar
 Installing the ULP-RISC-V Toolchain
 -----------------------------------
 
-The ULP-RISC-V coprocessor code is written in C (assembly is also possible) and compiled using the `riscv-embedded toolchain`_.
+The ULP-RISC-V coprocessor code is written in C (assembly is also possible) and compiled using RISC-V toolchain based on GCC.
 
-If you have already set up ESP-IDF with CMake build system according to the :doc:`Getting Started Guide <../../get-started/index>`, then you need to perform an extra step to get the ULP-RISC-V toolchain installed, execute the command below inside the IDF folder::
+If you have already set up ESP-IDF with CMake build system according to the :doc:`Getting Started Guide <../../get-started/index>`, then the toolchain should already be installed.
 
-$ idf_tools.py install riscv-none-embed-gcc
+.. note: In earlier versions of ESP-IDF, RISC-V toolchain had a different prefix: `riscv-none-embed-gcc`.
 
 
 Compiling the ULP-RISC-V Code
@@ -56,7 +56,7 @@ To compile the ULP-RISC-V code as part of the component, the following steps mus
 
    5. **Dump the contents of the ELF file into a binary** (``ulp_app_name.bin``) which can then be embedded into the application.
 
-   6. **Generate a list of global symbols** (``ulp_app_name.sym``) in the ELF file using ``riscv-none-embed-nm``.
+   6. **Generate a list of global symbols** (``ulp_app_name.sym``) in the ELF file using ``riscv32-esp-elf-nm``.
 
    7. **Create an LD export script and header file** (``ulp_app_name.ld`` and ``ulp_app_name.h``) containing the symbols from ``ulp_app_name.sym``. This is done using the ``esp32ulp_mapgen.py`` utility.
 
@@ -147,5 +147,3 @@ The program runs until the field ``RTC_CNTL_COCPU_DONE`` in register ``RTC_CNTL_
 
 To disable the timer (effectively preventing the ULP program from running again), please clear the ``RTC_CNTL_ULP_CP_SLP_TIMER_EN`` bit in the ``RTC_CNTL_STATE0_REG`` register. This can be done both from the ULP code and from the main program.
 
-
-.. _riscv-embedded toolchain: https://xpack.github.io/riscv-none-embed-gcc/
diff --git a/docs/zh_CN/api-guides/tools/idf-tools-notes.inc b/docs/zh_CN/api-guides/tools/idf-tools-notes.inc
index 3e22db2113..37eda3df41 100644
--- a/docs/zh_CN/api-guides/tools/idf-tools-notes.inc
+++ b/docs/zh_CN/api-guides/tools/idf-tools-notes.inc
@@ -27,11 +27,6 @@
 .. tool-esp32s2ulp-elf-notes
 
 
----
-
-.. tool-riscv-none-embed-gcc-notes
-
-
 ---
 
 .. tool-openocd-esp32-notes
diff --git a/docs/zh_CN/api-guides/ulp-risc-v.rst b/docs/zh_CN/api-guides/ulp-risc-v.rst
index 2eb1ade778..307afabccb 100644
--- a/docs/zh_CN/api-guides/ulp-risc-v.rst
+++ b/docs/zh_CN/api-guides/ulp-risc-v.rst
@@ -11,12 +11,11 @@ ULP-RISC-V 协处理器是 ULP 的一种变体，用于 ESP32-S2。与 ULP 类
 安装 ULP-RISC-V 工具链
 -----------------------------------
 
-ULP-RISC-V 协处理器代码以 C 语言编写（也可能是汇编语言），使用 `riscv-embedded toolchain`_ 进行编译。
+ULP-RISC-V 协处理器代码以 C 语言编写（也可能是汇编语言），使用基于GCC的 RISC-V 工具链进行编译。
 
-如果你已依照 :doc:`快速入门指南 <../../get-started/index>` 中的介绍安装好了 ESP-IDF 及其 CMake 构建系统，还需要在 IDF 文件夹中执行以下指令，安装 ULP-RISC-V 工具链::
-
-$ idf_tools.py install riscv-none-embed-gcc
+如果你已依照 :doc:`快速入门指南 <../../get-started/index>` 中的介绍安装好了 ESP-IDF 及其 CMake 构建系统，那么 ULP-RISC-V 工具链已经被默认安装到了你的开发环境中。
 
+.. note: 在早期版本的ESP-IDF中，RISC-V工具链具有不同的名称：`riscv-none-embed-gcc`。
 
 编译 ULP-RISC-V 代码
 -----------------------------
@@ -25,7 +24,7 @@ $ idf_tools.py install riscv-none-embed-gcc
 
 1. ULP-RISC-V 代码以 C 语言或汇编语言编写（必须使用 `.S` 扩展名)，必须放在组件目录中一个独立的目录中，例如 `ulp/`。
 
-.. 注意：当注册组件时（通过 ``idf_component_register``），该目录不应被添加至 ``SRC_DIRS`` 参数，因为目前 ULP-FSM 需要进行此步骤。如何正确添加 ULP 源文件，请见以下步骤。
+.. note: 当注册组件时（通过 ``idf_component_register``），该目录不应被添加至 ``SRC_DIRS`` 参数，因为目前 ULP-FSM 需要进行此步骤。如何正确添加 ULP 源文件，请见以下步骤。
 
 2. 注册后从组件 CMakeLists.txt 中调用 ``ulp_embed_binary`` 示例如下::
 
@@ -147,5 +146,3 @@ ULP-RISC-V 协处理器由定时器启动，调用 :cpp:func:`ulp_riscv_run` 即
 
 如需禁用定时器（有效防止 ULP 程序再次运行），请清除 ``RTC_CNTL_STATE0_REG`` 寄存器中的 ``RTC_CNTL_ULP_CP_SLP_TIMER_EN`` 位，此项操作可在 ULP 代码或主程序中进行。
 
-
-.. _riscv-embedded toolchain: https://xpack.github.io/riscv-none-embed-gcc/
diff --git a/tools/ci/config/build.yml b/tools/ci/config/build.yml
index 21d35a1469..eab66f9395 100644
--- a/tools/ci/config/build.yml
+++ b/tools/ci/config/build.yml
@@ -115,9 +115,6 @@ build_ssc_esp32s2:
     TEST_TYPE: "unit_test"
     PYTHON_VER: 3
   script:
-    # RISC-V toolchain is optional but ULP may need it, so install:
-    - $IDF_PATH/tools/idf_tools.py install riscv-none-embed-gcc
-    - . $IDF_PATH/export.sh
     - ${IDF_PATH}/tools/ci/find_apps_build_apps.sh
     - cd $CI_PROJECT_DIR/tools/unit-test-app
     - python tools/UnitTestParser.py ${BUILD_PATH}
@@ -155,9 +152,6 @@ build_esp_idf_tests_cmake_esp32s3:
     BUILD_PATH: ${CI_PROJECT_DIR}/build_${TEST_PREFIX}
     PYTHON_VER: 3
   script:
-    # RISC-V toolchain is optional but ULP may need it, so install:
-    - $IDF_PATH/tools/idf_tools.py install riscv-none-embed-gcc
-    - . $IDF_PATH/export.sh
     # it's not possible to build 100% out-of-tree and have the "artifacts"
     # mechanism work, but this is the next best thing
     - ${IDF_PATH}/tools/ci/find_apps_build_apps.sh
diff --git a/tools/tools.json b/tools/tools.json
index 3fa458330e..0f4a6cc904 100644
--- a/tools/tools.json
+++ b/tools/tools.json
@@ -51,7 +51,7 @@
           "win64": {
             "sha256": "58419852fefb7111fdec056ac2fd7c4bd09c1f4c17610a761a97b788413527cf",
             "size": 106855139,
-            "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r3/xtensa-esp32-elf-gcc8_4_0-esp-2020r3-win64.zip"
+            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_4_0-esp-2020r3-win64.zip"
           }
         }
       ]
@@ -169,58 +169,56 @@
       ]
     },
     {
-      "description": "Toolchain for RISC-V",
+      "description": "Toolchain for 32-bit RISC-V based on GCC",
       "export_paths": [
         [
-          "xPacks",
-          "riscv-none-embed-gcc",
-          "8.2.0-3.1",
+          "riscv32-esp-elf",
           "bin"
         ]
       ],
       "export_vars": {},
-      "info_url": "https://github.com/xpack-dev-tools/riscv-none-embed-gcc-xpack",
-      "install": "on_request",
-      "license": "MIT",
-      "name": "riscv-none-embed-gcc",
+      "info_url": "https://github.com/espressif/crosstool-NG",
+      "install": "always",
+      "license": "GPL-3.0-with-GCC-exception",
+      "name": "riscv32-esp-elf",
       "version_cmd": [
-        "riscv-none-embed-gcc",
+        "riscv32-esp-elf-gcc",
         "--version"
       ],
-      "version_regex": "(riscv-none-embed-gcc) \\(xPack GNU RISC-V Embedded GCC, 64-bit\\) (8.2.0)",
+      "version_regex": "\\(crosstool-NG\\s+(?:crosstool-ng-)?([0-9a-zA-Z\\.\\-_]+)\\)\\s*([0-9\\.]+)",
       "version_regex_replace": "\\1-\\2",
       "versions": [
         {
           "linux-amd64": {
-            "sha256": "3d40fab50ebad8424ff85748f25d2eaee50f86a5d5222abd7a45a2e490f1e4f5",
-            "size": 216042047,
-            "url": "https://github.com/xpack-dev-tools/riscv-none-embed-gcc-xpack/releases/download/v8.2.0-3.1/xpack-riscv-none-embed-gcc-8.2.0-3.1-linux-x64.tgz"
+            "sha256": "425454c5c4e2cde5dd2dd3a1d398befc70addf71547840fb6d0ec4b307b08894",
+            "size": 152042971,
+            "url": "https://dl.espressif.com/dl/toolchains/preview/riscv32-esp-elf-gcc8_4_0-crosstool-ng-1.24.0-123-g64eb9ff-linux-amd64.tar.gz"
           },
-          "linux-i686": {
-            "sha256": "2e856ee33ef544a2405183366cdf299da2cca697e8cc57627dfaad8ab4460a99",
-            "size": 219854326,
-            "url": "https://github.com/xpack-dev-tools/riscv-none-embed-gcc-xpack/releases/download/v8.2.0-3.1/xpack-riscv-none-embed-gcc-8.2.0-3.1-linux-x32.tgz"
+          "linux-armel": {
+            "sha256": "8ae098751b5196ca8a80d832cc9930bc4d639762a6cb22be3cfe0a8d71b2f230",
+            "size": 150801079,
+            "url": "https://dl.espressif.com/dl/toolchains/preview/riscv32-esp-elf-gcc8_4_0-crosstool-ng-1.24.0-123-g64eb9ff-linux-armel.tar.gz"
           },
           "macos": {
-            "sha256": "48ece50b7272a8e49e56e37f54f9962f93dce4ca44f1bb4c8113fab0230fbdf1",
-            "size": 214715632,
-            "url": "https://github.com/xpack-dev-tools/riscv-none-embed-gcc-xpack/releases/download/v8.2.0-3.1/xpack-riscv-none-embed-gcc-8.2.0-3.1-darwin-x64.tgz"
+            "sha256": "35b1aef85b7e6b4268774f627e8e835d087bcf8b9972cfb6436614aa2e40d4a9",
+            "size": 158594401,
+            "url": "https://dl.espressif.com/dl/toolchains/preview/riscv32-esp-elf-gcc8_4_0-crosstool-ng-1.24.0-123-g64eb9ff-macos.tar.gz"
           },
-          "name": "riscv-none-embed-gcc-8.2.0",
+          "name": "1.24.0.123_64eb9ff-8.4.0",
           "status": "recommended",
           "win32": {
-            "sha256": "78bcd52f7b404133de3b2f9568e7101c1de747f98db3a7b0d6251b75a1754867",
-            "size": 232387519,
-            "url": "https://github.com/xpack-dev-tools/riscv-none-embed-gcc-xpack/releases/download/v8.2.0-3.1/xpack-riscv-none-embed-gcc-8.2.0-3.1-win32-x32.zip"
+            "sha256": "4f576b08620f57c270ac677cc94dce2767fff72d27a539e348d448f63b480d1f",
+            "size": 190014086,
+            "url": "https://dl.espressif.com/dl/toolchains/preview/riscv32-esp-elf-gcc8_4_0-crosstool-ng-1.24.0-123-g64eb9ff-win32.zip"
           },
           "win64": {
-            "sha256": "98b60720607f1400081806d60d70796b30399f8b426e2c790a4abb0bffb9e5ec",
-            "size": 241927614,
-            "url": "https://github.com/xpack-dev-tools/riscv-none-embed-gcc-xpack/releases/download/v8.2.0-3.1/xpack-riscv-none-embed-gcc-8.2.0-3.1-win32-x64.zip"
+            "sha256": "51e392ed88498f3fc4ad07e9ff4b5225f6533b1c363ecd7dd67c10d8d31b6b23",
+            "size": 191565525,
+            "url": "https://dl.espressif.com/dl/toolchains/preview/riscv32-esp-elf-gcc8_4_0-crosstool-ng-1.24.0-123-g64eb9ff-win64.zip"
           }
         }
       ]
-    },
+    }
     {
       "description": "Toolchain for ESP32 ULP coprocessor",
       "export_paths": [

From 7fe16bae251ded4a2058d80f59ce6651586c96dc Mon Sep 17 00:00:00 2001
From: Marius Vikhammer <marius.vikhammer@espressif.com>
Date: Tue, 29 Dec 2020 10:00:45 +0800
Subject: [PATCH 2/2] tools: merge C3 changes into master

---
 docs/en/api-guides/tools/idf-tools-notes.inc  |   5 +
 .../api-guides/tools/idf-tools-notes.inc      |   5 +
 tools/ci/check_public_headers_exceptions.txt  |   1 +
 .../python_packages/ttfw_idf/CIScanTests.py   |   3 +-
 .../python_packages/ttfw_idf/IDFAssignTest.py |  13 +-
 tools/ci/python_packages/ttfw_idf/IDFDUT.py   |  23 ++-
 tools/ci/python_packages/ttfw_idf/__init__.py |   3 +-
 tools/cmake/dfu.cmake                         |   2 +
 tools/find_build_apps/common.py               |   1 +
 tools/idf_monitor.py                          |   1 +
 tools/idf_py_actions/constants.py             |   2 +-
 tools/ldgen/generation.py                     |   5 +-
 tools/test_idf_monitor/Makefile               |  30 ++++
 tools/test_idf_monitor/README.md              |   7 +-
 tools/test_idf_monitor/dummy.c                |  13 ++
 tools/test_idf_monitor/dummy.elf              | Bin 564 -> 0 bytes
 tools/test_idf_monitor/dummy_riscv.elf        | Bin 0 -> 35148 bytes
 tools/test_idf_monitor/dummy_xtensa.elf       | Bin 0 -> 4260 bytes
 tools/test_idf_monitor/idf_monitor_wrapper.py |  11 +-
 .../test_idf_monitor/run_test_idf_monitor.py  |  35 ++--
 tools/test_idf_monitor/tests/core1_out.txt    |  24 +--
 tools/test_idf_monitor/tests/riscv_panic1.txt | 151 ++++++++++++++++++
 .../tests/riscv_panic1_out.txt                |  79 +++++++++
 tools/tools.json                              |   4 +-
 tools/unit-test-app/CMakeLists.txt            |   2 +-
 tools/unit-test-app/configs/cxx_exceptions    |   2 +-
 tools/unit-test-app/configs/cxx_exceptions_c3 |   4 +
 tools/unit-test-app/configs/cxx_rtti_c3       |   5 +
 tools/unit-test-app/configs/default_2_c3      |   3 +
 tools/unit-test-app/configs/default_c3        |   3 +
 .../configs/freertos_compliance_c3            |   4 +
 .../unit-test-app/configs/freertos_options_c3 |  23 +++
 tools/unit-test-app/configs/release_c3        |   5 +
 tools/unit-test-app/configs/rom_options_c3    |   3 +
 .../unit-test-app/tools/ConfigDependency.yml  |   1 +
 35 files changed, 426 insertions(+), 47 deletions(-)
 create mode 100644 tools/test_idf_monitor/Makefile
 create mode 100644 tools/test_idf_monitor/dummy.c
 delete mode 100644 tools/test_idf_monitor/dummy.elf
 create mode 100644 tools/test_idf_monitor/dummy_riscv.elf
 create mode 100644 tools/test_idf_monitor/dummy_xtensa.elf
 create mode 100644 tools/test_idf_monitor/tests/riscv_panic1.txt
 create mode 100644 tools/test_idf_monitor/tests/riscv_panic1_out.txt
 create mode 100644 tools/unit-test-app/configs/cxx_exceptions_c3
 create mode 100644 tools/unit-test-app/configs/cxx_rtti_c3
 create mode 100644 tools/unit-test-app/configs/default_2_c3
 create mode 100644 tools/unit-test-app/configs/default_c3
 create mode 100644 tools/unit-test-app/configs/freertos_compliance_c3
 create mode 100644 tools/unit-test-app/configs/freertos_options_c3
 create mode 100644 tools/unit-test-app/configs/release_c3
 create mode 100644 tools/unit-test-app/configs/rom_options_c3

diff --git a/docs/en/api-guides/tools/idf-tools-notes.inc b/docs/en/api-guides/tools/idf-tools-notes.inc
index 9b076e96a3..33be40347a 100644
--- a/docs/en/api-guides/tools/idf-tools-notes.inc
+++ b/docs/en/api-guides/tools/idf-tools-notes.inc
@@ -15,6 +15,11 @@
 .. tool-xtensa-esp32s3-elf-notes
 
 
+---
+
+.. tool-riscv32-esp-elf-notes
+
+
 ---
 
 .. tool-esp32ulp-elf-notes
diff --git a/docs/zh_CN/api-guides/tools/idf-tools-notes.inc b/docs/zh_CN/api-guides/tools/idf-tools-notes.inc
index 37eda3df41..0e6f0fe70a 100644
--- a/docs/zh_CN/api-guides/tools/idf-tools-notes.inc
+++ b/docs/zh_CN/api-guides/tools/idf-tools-notes.inc
@@ -17,6 +17,11 @@
 .. tool-xtensa-esp32s3-elf-notes
 
 
+---
+
+.. tool-riscv32-esp-elf-notes
+
+
 ---
 
 .. tool-esp32ulp-elf-notes
diff --git a/tools/ci/check_public_headers_exceptions.txt b/tools/ci/check_public_headers_exceptions.txt
index 70c084c922..68a736e87b 100644
--- a/tools/ci/check_public_headers_exceptions.txt
+++ b/tools/ci/check_public_headers_exceptions.txt
@@ -112,6 +112,7 @@ components/soc/src/esp32/rtc_clk_common.h
 components/esp_hw_support/port/esp32/regi2c_ctrl.h
 components/esp_rom/include/esp32/rom/sha.h
 components/esp_rom/include/esp32/rom/secure_boot.h
+components/esp_rom/include/esp32c3/rom/spi_flash.h
 components/esp_rom/include/esp32s2/rom/spi_flash.h
 components/esp_rom/include/esp32s2/rom/cache.h
 components/esp_rom/include/esp32s2/rom/secure_boot.h
diff --git a/tools/ci/python_packages/ttfw_idf/CIScanTests.py b/tools/ci/python_packages/ttfw_idf/CIScanTests.py
index 20273378ee..959c28c1ac 100644
--- a/tools/ci/python_packages/ttfw_idf/CIScanTests.py
+++ b/tools/ci/python_packages/ttfw_idf/CIScanTests.py
@@ -16,7 +16,8 @@ TEST_LABELS = {
     'test_apps': 'BOT_LABEL_CUSTOM_TEST',
     'component_ut': ['BOT_LABEL_UNIT_TEST',
                      'BOT_LABEL_UNIT_TEST_32',
-                     'BOT_LABEL_UNIT_TEST_S2'],
+                     'BOT_LABEL_UNIT_TEST_S2',
+                     'BOT_LABEL_UNIT_TEST_C3'],
 }
 
 BUILD_ALL_LABELS = [
diff --git a/tools/ci/python_packages/ttfw_idf/IDFAssignTest.py b/tools/ci/python_packages/ttfw_idf/IDFAssignTest.py
index 04f33ae0cd..18714defde 100644
--- a/tools/ci/python_packages/ttfw_idf/IDFAssignTest.py
+++ b/tools/ci/python_packages/ttfw_idf/IDFAssignTest.py
@@ -80,17 +80,20 @@ class ExampleGroup(IDFCaseGroup):
     SORT_KEYS = CI_JOB_MATCH_KEYS = ['env_tag', 'target']
 
     LOCAL_BUILD_DIR = 'build_examples'
-    BUILD_JOB_NAMES = ['build_examples_cmake_{}'.format(target) for target in SUPPORTED_TARGETS]
+    EXAMPLE_TARGETS = SUPPORTED_TARGETS + PREVIEW_TARGETS
+    BUILD_JOB_NAMES = ['build_examples_cmake_{}'.format(target) for target in EXAMPLE_TARGETS]
 
 
 class TestAppsGroup(ExampleGroup):
     LOCAL_BUILD_DIR = 'build_test_apps'
-    BUILD_JOB_NAMES = ['build_test_apps_{}'.format(target) for target in SUPPORTED_TARGETS]
+    TEST_APP_TARGETS = SUPPORTED_TARGETS + PREVIEW_TARGETS
+    BUILD_JOB_NAMES = ['build_test_apps_{}'.format(target) for target in TEST_APP_TARGETS]
 
 
 class ComponentUTGroup(TestAppsGroup):
     LOCAL_BUILD_DIR = 'build_component_ut'
-    BUILD_JOB_NAMES = ['build_component_ut_{}'.format(target) for target in SUPPORTED_TARGETS]
+    UNIT_TEST_TARGETS = SUPPORTED_TARGETS + PREVIEW_TARGETS
+    BUILD_JOB_NAMES = ['build_component_ut_{}'.format(target) for target in UNIT_TEST_TARGETS]
 
 
 class UnitTestGroup(IDFCaseGroup):
@@ -98,7 +101,8 @@ class UnitTestGroup(IDFCaseGroup):
     CI_JOB_MATCH_KEYS = ['test environment']
 
     LOCAL_BUILD_DIR = 'tools/unit-test-app/builds'
-    BUILD_JOB_NAMES = ['build_esp_idf_tests_cmake_{}'.format(target) for target in SUPPORTED_TARGETS]
+    UNIT_TEST_TARGETS = SUPPORTED_TARGETS + PREVIEW_TARGETS
+    BUILD_JOB_NAMES = ['build_esp_idf_tests_cmake_{}'.format(target) for target in UNIT_TEST_TARGETS]
 
     MAX_CASE = 50
     ATTR_CONVERT_TABLE = {
@@ -107,6 +111,7 @@ class UnitTestGroup(IDFCaseGroup):
     DUT_CLS_NAME = {
         'esp32': 'ESP32DUT',
         'esp32s2': 'ESP32S2DUT',
+        'esp32c3': 'ESP32C3DUT',
         'esp8266': 'ESP8266DUT',
     }
 
diff --git a/tools/ci/python_packages/ttfw_idf/IDFDUT.py b/tools/ci/python_packages/ttfw_idf/IDFDUT.py
index aa62584d32..1a942f8dcc 100644
--- a/tools/ci/python_packages/ttfw_idf/IDFDUT.py
+++ b/tools/ci/python_packages/ttfw_idf/IDFDUT.py
@@ -463,6 +463,9 @@ class ESP32DUT(IDFDUT):
     def _get_rom(cls):
         return esptool.ESP32ROM
 
+    def erase_partition(self, esp, partition):
+        raise NotImplementedError()
+
 
 class ESP32S2DUT(IDFDUT):
     TARGET = "esp32s2"
@@ -472,6 +475,21 @@ class ESP32S2DUT(IDFDUT):
     def _get_rom(cls):
         return esptool.ESP32S2ROM
 
+    def erase_partition(self, esp, partition):
+        raise NotImplementedError()
+
+
+class ESP32C3DUT(IDFDUT):
+    TARGET = "esp32c3"
+    TOOLCHAIN_PREFIX = "riscv32-esp-elf-"
+
+    @classmethod
+    def _get_rom(cls):
+        return esptool.ESP32C3ROM
+
+    def erase_partition(self, esp, partition):
+        raise NotImplementedError()
+
 
 class ESP8266DUT(IDFDUT):
     TARGET = "esp8266"
@@ -481,9 +499,12 @@ class ESP8266DUT(IDFDUT):
     def _get_rom(cls):
         return esptool.ESP8266ROM
 
+    def erase_partition(self, esp, partition):
+        raise NotImplementedError()
+
 
 def get_target_by_rom_class(cls):
-    for c in [ESP32DUT, ESP32S2DUT, ESP8266DUT, IDFQEMUDUT]:
+    for c in [ESP32DUT, ESP32S2DUT, ESP32C3DUT, ESP8266DUT, IDFQEMUDUT]:
         if c._get_rom() == cls:
             return c.TARGET
     return None
diff --git a/tools/ci/python_packages/ttfw_idf/__init__.py b/tools/ci/python_packages/ttfw_idf/__init__.py
index 03673807b6..9366dcdb07 100644
--- a/tools/ci/python_packages/ttfw_idf/__init__.py
+++ b/tools/ci/python_packages/ttfw_idf/__init__.py
@@ -23,13 +23,14 @@ import junit_xml
 from tiny_test_fw import TinyFW, Utility
 from .DebugUtils import OCDBackend, GDBBackend, CustomProcess  # noqa: export DebugUtils for users
 from .IDFApp import IDFApp, Example, LoadableElfTestApp, UT, TestApp, ComponentUTApp  # noqa: export all Apps for users
-from .IDFDUT import IDFDUT, ESP32DUT, ESP32S2DUT, ESP8266DUT, ESP32QEMUDUT  # noqa: export DUTs for users
+from .IDFDUT import IDFDUT, ESP32DUT, ESP32S2DUT, ESP32C3DUT, ESP8266DUT, ESP32QEMUDUT  # noqa: export DUTs for users
 from .unity_test_parser import TestResults, TestFormat
 
 # pass TARGET_DUT_CLS_DICT to Env.py to avoid circular dependency issue.
 TARGET_DUT_CLS_DICT = {
     'ESP32': ESP32DUT,
     'ESP32S2': ESP32S2DUT,
+    'ESP32C3': ESP32C3DUT,
 }
 
 
diff --git a/tools/cmake/dfu.cmake b/tools/cmake/dfu.cmake
index ce36656d72..45f7470e77 100644
--- a/tools/cmake/dfu.cmake
+++ b/tools/cmake/dfu.cmake
@@ -9,6 +9,8 @@ function(__add_dfu_targets)
         set(dfu_pid "2")
     elseif("${target}" STREQUAL "esp32s3")
         set(dfu_pid "4")
+    elseif("${target}" STREQUAL "esp32c3")
+        return()
     elseif("${target}" STREQUAL "linux")
         return()
     else()
diff --git a/tools/find_build_apps/common.py b/tools/find_build_apps/common.py
index 12fd9f000d..1b3039ea56 100644
--- a/tools/find_build_apps/common.py
+++ b/tools/find_build_apps/common.py
@@ -295,6 +295,7 @@ class BuildSystem:
         'ESP32': 'esp32',
         'ESP32-S2': 'esp32s2',
         'ESP32-S3': 'esp32s3',
+        'ESP32-C3': 'esp32c3',
         'Linux': 'linux',
     }
 
diff --git a/tools/idf_monitor.py b/tools/idf_monitor.py
index e2940e9f41..c4290e83db 100755
--- a/tools/idf_monitor.py
+++ b/tools/idf_monitor.py
@@ -391,6 +391,7 @@ class SerialReader(StoppableThread):
             self.serial.baudrate = self.baud
             self.serial.rts = True  # Force an RTS reset on open
             self.serial.open()
+            time.sleep(0.005)  # Add a delay to meet the requirements of minimal EN low time (2ms for ESP32-C3)
             self.serial.rts = False
             self.serial.dtr = self.serial.dtr   # usbser.sys workaround
         try:
diff --git a/tools/idf_py_actions/constants.py b/tools/idf_py_actions/constants.py
index d4a96eaace..d2c11999fe 100644
--- a/tools/idf_py_actions/constants.py
+++ b/tools/idf_py_actions/constants.py
@@ -38,4 +38,4 @@ GENERATORS = collections.OrderedDict([
 
 SUPPORTED_TARGETS = ["esp32", "esp32s2"]
 
-PREVIEW_TARGETS = ["esp32s3", "linux"]
+PREVIEW_TARGETS = ["esp32s3", "esp32c3", "linux"]
diff --git a/tools/ldgen/generation.py b/tools/ldgen/generation.py
index f1f22e0e31..addb6bdf33 100644
--- a/tools/ldgen/generation.py
+++ b/tools/ldgen/generation.py
@@ -597,7 +597,8 @@ class SectionsInfo(dict):
 
     def _get_infos_from_file(self, info):
         # Object file line: '{object}:  file format elf32-xtensa-le'
-        object = Fragment.ENTITY.setResultsName("object") + Literal(":").suppress() + Literal("file format elf32-xtensa-le").suppress()
+        obj = Fragment.ENTITY.setResultsName("object") + Literal(":").suppress() + \
+            (Literal("file format elf32-") + (Literal("xtensa-le") | Literal("littleriscv"))).suppress()
 
         # Sections table
         header = Suppress(Literal("Sections:") + Literal("Idx") + Literal("Name") + Literal("Size") + Literal("VMA") +
@@ -607,7 +608,7 @@ class SectionsInfo(dict):
                                                                    Optional(Literal(","))))
 
         # Content is object file line + sections table
-        content = Group(object + header + Group(ZeroOrMore(entry)).setResultsName("sections"))
+        content = Group(obj + header + Group(ZeroOrMore(entry)).setResultsName("sections"))
 
         parser = Group(ZeroOrMore(content)).setResultsName("contents")
 
diff --git a/tools/test_idf_monitor/Makefile b/tools/test_idf_monitor/Makefile
new file mode 100644
index 0000000000..14434123c4
--- /dev/null
+++ b/tools/test_idf_monitor/Makefile
@@ -0,0 +1,30 @@
+# The purpose of this Makefile is to build dummy ELF files required to run idf_monitor tests.
+
+# Make sure the toolchains are in the PATH:
+PREFIX_XTENSA ?= xtensa-esp32-elf-
+PREFIX_RISCV ?= riscv32-esp-elf-
+
+PROG_XTENSA := dummy_xtensa.elf
+PROG_RISCV := dummy_riscv.elf
+
+# This actually depends on the value of portUSING_MPU_WRAPPERS.
+# I.e. ESP32-S2 would also have TASK_NAME_OFFSET=52 since portUSING_MPU_WRAPPERS is 0.
+CPPFLAGS_XTENSA := -DTASK_NAME_OFFSET=56
+CPPFLAGS_RISCV := -DTASK_NAME_OFFSET=52
+
+all: $(PROG_XTENSA) $(PROG_RISCV)
+
+$(PROG_XTENSA): dummy.c
+	$(PREFIX_XTENSA)gcc $(CPPFLAGS_XTENSA) --specs=nosys.specs -o $@ -g $^
+	chmod -x $@
+
+# ^ chmod is there so that we don't have to add ELF files to executables list
+
+$(PROG_RISCV): dummy.c
+	$(PREFIX_RISCV)gcc $(CPPFLAGS_RISCV) --specs=nosys.specs -o $@ -g $^
+	chmod -x $@
+
+clean:
+	rm -f $(PROG_XTENSA) $(PROG_RISCV)
+
+.PHONY: clean all
diff --git a/tools/test_idf_monitor/README.md b/tools/test_idf_monitor/README.md
index 16b97fb970..0464014afc 100644
--- a/tools/test_idf_monitor/README.md
+++ b/tools/test_idf_monitor/README.md
@@ -5,9 +5,4 @@ Use `run_test_idf_monitor.py` in order to run the test.
 New tests can be added into `test_list` of `run_test_idf_monitor.py` and placing the corresponding files into the
 `tests` directory.
 
-Note: The `idf_monitor` is tested by a dummy ELF file which was generated by running the following commands::
-
-    dd if=/dev/zero of=tmp.bin bs=1 count=4
-    xtensa-esp32-elf-objcopy -I binary -O elf32-xtensa-le -B xtensa tmp.bin tmp.o
-    xtensa-esp32-elf-ld --defsym _start=0x40000000 tmp.o -o dummy.elf
-    chmod -x dummy.elf
+Note: The `idf_monitor` is tested with dummy ELF files. Run `make` to build the ELF files for supported architectures.
diff --git a/tools/test_idf_monitor/dummy.c b/tools/test_idf_monitor/dummy.c
new file mode 100644
index 0000000000..874a577d74
--- /dev/null
+++ b/tools/test_idf_monitor/dummy.c
@@ -0,0 +1,13 @@
+/* Produces a minimal ELF file for espcoredump tests */
+
+typedef struct {
+    char stuff[TASK_NAME_OFFSET];
+    char pcTaskName[16];
+} TCB_t;
+
+TCB_t foo;
+
+int main(void)
+{
+    return 0;
+}
diff --git a/tools/test_idf_monitor/dummy.elf b/tools/test_idf_monitor/dummy.elf
deleted file mode 100644
index 70a22cc5b1561760276a2bb49192d0c9303b385d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 564
zcma)3!D_-l6nu%bQ0O6EyogY5J$b2jbJ0sZddSITLjne>l<Z!VLVuyZ>KE9VO<pO9
z2OrGNoA+i1Hu+v{)=?CRRxCSdRl30NqZJEz!TeQ*66+q@G$6xCJOY17b9Xv;o6Fq!
zy5YTch4mKJo3#y@A_F8b>!Ecea=DJ1J|$64!Rk-oeuK{1`_#*hUU&3+M~lg;qpeTI
zA3oU{SDi~S&fD7ecg@t~&Z(me4>RSl=(#z&yC!h*?E`@C+k*8wpbb0n2%txc|6ry9
f%nTMe4qbD6fqnpHa!yWwC*XhHGcFp;v^4J*{Bl2{

diff --git a/tools/test_idf_monitor/dummy_riscv.elf b/tools/test_idf_monitor/dummy_riscv.elf
new file mode 100644
index 0000000000000000000000000000000000000000..5440c0b9f5625112597d649b6876212b2a5d5420
GIT binary patch
literal 35148
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
E0dbtWg8%>k

literal 0
HcmV?d00001

diff --git a/tools/test_idf_monitor/dummy_xtensa.elf b/tools/test_idf_monitor/dummy_xtensa.elf
new file mode 100644
index 0000000000000000000000000000000000000000..db55392b4020b1c074f72c82dbab24c1d9ce3678
GIT binary patch
literal 4260
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
MeH5K7-6>@EPn)ro_y7O^

literal 0
HcmV?d00001

diff --git a/tools/test_idf_monitor/idf_monitor_wrapper.py b/tools/test_idf_monitor/idf_monitor_wrapper.py
index 20626a938e..b11bb1d5f3 100644
--- a/tools/test_idf_monitor/idf_monitor_wrapper.py
+++ b/tools/test_idf_monitor/idf_monitor_wrapper.py
@@ -27,9 +27,6 @@ except ImportError:
     import idf_monitor
 
 
-ELF_FILE = 'dummy.elf'  # ELF file used for starting the monitor
-
-
 def monitor_serial_reader_state(serial_reader, file_to_create):
     """
     The purpose of this wrapper is to monitor the serial reader state of idf_monitor.py. file_to_create is created
@@ -47,10 +44,16 @@ def main():
     parser.add_argument('--port')
     parser.add_argument('--print_filter')
     parser.add_argument('--serial_alive_file')
+    parser.add_argument('--toolchain-prefix')
+    parser.add_argument('--decode-panic', default="disable")
+    parser.add_argument('--target', default=None)
+    parser.add_argument('--elf-file')
     args = parser.parse_args()
 
     serial_instance = serial.serial_for_url(args.port, 115200, do_not_open=True)
-    monitor = idf_monitor.Monitor(serial_instance, ELF_FILE, args.print_filter, 'make', toolchain_prefix='xtensa-esp32-elf-', eol='CR')
+    monitor = idf_monitor.Monitor(serial_instance, args.elf_file, args.print_filter, 'make',
+                                  toolchain_prefix=args.toolchain_prefix, eol='CR',
+                                  decode_panic=args.decode_panic, target=args.target)
     sys.stderr.write('Monitor instance has been created.\n')
     monitor_thread = threading.Thread(target=monitor_serial_reader_state,
                                       args=(monitor.serial_reader, args.serial_alive_file))
diff --git a/tools/test_idf_monitor/run_test_idf_monitor.py b/tools/test_idf_monitor/run_test_idf_monitor.py
index 5a3ebb9627..d928353d11 100755
--- a/tools/test_idf_monitor/run_test_idf_monitor.py
+++ b/tools/test_idf_monitor/run_test_idf_monitor.py
@@ -29,16 +29,20 @@ import threading
 import errno
 import tempfile
 
+XTENSA_ARGS = '--toolchain-prefix xtensa-esp32-elf-'
+RISCV_ARGS = '--decode-panic backtrace --target esp32c3 --toolchain-prefix riscv32-esp-elf-'
+
 test_list = (
-    # Add new tests here. All files should be placed in IN_DIR. Columns are:
-    # Input file            Filter string                                               File with expected output   Timeout
-    ('in1.txt',             '',                                                         'in1f1.txt',                60),
-    ('in1.txt',             '*:V',                                                      'in1f1.txt',                60),
-    ('in1.txt',             'hello_world',                                              'in1f2.txt',                60),
-    ('in1.txt',             '*:N',                                                      'in1f3.txt',                60),
-    ('in2.txt',             'boot mdf_device_handle:I mesh:E vfs:I',                    'in2f1.txt',               420),
-    ('in2.txt',             'vfs',                                                      'in2f2.txt',               420),
-    ('core1.txt',           '',                                                         'core1_out.txt',            60),
+    # Add new tests here. All files should be placed in IN_DIR. Columns are
+    # Input file            Filter string                                File with expected output   Timeout    ELF file        Extra args
+    ('in1.txt',             '',                                          'in1f1.txt',                60,    'dummy_xtensa.elf',       XTENSA_ARGS),
+    ('in1.txt',             '*:V',                                       'in1f1.txt',                60,    'dummy_xtensa.elf',       XTENSA_ARGS),
+    ('in1.txt',             'hello_world',                               'in1f2.txt',                60,    'dummy_xtensa.elf',       XTENSA_ARGS),
+    ('in1.txt',             '*:N',                                       'in1f3.txt',                60,    'dummy_xtensa.elf',       XTENSA_ARGS),
+    ('in2.txt',             'boot mdf_device_handle:I mesh:E vfs:I',     'in2f1.txt',               420,    'dummy_xtensa.elf',       XTENSA_ARGS),
+    ('in2.txt',             'vfs',                                       'in2f2.txt',               420,    'dummy_xtensa.elf',       XTENSA_ARGS),
+    ('core1.txt',           '',                                          'core1_out.txt',            60,    'dummy_xtensa.elf',       XTENSA_ARGS),
+    ('riscv_panic1.txt',    '',                                          'riscv_panic1_out.txt',     60,    'dummy_riscv.elf',        RISCV_ARGS),
 )
 
 IN_DIR = 'tests/'       # tests are in this directory
@@ -78,9 +82,12 @@ class TestRunner(object):
         return self
 
     def __exit__(self, type, value, traceback):
-        self.serversocket.shutdown(socket.SHUT_RDWR)
-        self.serversocket.close()
-        print('Socket was closed successfully')
+        try:
+            self.serversocket.shutdown(socket.SHUT_RDWR)
+            self.serversocket.close()
+            print('Socket was closed successfully')
+        except (OSError, socket.error):
+            pass
 
     def accept_connection(self):
         """ returns a socket for sending the input for idf_monitor which must be closed before calling this again. """
@@ -102,7 +109,9 @@ def test_iteration(runner, test):
             monitor_cmd = [sys.executable, IDF_MONITOR_WAPPER,
                            '--port', 'socket://{}:{}?logging=debug'.format(HOST, runner.port),
                            '--print_filter', test[1],
-                           '--serial_alive_file', SERIAL_ALIVE_FILE]
+                           '--serial_alive_file', SERIAL_ALIVE_FILE,
+                           '--elf-file', test[4]]
+            monitor_cmd += test[5].split()
             (master_fd, slave_fd) = pty.openpty()
             print('\t', ' '.join(monitor_cmd), sep='')
             print('\tstdout="{}" stderr="{}" stdin="{}"'.format(o_f.name, e_f.name, os.ttyname(slave_fd)))
diff --git a/tools/test_idf_monitor/tests/core1_out.txt b/tools/test_idf_monitor/tests/core1_out.txt
index 1b9c14d192..89e28a3eaf 100644
--- a/tools/test_idf_monitor/tests/core1_out.txt
+++ b/tools/test_idf_monitor/tests/core1_out.txt
@@ -40,7 +40,7 @@ espcoredump.py v0.4-dev
 ===============================================================
 ==================== ESP32 CORE DUMP START ====================
 
-Crashed task handle: 0x3ffb5e80, name: '', GDB name: 'process 1073438336'
+Crashed task handle: 0x3ffb5e80, name: 'main', GDB name: 'process 1073438336'
 
 ================== CURRENT THREAD REGISTERS ===================
 exccause       0x1d (StoreProhibitedCause)
@@ -112,41 +112,41 @@ a15            0x0	0
   7    process 1073432444 0x40087e10 in ?? ()
   8    process 1073413520 0x400812c4 in ?? ()
 
-==================== THREAD 1 (TCB: 0x3ffb5e80, name: '') =====================
+==================== THREAD 1 (TCB: 0x3ffb5e80, name: 'main') =====================
 #0  0x400e37f7 in ?? ()
 #1  0x400d0c31 in ?? ()
 #2  0x40087018 in ?? ()
 
-==================== THREAD 2 (TCB: 0x3ffb6d48, name: '') =====================
+==================== THREAD 2 (TCB: 0x3ffb6d48, name: 'IDLE1') =====================
 #0  0x40087010 in ?? ()
 
-==================== THREAD 3 (TCB: 0x3ffb65e4, name: '') =====================
+==================== THREAD 3 (TCB: 0x3ffb65e4, name: 'IDLE0') =====================
 #0  0x40087010 in ?? ()
 
-==================== THREAD 4 (TCB: 0x3ffb77a0, name: '') =====================
+==================== THREAD 4 (TCB: 0x3ffb77a0, name: 'Tmr Svc') =====================
 #0  0x400812c4 in ?? ()
 #1  0x40089806 in ?? ()
 #2  0x400898f3 in ?? ()
 #3  0x40087018 in ?? ()
 
-==================== THREAD 5 (TCB: 0x3ffb4bf0, name: '') =====================
+==================== THREAD 5 (TCB: 0x3ffb4bf0, name: 'dport') =====================
 #0  0x400812c4 in ?? ()
 #1  0x4008913b in ?? ()
 #2  0x400d0d5c in ?? ()
 #3  0x40087018 in ?? ()
 
-==================== THREAD 6 (TCB: 0x3ffafab4, name: '') =====================
+==================== THREAD 6 (TCB: 0x3ffafab4, name: 'esp_timer') =====================
 #0  0x400812c4 in ?? ()
 #1  0x40087e10 in ?? ()
 #2  0x400d1f4b in ?? ()
 #3  0x40087018 in ?? ()
 
-==================== THREAD 7 (TCB: 0x3ffb477c, name: '') =====================
+==================== THREAD 7 (TCB: 0x3ffb477c, name: 'ipc1') =====================
 #0  0x40087e10 in ?? ()
 #1  0x40081a2b in ?? ()
 #2  0x40087018 in ?? ()
 
-==================== THREAD 8 (TCB: 0x3ffafd90, name: '') =====================
+==================== THREAD 8 (TCB: 0x3ffafd90, name: 'ipc0') =====================
 #0  0x400812c4 in ?? ()
 #1  0x40087e10 in ?? ()
 #2  0x40081a2b in ?? ()
@@ -155,7 +155,11 @@ a15            0x0	0
 
 ======================= ALL MEMORY REGIONS ========================
 Name   Address   Size   Attrs
-.data 0x400054 0x4 RW A
+.text 0x400074 0x134 R XA
+.eh_frame 0x4001a8 0x4 R  A
+.ctors 0x4011ac 0x8 RW A
+.dtors 0x4011b4 0x8 RW A
+.data 0x4011bc 0x4 RW A
 .coredump.tasks.data 0x3ffb5e80 0x15c RW 
 .coredump.tasks.data 0x3ffb5cf0 0x188 RW 
 .coredump.tasks.data 0x3ffb6d48 0x15c RW 
diff --git a/tools/test_idf_monitor/tests/riscv_panic1.txt b/tools/test_idf_monitor/tests/riscv_panic1.txt
new file mode 100644
index 0000000000..6afdc951c9
--- /dev/null
+++ b/tools/test_idf_monitor/tests/riscv_panic1.txt
@@ -0,0 +1,151 @@
+ESP-ROM:esp32c3-20200918
+Build:Sep 18 2020
+rst:0xc (RTC_SW_CPU_RST),boot:0xc (SPI_FAST_FLASH_BOOT)
+Saved PC:0x40381f24
+SPIWP:0xee
+mode:DOUT, clock div:2
+load:0x3fcd6100,len:0x14
+load:0x3fcd6114,len:0x11d8
+load:0x403d0000,len:0xd0c
+load:0x403d2000,len:0x1b84
+entry 0x403d0062
+␛[0;33mW (37) bootloader_random: RNG for ESP32-C3 not currently supported␛[0m
+␛[0;33mW (184) bootloader_random: RNG for ESP32-C3 not currently supported␛[0m
+␛[0;33mW (196) spi_flash: Detected size(4096k) larger than the size in the binary image header(2048k). Using the size in the binary image header.␛[0m
+Enter test name: Got test name: test_abort
+
+abort() was called at PC 0x42003863 on core 0
+Core  0 register dump:
+MEPC    : 0x403825fa  RA      : 0x40382a3e  SP      : 0x3fc8cd5c  GP      : 0x3fc887e0  
+TP      : 0xa5a5a5a5  T0      : 0x37363534  T1      : 0x7271706f  T2      : 0x33323130  
+S0/FP   : 0x00000004  S1      : 0x3fc8cdc0  A0      : 0x3fc8cd88  A1      : 0x3fc8cdbe  
+A2      : 0x00000000  A3      : 0x3fc8cdb5  A4      : 0x00000001  A5      : 0x3fc8a000  
+A6      : 0x7a797877  A7      : 0x76757473  S2      : 0xa5a5a5a5  S3      : 0xa5a5a5a5  
+S4      : 0xa5a5a5a5  S5      : 0xa5a5a5a5  S6      : 0xa5a5a5a5  S7      : 0xa5a5a5a5  
+S8      : 0xa5a5a5a5  S9      : 0xa5a5a5a5  S10     : 0xa5a5a5a5  S11     : 0xa5a5a5a5  
+T3      : 0x6e6d6c6b  T4      : 0x6a696867  T5      : 0x66656463  T6      : 0x62613938  
+MSTATUS : 0x00001881  MTVEC   : 0x40380001  MCAUSE  : 0x00000007  MTVAL   : 0x00000000  
+MHARTID : 0x00000000  
+
+Stack memory:
+3fc8cd5c: 0xa5a5a5a5 0x3fc8ce34 0x3fc8cdbc 0x403870ce 0x00000001 0x00000004 0x3fc8aaf4 0x3fc893b0
+3fc8cd7c: 0x3fc8cdc0 0x3fc893cc 0x3fc8cdbc 0x726f6261 0x20292874 0x20736177 0x6c6c6163 0x61206465
+3fc8cd9c: 0x43502074 0x34783020 0x33303032 0x20333638 0x63206e6f 0x2065726f 0x00000030 0x3fc80000
+3fc8cdbc: 0xa5a50030 0x30303234 0x33363833 0x42003900 0x00000001 0xa5a5a5a5 0x3fc89cc0 0x42003866
+3fc8cddc: 0x3fc8a000 0x0000000a 0x420018fc 0x420039ea 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0x42012ea6
+3fc8cdfc: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0x40384206 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8ce1c: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0x00000154 0x3fc8cd4c 0x00000349
+3fc8ce3c: 0x3fc89964 0x3fc89964 0x3fc8ce34 0x3fc8995c 0x00000018 0xdf6337cf 0xbccacfdd 0x3fc8ce34
+3fc8ce5c: 0x00000000 0x00000001 0x3fc8be30 0x6e69616d 0xfa3b3d00 0x3f2a8cb8 0x002d1f13 0x00000000
+3fc8ce7c: 0x3fc8ce20 0x00000001 0x00000000 0x00000000 0x00000000 0x0000000b 0x3fc8a950 0x3fc8a9b8
+3fc8ce9c: 0x3fc8aa20 0x00000000 0x00000000 0x00000001 0x00000000 0x00000000 0x00000000 0x42005b6c
+3fc8cebc: 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000
+3fc8cedc: 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000
+3fc8cefc: 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000
+3fc8cf1c: 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000
+3fc8cf3c: 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000
+3fc8cf5c: 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000
+3fc8cf7c: 0x00000000 0x00000000 0x3fc8ce00 0x00000900 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8cf9c: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8cfbc: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8cfdc: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8cffc: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d01c: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d03c: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d05c: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d07c: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d09c: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d0bc: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d0dc: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d0fc: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d11c: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d13c: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+
+
+
+ELF file SHA256: 72e88c31482c8900
+
+Rebooting...
+x�jESP-ROM:esp32c3-20200918
+Build:Sep 18 2020
+rst:0xc (RTC_SW_CPU_RST),boot:0xc (SPI_FAST_FLASH_BOOT)
+Saved PC:0x40381f24
+SPIWP:0xee
+mode:DOUT, clock div:2
+load:0x3fcd6100,len:0x14
+load:0x3fcd6114,len:0x11d8
+load:0x403d0000,len:0xd0c
+load:0x403d2000,len:0x1b84
+entry 0x403d0062
+␛[0;33mW (37) bootloader_random: RNG for ESP32-C3 not currently supported␛[0m
+␛[0;33mW (184) bootloader_random: RNG for ESP32-C3 not currently supported␛[0m
+␛[0;33mW (196) spi_flash: Detected size(4096k) larger than the size in the binary image header(2048k). Using the size in the binary image header.␛[0m
+Enter test name: Got test name: test_illegal_instruction
+Guru Meditation Error: Core  0 panic'ed (Illegal instruction). Exception was unhandled.
+
+Core  0 register dump:
+MEPC    : 0x420037ce  RA      : 0x42003a18  SP      : 0x3fc8cdec  GP      : 0x3fc887e0  
+TP      : 0xa5a5a5a5  T0      : 0x7f7f7f7f  T1      : 0x7f7f7f7f  T2      : 0xffffffff  
+S0/FP   : 0x3fc89cc0  S1      : 0xa5a5a5a5  A0      : 0x00000000  A1      : 0x3c022b0c  
+A2      : 0x00000000  A3      : 0x00000000  A4      : 0x00000000  A5      : 0x7f7f7f7f  
+A6      : 0x420019ee  A7      : 0xa5a5a5a5  S2      : 0xa5a5a5a5  S3      : 0xa5a5a5a5  
+S4      : 0xa5a5a5a5  S5      : 0xa5a5a5a5  S6      : 0xa5a5a5a5  S7      : 0xa5a5a5a5  
+S8      : 0xa5a5a5a5  S9      : 0xa5a5a5a5  S10     : 0xa5a5a5a5  S11     : 0xa5a5a5a5  
+T3      : 0xa5a5a5a5  T4      : 0xa5a5a5a5  T5      : 0xa5a5a5a5  T6      : 0xa5a5a5a5  
+MSTATUS : 0x00001881  MTVEC   : 0x40380001  MCAUSE  : 0x00000002  MTVAL   : 0x00000000  
+MHARTID : 0x00000000  
+
+Stack memory:
+3fc8cdec: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0x42012ea6 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0x40384206
+3fc8ce0c: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8ce2c: 0xa5a5a5a5 0x00000154 0x3fc8cd4c 0x0000051e 0x3fc89964 0x3fc89964 0x3fc8ce34 0x3fc8995c
+3fc8ce4c: 0x00000018 0xdf6337cf 0xbccacfdd 0x3fc8ce34 0x00000000 0x00000001 0x3fc8be30 0x6e69616d
+3fc8ce6c: 0xfa3b3d00 0x3f2a8cb8 0x002d1f13 0x00000000 0x3fc8ce20 0x00000001 0x00000000 0x00000000
+3fc8ce8c: 0x00000000 0x0000000b 0x3fc8a950 0x3fc8a9b8 0x3fc8aa20 0x00000000 0x00000000 0x00000001
+3fc8ceac: 0x00000000 0x00000000 0x00000000 0x42005b6c 0x00000000 0x00000000 0x00000000 0x00000000
+3fc8cecc: 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000
+3fc8ceec: 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000
+3fc8cf0c: 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000
+3fc8cf2c: 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000
+3fc8cf4c: 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000
+3fc8cf6c: 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x3fc8ce00 0x00000900
+3fc8cf8c: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8cfac: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8cfcc: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8cfec: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d00c: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d02c: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d04c: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d06c: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d08c: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d0ac: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d0cc: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d0ec: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d10c: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d12c: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d14c: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d16c: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d18c: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d1ac: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+3fc8d1cc: 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5 0xa5a5a5a5
+
+
+
+ELF file SHA256: 72e88c31482c8900
+
+Rebooting...
+x�jESP-ROM:esp32c3-20200918
+Build:Sep 18 2020
+rst:0xc (RTC_SW_CPU_RST),boot:0xc (SPI_FAST_FLASH_BOOT)
+Saved PC:0x40381f24
+SPIWP:0xee
+mode:DOUT, clock div:2
+load:0x3fcd6100,len:0x14
+load:0x3fcd6114,len:0x11d8
+load:0x403d0000,len:0xd0c
+load:0x403d2000,len:0x1b84
+entry 0x403d0062
+␛[0;33mW (37) bootloader_random: RNG for ESP32-C3 not currently supported␛[0m
+␛[0;33mW (184) bootloader_random: RNG for ESP32-C3 not currently supported␛[0m
+␛[0;33mW (196) spi_flash: Detected size(4096k) larger than the size in the binary image header(2048k). Using the size in the binary image header.␛[0m
+Enter test name: 
diff --git a/tools/test_idf_monitor/tests/riscv_panic1_out.txt b/tools/test_idf_monitor/tests/riscv_panic1_out.txt
new file mode 100644
index 0000000000..f26d017fd3
--- /dev/null
+++ b/tools/test_idf_monitor/tests/riscv_panic1_out.txt
@@ -0,0 +1,79 @@
+ESP-ROM:esp32c3-20200918
+Build:Sep 18 2020
+rst:0xc (RTC_SW_CPU_RST),boot:0xc (SPI_FAST_FLASH_BOOT)
+Saved PC:0x40381f24
+SPIWP:0xee
+mode:DOUT, clock div:2
+load:0x3fcd6100,len:0x14
+load:0x3fcd6114,len:0x11d8
+load:0x403d0000,len:0xd0c
+load:0x403d2000,len:0x1b84
+entry 0x403d0062
+␛[0;33mW (37) bootloader_random: RNG for ESP32-C3 not currently supported␛[0m
+␛[0;33mW (184) bootloader_random: RNG for ESP32-C3 not currently supported␛[0m
+␛[0;33mW (196) spi_flash: Detected size(4096k) larger than the size in the binary image header(2048k). Using the size in the binary image header.␛[0m
+Enter test name: Got test name: test_abort
+abort() was called at PC 0x42003863 on core 0
+Core  0 register dump:
+MEPC    : 0x403825fa  RA      : 0x40382a3e  SP      : 0x3fc8cd5c  GP      : 0x3fc887e0  
+TP      : 0xa5a5a5a5  T0      : 0x37363534  T1      : 0x7271706f  T2      : 0x33323130  
+S0/FP   : 0x00000004  S1      : 0x3fc8cdc0  A0      : 0x3fc8cd88  A1      : 0x3fc8cdbe  
+A2      : 0x00000000  A3      : 0x3fc8cdb5  A4      : 0x00000001  A5      : 0x3fc8a000  
+A6      : 0x7a797877  A7      : 0x76757473  S2      : 0xa5a5a5a5  S3      : 0xa5a5a5a5  
+S4      : 0xa5a5a5a5  S5      : 0xa5a5a5a5  S6      : 0xa5a5a5a5  S7      : 0xa5a5a5a5  
+S8      : 0xa5a5a5a5  S9      : 0xa5a5a5a5  S10     : 0xa5a5a5a5  S11     : 0xa5a5a5a5  
+T3      : 0x6e6d6c6b  T4      : 0x6a696867  T5      : 0x66656463  T6      : 0x62613938  
+MSTATUS : 0x00001881  MTVEC   : 0x40380001  MCAUSE  : 0x00000007  MTVAL   : 0x00000000  
+MHARTID : 0x00000000  
+0x403825fa in ?? ()
+#0  0x403825fa in ?? ()
+Backtrace stopped: previous frame identical to this frame (corrupt stack?)
+ELF file SHA256: 72e88c31482c8900
+Rebooting...
+x�jESP-ROM:esp32c3-20200918
+Build:Sep 18 2020
+rst:0xc (RTC_SW_CPU_RST),boot:0xc (SPI_FAST_FLASH_BOOT)
+Saved PC:0x40381f24
+SPIWP:0xee
+mode:DOUT, clock div:2
+load:0x3fcd6100,len:0x14
+load:0x3fcd6114,len:0x11d8
+load:0x403d0000,len:0xd0c
+load:0x403d2000,len:0x1b84
+entry 0x403d0062
+␛[0;33mW (37) bootloader_random: RNG for ESP32-C3 not currently supported␛[0m
+␛[0;33mW (184) bootloader_random: RNG for ESP32-C3 not currently supported␛[0m
+␛[0;33mW (196) spi_flash: Detected size(4096k) larger than the size in the binary image header(2048k). Using the size in the binary image header.␛[0m
+Enter test name: Got test name: test_illegal_instruction
+Guru Meditation Error: Core  0 panic'ed (Illegal instruction). Exception was unhandled.
+Core  0 register dump:
+MEPC    : 0x420037ce  RA      : 0x42003a18  SP      : 0x3fc8cdec  GP      : 0x3fc887e0  
+TP      : 0xa5a5a5a5  T0      : 0x7f7f7f7f  T1      : 0x7f7f7f7f  T2      : 0xffffffff  
+S0/FP   : 0x3fc89cc0  S1      : 0xa5a5a5a5  A0      : 0x00000000  A1      : 0x3c022b0c  
+A2      : 0x00000000  A3      : 0x00000000  A4      : 0x00000000  A5      : 0x7f7f7f7f  
+A6      : 0x420019ee  A7      : 0xa5a5a5a5  S2      : 0xa5a5a5a5  S3      : 0xa5a5a5a5  
+S4      : 0xa5a5a5a5  S5      : 0xa5a5a5a5  S6      : 0xa5a5a5a5  S7      : 0xa5a5a5a5  
+S8      : 0xa5a5a5a5  S9      : 0xa5a5a5a5  S10     : 0xa5a5a5a5  S11     : 0xa5a5a5a5  
+T3      : 0xa5a5a5a5  T4      : 0xa5a5a5a5  T5      : 0xa5a5a5a5  T6      : 0xa5a5a5a5  
+MSTATUS : 0x00001881  MTVEC   : 0x40380001  MCAUSE  : 0x00000002  MTVAL   : 0x00000000  
+MHARTID : 0x00000000  
+0x420037ce in ?? ()
+#0  0x420037ce in ?? ()
+Backtrace stopped: previous frame identical to this frame (corrupt stack?)
+ELF file SHA256: 72e88c31482c8900
+Rebooting...
+x�jESP-ROM:esp32c3-20200918
+Build:Sep 18 2020
+rst:0xc (RTC_SW_CPU_RST),boot:0xc (SPI_FAST_FLASH_BOOT)
+Saved PC:0x40381f24
+SPIWP:0xee
+mode:DOUT, clock div:2
+load:0x3fcd6100,len:0x14
+load:0x3fcd6114,len:0x11d8
+load:0x403d0000,len:0xd0c
+load:0x403d2000,len:0x1b84
+entry 0x403d0062
+␛[0;33mW (37) bootloader_random: RNG for ESP32-C3 not currently supported␛[0m
+␛[0;33mW (184) bootloader_random: RNG for ESP32-C3 not currently supported␛[0m
+␛[0;33mW (196) spi_flash: Detected size(4096k) larger than the size in the binary image header(2048k). Using the size in the binary image header.␛[0m
+Enter test name: 
diff --git a/tools/tools.json b/tools/tools.json
index 0f4a6cc904..f4ac12a8f5 100644
--- a/tools/tools.json
+++ b/tools/tools.json
@@ -51,7 +51,7 @@
           "win64": {
             "sha256": "58419852fefb7111fdec056ac2fd7c4bd09c1f4c17610a761a97b788413527cf",
             "size": 106855139,
-            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_4_0-esp-2020r3-win64.zip"
+            "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r3/xtensa-esp32-elf-gcc8_4_0-esp-2020r3-win64.zip"
           }
         }
       ]
@@ -218,7 +218,7 @@
           }
         }
       ]
-    }
+    },
     {
       "description": "Toolchain for ESP32 ULP coprocessor",
       "export_paths": [
diff --git a/tools/unit-test-app/CMakeLists.txt b/tools/unit-test-app/CMakeLists.txt
index f25adef66b..24351c17bc 100644
--- a/tools/unit-test-app/CMakeLists.txt
+++ b/tools/unit-test-app/CMakeLists.txt
@@ -2,7 +2,7 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/examples/cxx/experimental/experimental_cpp_component"
+list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/examples/cxx/experimental/experimental_cpp_component/"
                                  "$ENV{IDF_PATH}/examples/peripherals/rmt/ir_protocols/components")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
diff --git a/tools/unit-test-app/configs/cxx_exceptions b/tools/unit-test-app/configs/cxx_exceptions
index 47e6fce864..268567c0f5 100644
--- a/tools/unit-test-app/configs/cxx_exceptions
+++ b/tools/unit-test-app/configs/cxx_exceptions
@@ -1,4 +1,4 @@
-# Only need to test this for one target (e.g. ESP32)
+# Only need to test this for one target (e.g. ESP32) per architecture
 CONFIG_IDF_TARGET="esp32"
 TEST_COMPONENTS=cxx
 CONFIG_COMPILER_CXX_EXCEPTIONS=y
diff --git a/tools/unit-test-app/configs/cxx_exceptions_c3 b/tools/unit-test-app/configs/cxx_exceptions_c3
new file mode 100644
index 0000000000..b8fce637ef
--- /dev/null
+++ b/tools/unit-test-app/configs/cxx_exceptions_c3
@@ -0,0 +1,4 @@
+# Only need to test this for one target (e.g. ESP32) per architecture
+CONFIG_IDF_TARGET="esp32c3"
+TEST_COMPONENTS=cxx
+CONFIG_COMPILER_CXX_EXCEPTIONS=y
diff --git a/tools/unit-test-app/configs/cxx_rtti_c3 b/tools/unit-test-app/configs/cxx_rtti_c3
new file mode 100644
index 0000000000..bc93b6348d
--- /dev/null
+++ b/tools/unit-test-app/configs/cxx_rtti_c3
@@ -0,0 +1,5 @@
+# Only need to test this for one target (e.g. ESP32) per architecture
+CONFIG_IDF_TARGET="esp32c3"
+TEST_COMPONENTS=cxx
+CONFIG_COMPILER_CXX_EXCEPTIONS=y
+CONFIG_COMPILER_CXX_RTTI=y
diff --git a/tools/unit-test-app/configs/default_2_c3 b/tools/unit-test-app/configs/default_2_c3
new file mode 100644
index 0000000000..8727600286
--- /dev/null
+++ b/tools/unit-test-app/configs/default_2_c3
@@ -0,0 +1,3 @@
+# This config is split between targets since different component needs to be excluded (esp32, esp32s2)
+CONFIG_IDF_TARGET="esp32c3"
+TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32c3 esp_ipc esp_pm esp_system esp_timer driver heap pthread soc spi_flash vfs experimental_cpp_component ulp perfmon
diff --git a/tools/unit-test-app/configs/default_c3 b/tools/unit-test-app/configs/default_c3
new file mode 100644
index 0000000000..330048f578
--- /dev/null
+++ b/tools/unit-test-app/configs/default_c3
@@ -0,0 +1,3 @@
+# This config is split between targets since different component needs to be included
+CONFIG_IDF_TARGET="esp32c3"
+TEST_COMPONENTS=freertos esp32c3 esp_ipc esp_system esp_timer driver heap pthread soc spi_flash vfs
diff --git a/tools/unit-test-app/configs/freertos_compliance_c3 b/tools/unit-test-app/configs/freertos_compliance_c3
new file mode 100644
index 0000000000..8e85455fc6
--- /dev/null
+++ b/tools/unit-test-app/configs/freertos_compliance_c3
@@ -0,0 +1,4 @@
+# This config is split between targets since different component needs to be included (esp32, esp32s2)
+CONFIG_IDF_TARGET="esp32c3"
+TEST_COMPONENTS=driver esp32c3 esp_system esp_timer spi_flash
+CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE=y
diff --git a/tools/unit-test-app/configs/freertos_options_c3 b/tools/unit-test-app/configs/freertos_options_c3
new file mode 100644
index 0000000000..1d4ac126b8
--- /dev/null
+++ b/tools/unit-test-app/configs/freertos_options_c3
@@ -0,0 +1,23 @@
+# This is a small set of tests where we enable as many as possible of the optional features
+# in FreeRTOS that are gated behind config
+
+CONFIG_IDF_TARGET="esp32c3"
+TEST_COMPONENTS=freertos
+
+CONFIG_FREERTOS_CORETIMER_1=y
+CONFIG_FREERTOS_OPTIMIZED_SCHEDULER=n
+CONFIG_FREERTOS_HZ=500
+CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL=y
+CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
+CONFIG_FREERTOS_INTERRUPT_BACKTRACE=n
+CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE=y
+CONFIG_FREERTOS_LEGACY_HOOKS=y
+CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
+CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP=y
+CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=10
+CONFIG_FREERTOS_USE_TRACE_FACILITY=y
+CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=y
+CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y
+CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y
+CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
+CONFIG_FREERTOS_FPU_IN_ISR=y
diff --git a/tools/unit-test-app/configs/release_c3 b/tools/unit-test-app/configs/release_c3
new file mode 100644
index 0000000000..e866001e14
--- /dev/null
+++ b/tools/unit-test-app/configs/release_c3
@@ -0,0 +1,5 @@
+CONFIG_IDF_TARGET="esp32c3"
+TEST_COMPONENTS=freertos esp32c3 esp_system esp_ipc esp_timer driver heap pthread soc spi_flash vfs
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
diff --git a/tools/unit-test-app/configs/rom_options_c3 b/tools/unit-test-app/configs/rom_options_c3
new file mode 100644
index 0000000000..f31ad9b6bf
--- /dev/null
+++ b/tools/unit-test-app/configs/rom_options_c3
@@ -0,0 +1,3 @@
+CONFIG_IDF_TARGET="esp32c3"
+TEST_COMPONENTS=spi_flash
+CONFIG_SPI_FLASH_ROM_IMPL=y
diff --git a/tools/unit-test-app/tools/ConfigDependency.yml b/tools/unit-test-app/tools/ConfigDependency.yml
index 54202cf73e..e5e5721cc3 100644
--- a/tools/unit-test-app/tools/ConfigDependency.yml
+++ b/tools/unit-test-app/tools/ConfigDependency.yml
@@ -2,3 +2,4 @@
 "8Mpsram": "CONFIG_SPIRAM_BANKSWITCH_ENABLE=y"
 "ESP32_IDF": "CONFIG_IDF_TARGET_ESP32=y"
 "ESP32S2_IDF": "CONFIG_IDF_TARGET_ESP32S2=y"
+"ESP32C3_IDF": "CONFIG_IDF_TARGET_ESP32C3=y"