mirror of
https://github.com/espressif/esp-idf.git
synced 2025-10-14 00:18:44 +00:00
feat(usb_cdc_console): moved usb-cdc ROM console to new component: esp_usb_cdc_rom_console
This commit is contained in:
@@ -68,10 +68,10 @@ set(extra_components_which_shouldnt_be_included
|
||||
|
||||
# esp_timer is a dependency of esp_pm, esp_system, esp_security, esp_hw_support
|
||||
# esp_pm should be removed from G1 build
|
||||
# esp_system's dependency is due to usb_console (used for timeout functionality)
|
||||
# and task_wdt timer implementation on C2, we could possibly place this implementation in esp_timer instead
|
||||
# esp_system's dependency is due to task_wdt timer implementation on C2,
|
||||
# we could possibly place this implementation in esp_timer instead
|
||||
# esp_security uses it for esp_ds (used for timeout functionality)
|
||||
# esp_hw_support uses it for componensating time after sleep (dependency could be reversed) IDF-10416
|
||||
# and for componensating time after sleep (dependency could be reversed) IDF-10416
|
||||
esp_timer
|
||||
|
||||
# esptool_py is a dependency of bootloader, app_update, partition_table, all of which
|
||||
@@ -94,6 +94,10 @@ set(extra_components_which_shouldnt_be_included
|
||||
|
||||
# esp_security is required by mbedtls and spi_flash
|
||||
esp_security
|
||||
|
||||
# esp_usb_cdc_rom_console is used by the panic handler, will be conditional on cdc console option when
|
||||
# the new build-system is implemented
|
||||
esp_usb_cdc_rom_console
|
||||
)
|
||||
|
||||
set(expected_components
|
||||
|
@@ -2,10 +2,6 @@
|
||||
# SPDX-License-Identifier: Unlicense OR CC0-1.0
|
||||
import argparse
|
||||
import logging
|
||||
from typing import Dict
|
||||
from typing import List
|
||||
from typing import Optional
|
||||
from typing import Tuple
|
||||
|
||||
g1_g0_components = [
|
||||
'hal',
|
||||
@@ -27,7 +23,7 @@ g1_g0_components = [
|
||||
|
||||
# Global expected dependency violations that apply to all targets
|
||||
expected_dep_violations = {
|
||||
'esp_system': ['esp_timer', 'bootloader_support', 'esp_pm'],
|
||||
'esp_system': ['esp_timer', 'bootloader_support', 'esp_pm', 'esp_usb_cdc_rom_console'],
|
||||
'spi_flash': ['bootloader_support'],
|
||||
'esp_hw_support': ['efuse', 'bootloader_support', 'esp_driver_gpio', 'esp_timer', 'esp_pm'],
|
||||
'cxx': ['pthread'],
|
||||
@@ -46,7 +42,7 @@ target_specific_expected_dep_violations = {
|
||||
}
|
||||
|
||||
|
||||
def merge_expected_violations(target: Optional[str] = None) -> Dict[str, List[str]]:
|
||||
def merge_expected_violations(target: str | None = None) -> dict[str, list[str]]:
|
||||
"""
|
||||
Merge global and target-specific expected dependency violations.
|
||||
|
||||
@@ -75,13 +71,13 @@ def merge_expected_violations(target: Optional[str] = None) -> Dict[str, List[st
|
||||
return merged_violations
|
||||
|
||||
|
||||
def parse_dependencies(file_path: str, target: Optional[str] = None) -> Tuple[Dict[str, List[str]], List[str]]:
|
||||
def parse_dependencies(file_path: str, target: str | None = None) -> tuple[dict[str, list[str]], list[str]]:
|
||||
new_dependency_errors = []
|
||||
|
||||
# Get merged expected violations for the specified target
|
||||
merged_expected_violations = merge_expected_violations(target)
|
||||
|
||||
with open(file_path, 'r') as file:
|
||||
with open(file_path) as file:
|
||||
for line in file:
|
||||
line = line.strip(' ;')
|
||||
|
||||
|
Reference in New Issue
Block a user