feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'feature/add_esp32-h2_esp32-c6_to_ttfw' into 'master'

Browse Source 
tools: update ttfw to support ESP32-H2 and ESP32-C6 chips

See merge request espressif/esp-idf!15443
This commit is contained in:
Anton Maklakov
2021-10-26 02:35:29 +00:00
parent 92d7e47ef6 3247f66783
commit c670e17383
3 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/ci/check_copyright_ignore.txt
View File

@@ -3854,8 +3854,6 @@ tools/ci/python_packages/ttfw_idf/CIScanTests.py
tools/ci/python_packages/ttfw_idf/DebugUtils.py tools/ci/python_packages/ttfw_idf/DebugUtils.py
tools/ci/python_packages/ttfw_idf/IDFApp.py tools/ci/python_packages/ttfw_idf/IDFApp.py
tools/ci/python_packages/ttfw_idf/IDFAssignTest.py tools/ci/python_packages/ttfw_idf/IDFAssignTest.py
tools/ci/python_packages/ttfw_idf/IDFDUT.py
tools/ci/python_packages/ttfw_idf/__init__.py
tools/ci/python_packages/ttfw_idf/unity_test_parser.py tools/ci/python_packages/ttfw_idf/unity_test_parser.py
tools/ci/python_packages/wifi_tools.py tools/ci/python_packages/wifi_tools.py
tools/ci/test_autocomplete.py tools/ci/test_autocomplete.py

35
tools/ci/python_packages/ttfw_idf/IDFDUT.py
View File

@@ -1,16 +1,5 @@
# Copyright 2015-2017 Espressif Systems (Shanghai) PTE LTD # SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
# # SPDX-License-Identifier: Apache-2.0
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http:#www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
""" DUT for IDF applications """ """ DUT for IDF applications """
import collections import collections
@@ -611,6 +600,24 @@ class ESP32C3DUT(IDFDUT):
return esptool.ESP32C3ROM return esptool.ESP32C3ROM
class ESP32C6DUT(IDFDUT):
TARGET = 'esp32c6'
TOOLCHAIN_PREFIX = 'riscv32-esp-elf-'
@classmethod
def get_rom(cls):
return esptool.ESP32C6BETAROM
class ESP32H2DUT(IDFDUT):
TARGET = 'esp32h2'
TOOLCHAIN_PREFIX = 'riscv32-esp-elf-'
@classmethod
def get_rom(cls):
return esptool.ESP32H2ROM
class ESP8266DUT(IDFDUT): class ESP8266DUT(IDFDUT):
TARGET = 'esp8266' TARGET = 'esp8266'
TOOLCHAIN_PREFIX = 'xtensa-lx106-elf-' TOOLCHAIN_PREFIX = 'xtensa-lx106-elf-'
@@ -621,7 +628,7 @@ class ESP8266DUT(IDFDUT):
def get_target_by_rom_class(cls): def get_target_by_rom_class(cls):
for c in [ESP32DUT, ESP32S2DUT, ESP32S3DUT, ESP32C3DUT, ESP8266DUT, IDFQEMUDUT]: for c in [ESP32DUT, ESP32S2DUT, ESP32S3DUT, ESP32C3DUT, ESP32C6DUT, ESP32H2DUT, ESP8266DUT, IDFQEMUDUT]:
if c.get_rom() == cls: if c.get_rom() == cls:
return c.TARGET return c.TARGET
return None return None

22
tools/ci/python_packages/ttfw_idf/__init__.py
View File

@@ -1,16 +1,6 @@
# Copyright 2015-2017 Espressif Systems (Shanghai) PTE LTD # SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
# # SPDX-License-Identifier: Apache-2.0
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http:#www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import functools import functools
import json import json
import logging import logging
@@ -24,8 +14,8 @@ from tiny_test_fw import TinyFW, Utility
from .DebugUtils import CustomProcess, GDBBackend, OCDBackend # noqa: export DebugUtils for users from .DebugUtils import CustomProcess, GDBBackend, OCDBackend # noqa: export DebugUtils for users
from .IDFApp import UT, ComponentUTApp, Example, IDFApp, LoadableElfTestApp, TestApp # noqa: export all Apps for users from .IDFApp import UT, ComponentUTApp, Example, IDFApp, LoadableElfTestApp, TestApp # noqa: export all Apps for users
from .IDFDUT import (ESP32C3DUT, ESP32C3FPGADUT, ESP32DUT, ESP32QEMUDUT, ESP32S2DUT, # noqa: export DUTs for users from .IDFDUT import (ESP32C3DUT, ESP32C3FPGADUT, ESP32C6DUT, ESP32DUT, ESP32H2DUT, # noqa: export DUTs for users
ESP32S3DUT, ESP32S3FPGADUT, ESP8266DUT, IDFDUT) ESP32QEMUDUT, ESP32S2DUT, ESP32S3DUT, ESP32S3FPGADUT, ESP8266DUT, IDFDUT)
from .unity_test_parser import TestFormat, TestResults from .unity_test_parser import TestFormat, TestResults
# pass TARGET_DUT_CLS_DICT to Env.py to avoid circular dependency issue. # pass TARGET_DUT_CLS_DICT to Env.py to avoid circular dependency issue.
@@ -36,6 +26,8 @@ TARGET_DUT_CLS_DICT = {
'ESP32C3': ESP32C3DUT, 'ESP32C3': ESP32C3DUT,
'ESP32C3FPGA': ESP32C3FPGADUT, 'ESP32C3FPGA': ESP32C3FPGADUT,
'ESP32S3FPGA': ESP32S3FPGADUT, 'ESP32S3FPGA': ESP32S3FPGADUT,
'ESP32C6': ESP32C6DUT,
'ESP32H2': ESP32H2DUT,
} }