diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS index 02b1466521b..45d6a6e9c53 100644 --- a/.gitlab/CODEOWNERS +++ b/.gitlab/CODEOWNERS @@ -75,7 +75,6 @@ /components/driver/ @esp-idf-codeowners/peripherals /components/efuse/ @esp-idf-codeowners/system /components/esp32*/ @esp-idf-codeowners/system -/components/esp8684/ @esp-idf-codeowners/system /components/esp_adc_cal/ @esp-idf-codeowners/peripherals /components/esp_common/ @esp-idf-codeowners/system /components/esp_eth/ @esp-idf-codeowners/network diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml index 98c32486bb1..cfde9fca8d4 100644 --- a/.gitlab/ci/build.yml +++ b/.gitlab/ci/build.yml @@ -194,12 +194,12 @@ build_esp_idf_tests_cmake_esp32c3: variables: IDF_TARGET: esp32c3 -build_esp_idf_tests_cmake_esp8684: +build_esp_idf_tests_cmake_esp32c2: extends: - .build_esp_idf_tests_cmake_template - - .rules:build:unit_test-esp8684 + - .rules:build:unit_test-esp32c2 variables: - IDF_TARGET: esp8684 + IDF_TARGET: esp32c2 .build_examples_template: extends: .build_template @@ -323,13 +323,13 @@ build_test_apps_esp32c3: variables: IDF_TARGET: esp32c3 -build_test_apps_esp8684: +build_test_apps_esp32c2: extends: - .build_test_apps_template - - .rules:build:custom_test-esp8684 + - .rules:build:custom_test-esp32c2 parallel: 8 variables: - IDF_TARGET: esp8684 + IDF_TARGET: esp32c2 .build_component_ut_template: extends: .build_test_apps_template @@ -365,12 +365,12 @@ build_component_ut_esp32c3: variables: IDF_TARGET: esp32c3 -build_component_ut_esp8684: +build_component_ut_esp32c2: extends: - .build_component_ut_template - - .rules:build:component_ut-esp8684 + - .rules:build:component_ut-esp32c2 variables: - IDF_TARGET: esp8684 + IDF_TARGET: esp32c2 .test_build_system_template: stage: host_test diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml index 815eaf1aa9a..8c6bef2a089 100644 --- a/.gitlab/ci/dependencies/dependencies.yml +++ b/.gitlab/ci/dependencies/dependencies.yml @@ -4,7 +4,7 @@ - esp32s3 - esp32c3 - esp32h2 - - esp8684 + - esp32c2 .target_test: &target_test - example_test diff --git a/.gitlab/ci/docs.yml b/.gitlab/ci/docs.yml index 9fa33f24691..51849cee9a2 100644 --- a/.gitlab/ci/docs.yml +++ b/.gitlab/ci/docs.yml @@ -69,7 +69,7 @@ check_docs_lang_sync: parallel: matrix: - DOCLANG: ["en", "zh_CN"] - DOCTGT: ["esp32", "esp32s2", "esp32s3", "esp32c3", "esp8684"] + DOCTGT: ["esp32", "esp32s2", "esp32s3", "esp32c3"] # TODO: temporary disable building docs for esp32c2, IDF-4551 check_docs_gh_links: image: $ESP_IDF_DOC_ENV_IMAGE diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index a09574919e4..482541af7d6 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -281,6 +281,9 @@ .if-label-component_ut_esp32: &if-label-component_ut_esp32 if: '$BOT_LABEL_COMPONENT_UT_ESP32 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*component_ut_esp32(?:,[^,\n\r]+)*$/i' +.if-label-component_ut_esp32c2: &if-label-component_ut_esp32c2 + if: '$BOT_LABEL_COMPONENT_UT_ESP32C2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*component_ut_esp32c2(?:,[^,\n\r]+)*$/i' + .if-label-component_ut_esp32c3: &if-label-component_ut_esp32c3 if: '$BOT_LABEL_COMPONENT_UT_ESP32C3 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*component_ut_esp32c3(?:,[^,\n\r]+)*$/i' @@ -293,15 +296,15 @@ .if-label-component_ut_esp32s3: &if-label-component_ut_esp32s3 if: '$BOT_LABEL_COMPONENT_UT_ESP32S3 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*component_ut_esp32s3(?:,[^,\n\r]+)*$/i' -.if-label-component_ut_esp8684: &if-label-component_ut_esp8684 - if: '$BOT_LABEL_COMPONENT_UT_ESP8684 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*component_ut_esp8684(?:,[^,\n\r]+)*$/i' - .if-label-custom_test: &if-label-custom_test if: '$BOT_LABEL_CUSTOM_TEST || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*custom_test(?:,[^,\n\r]+)*$/i' .if-label-custom_test_esp32: &if-label-custom_test_esp32 if: '$BOT_LABEL_CUSTOM_TEST_ESP32 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*custom_test_esp32(?:,[^,\n\r]+)*$/i' +.if-label-custom_test_esp32c2: &if-label-custom_test_esp32c2 + if: '$BOT_LABEL_CUSTOM_TEST_ESP32C2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*custom_test_esp32c2(?:,[^,\n\r]+)*$/i' + .if-label-custom_test_esp32c3: &if-label-custom_test_esp32c3 if: '$BOT_LABEL_CUSTOM_TEST_ESP32C3 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*custom_test_esp32c3(?:,[^,\n\r]+)*$/i' @@ -314,9 +317,6 @@ .if-label-custom_test_esp32s3: &if-label-custom_test_esp32s3 if: '$BOT_LABEL_CUSTOM_TEST_ESP32S3 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*custom_test_esp32s3(?:,[^,\n\r]+)*$/i' -.if-label-custom_test_esp8684: &if-label-custom_test_esp8684 - if: '$BOT_LABEL_CUSTOM_TEST_ESP8684 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*custom_test_esp8684(?:,[^,\n\r]+)*$/i' - .if-label-docker: &if-label-docker if: '$BOT_LABEL_DOCKER || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*docker(?:,[^,\n\r]+)*$/i' @@ -326,6 +326,9 @@ .if-label-example_test_esp32: &if-label-example_test_esp32 if: '$BOT_LABEL_EXAMPLE_TEST_ESP32 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*example_test_esp32(?:,[^,\n\r]+)*$/i' +.if-label-example_test_esp32c2: &if-label-example_test_esp32c2 + if: '$BOT_LABEL_EXAMPLE_TEST_ESP32C2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*example_test_esp32c2(?:,[^,\n\r]+)*$/i' + .if-label-example_test_esp32c3: &if-label-example_test_esp32c3 if: '$BOT_LABEL_EXAMPLE_TEST_ESP32C3 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*example_test_esp32c3(?:,[^,\n\r]+)*$/i' @@ -338,9 +341,6 @@ .if-label-example_test_esp32s3: &if-label-example_test_esp32s3 if: '$BOT_LABEL_EXAMPLE_TEST_ESP32S3 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*example_test_esp32s3(?:,[^,\n\r]+)*$/i' -.if-label-example_test_esp8684: &if-label-example_test_esp8684 - if: '$BOT_LABEL_EXAMPLE_TEST_ESP8684 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*example_test_esp8684(?:,[^,\n\r]+)*$/i' - .if-label-fuzzer_test: &if-label-fuzzer_test if: '$BOT_LABEL_FUZZER_TEST || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*fuzzer_test(?:,[^,\n\r]+)*$/i' @@ -371,6 +371,9 @@ .if-label-unit_test_esp32: &if-label-unit_test_esp32 if: '$BOT_LABEL_UNIT_TEST_ESP32 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*unit_test_esp32(?:,[^,\n\r]+)*$/i' +.if-label-unit_test_esp32c2: &if-label-unit_test_esp32c2 + if: '$BOT_LABEL_UNIT_TEST_ESP32C2 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*unit_test_esp32c2(?:,[^,\n\r]+)*$/i' + .if-label-unit_test_esp32c3: &if-label-unit_test_esp32c3 if: '$BOT_LABEL_UNIT_TEST_ESP32C3 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*unit_test_esp32c3(?:,[^,\n\r]+)*$/i' @@ -383,9 +386,6 @@ .if-label-unit_test_esp32s3: &if-label-unit_test_esp32s3 if: '$BOT_LABEL_UNIT_TEST_ESP32S3 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*unit_test_esp32s3(?:,[^,\n\r]+)*$/i' -.if-label-unit_test_esp8684: &if-label-unit_test_esp8684 - if: '$BOT_LABEL_UNIT_TEST_ESP8684 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*unit_test_esp8684(?:,[^,\n\r]+)*$/i' - .if-label-weekend_test: &if-label-weekend_test if: '$BOT_LABEL_WEEKEND_TEST || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*weekend_test(?:,[^,\n\r]+)*$/i' @@ -420,6 +420,23 @@ - <<: *if-dev-push changes: *patterns-component_ut +.rules:build:component_ut-esp32c2: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build + - <<: *if-label-component_ut + - <<: *if-label-component_ut_esp32c2 + - <<: *if-label-unit_test + - <<: *if-label-unit_test_esp32c2 + - <<: *if-dev-push + changes: *patterns-build_components + - <<: *if-dev-push + changes: *patterns-build_system + - <<: *if-dev-push + changes: *patterns-component_ut + .rules:build:component_ut-esp32c3: rules: - <<: *if-revert-branch @@ -488,23 +505,6 @@ - <<: *if-dev-push changes: *patterns-component_ut -.rules:build:component_ut-esp8684: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build - - <<: *if-label-component_ut - - <<: *if-label-component_ut_esp8684 - - <<: *if-label-unit_test - - <<: *if-label-unit_test_esp8684 - - <<: *if-dev-push - changes: *patterns-build_components - - <<: *if-dev-push - changes: *patterns-build_system - - <<: *if-dev-push - changes: *patterns-component_ut - .rules:build:custom_test-esp32: rules: - <<: *if-revert-branch @@ -521,6 +521,21 @@ - <<: *if-dev-push changes: *patterns-custom_test +.rules:build:custom_test-esp32c2: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build + - <<: *if-label-custom_test + - <<: *if-label-custom_test_esp32c2 + - <<: *if-dev-push + changes: *patterns-build_components + - <<: *if-dev-push + changes: *patterns-build_system + - <<: *if-dev-push + changes: *patterns-custom_test + .rules:build:custom_test-esp32c3: rules: - <<: *if-revert-branch @@ -581,21 +596,6 @@ - <<: *if-dev-push changes: *patterns-custom_test -.rules:build:custom_test-esp8684: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build - - <<: *if-label-custom_test - - <<: *if-label-custom_test_esp8684 - - <<: *if-dev-push - changes: *patterns-build_components - - <<: *if-dev-push - changes: *patterns-build_system - - <<: *if-dev-push - changes: *patterns-custom_test - .rules:build:docker: rules: - <<: *if-revert-branch @@ -624,6 +624,23 @@ - <<: *if-dev-push changes: *patterns-example_test +.rules:build:example_test-esp32c2: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build + - <<: *if-label-example_test + - <<: *if-label-example_test_esp32c2 + - <<: *if-dev-push + changes: *patterns-build-example_test + - <<: *if-dev-push + changes: *patterns-build_components + - <<: *if-dev-push + changes: *patterns-build_system + - <<: *if-dev-push + changes: *patterns-example_test + .rules:build:example_test-esp32c3: rules: - <<: *if-revert-branch @@ -692,23 +709,6 @@ - <<: *if-dev-push changes: *patterns-example_test -.rules:build:example_test-esp8684: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build - - <<: *if-label-example_test - - <<: *if-label-example_test_esp8684 - - <<: *if-dev-push - changes: *patterns-build-example_test - - <<: *if-dev-push - changes: *patterns-build_components - - <<: *if-dev-push - changes: *patterns-build_system - - <<: *if-dev-push - changes: *patterns-example_test - .rules:build:integration_test: rules: - <<: *if-revert-branch @@ -742,34 +742,34 @@ - <<: *if-label-build - <<: *if-label-component_ut - <<: *if-label-component_ut_esp32 + - <<: *if-label-component_ut_esp32c2 - <<: *if-label-component_ut_esp32c3 - <<: *if-label-component_ut_esp32h2 - <<: *if-label-component_ut_esp32s2 - <<: *if-label-component_ut_esp32s3 - - <<: *if-label-component_ut_esp8684 - <<: *if-label-custom_test - <<: *if-label-custom_test_esp32 + - <<: *if-label-custom_test_esp32c2 - <<: *if-label-custom_test_esp32c3 - <<: *if-label-custom_test_esp32h2 - <<: *if-label-custom_test_esp32s2 - <<: *if-label-custom_test_esp32s3 - - <<: *if-label-custom_test_esp8684 - <<: *if-label-example_test - <<: *if-label-example_test_esp32 + - <<: *if-label-example_test_esp32c2 - <<: *if-label-example_test_esp32c3 - <<: *if-label-example_test_esp32h2 - <<: *if-label-example_test_esp32s2 - <<: *if-label-example_test_esp32s3 - - <<: *if-label-example_test_esp8684 - <<: *if-label-integration_test - <<: *if-label-iperf_stress_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32 + - <<: *if-label-unit_test_esp32c2 - <<: *if-label-unit_test_esp32c3 - <<: *if-label-unit_test_esp32h2 - <<: *if-label-unit_test_esp32s2 - <<: *if-label-unit_test_esp32s3 - - <<: *if-label-unit_test_esp8684 - <<: *if-label-weekend_test - <<: *if-dev-push changes: *patterns-build-example_test @@ -803,6 +803,21 @@ - <<: *if-dev-push changes: *patterns-unit_test +.rules:build:unit_test-esp32c2: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build + - <<: *if-label-unit_test + - <<: *if-label-unit_test_esp32c2 + - <<: *if-dev-push + changes: *patterns-build_components + - <<: *if-dev-push + changes: *patterns-build_system + - <<: *if-dev-push + changes: *patterns-unit_test + .rules:build:unit_test-esp32c3: rules: - <<: *if-revert-branch @@ -863,21 +878,6 @@ - <<: *if-dev-push changes: *patterns-unit_test -.rules:build:unit_test-esp8684: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build - - <<: *if-label-unit_test - - <<: *if-label-unit_test_esp8684 - - <<: *if-dev-push - changes: *patterns-build_components - - <<: *if-dev-push - changes: *patterns-build_system - - <<: *if-dev-push - changes: *patterns-unit_test - .rules:build:windows: rules: - <<: *if-revert-branch @@ -924,35 +924,35 @@ when: never - <<: *if-label-component_ut - <<: *if-label-component_ut_esp32 + - <<: *if-label-component_ut_esp32c2 - <<: *if-label-component_ut_esp32c3 - <<: *if-label-component_ut_esp32h2 - <<: *if-label-component_ut_esp32s2 - <<: *if-label-component_ut_esp32s3 - - <<: *if-label-component_ut_esp8684 - <<: *if-label-custom_test - <<: *if-label-custom_test_esp32 + - <<: *if-label-custom_test_esp32c2 - <<: *if-label-custom_test_esp32c3 - <<: *if-label-custom_test_esp32h2 - <<: *if-label-custom_test_esp32s2 - <<: *if-label-custom_test_esp32s3 - - <<: *if-label-custom_test_esp8684 - <<: *if-label-example_test - <<: *if-label-example_test_esp32 + - <<: *if-label-example_test_esp32c2 - <<: *if-label-example_test_esp32c3 - <<: *if-label-example_test_esp32h2 - <<: *if-label-example_test_esp32s2 - <<: *if-label-example_test_esp32s3 - - <<: *if-label-example_test_esp8684 - <<: *if-label-host_test - <<: *if-label-integration_test - <<: *if-label-iperf_stress_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32 + - <<: *if-label-unit_test_esp32c2 - <<: *if-label-unit_test_esp32c3 - <<: *if-label-unit_test_esp32h2 - <<: *if-label-unit_test_esp32s2 - <<: *if-label-unit_test_esp32s3 - - <<: *if-label-unit_test_esp8684 - <<: *if-label-weekend_test - <<: *if-dev-push changes: *patterns-build-example_test @@ -983,6 +983,20 @@ - <<: *if-dev-push changes: *patterns-component_ut +.rules:test:component_ut-esp32c2: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-component_ut + - <<: *if-label-component_ut_esp32c2 + - <<: *if-label-unit_test + - <<: *if-label-unit_test_esp32c2 + - <<: *if-dev-push + changes: *patterns-component_ut + .rules:test:component_ut-esp32c3: rules: - <<: *if-revert-branch @@ -1039,20 +1053,6 @@ - <<: *if-dev-push changes: *patterns-component_ut -.rules:test:component_ut-esp8684: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build-only - when: never - - <<: *if-label-component_ut - - <<: *if-label-component_ut_esp8684 - - <<: *if-label-unit_test - - <<: *if-label-unit_test_esp8684 - - <<: *if-dev-push - changes: *patterns-component_ut - .rules:test:custom_test-esp32: rules: - <<: *if-revert-branch @@ -1065,6 +1065,18 @@ - <<: *if-dev-push changes: *patterns-custom_test +.rules:test:custom_test-esp32c2: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-custom_test + - <<: *if-label-custom_test_esp32c2 + - <<: *if-dev-push + changes: *patterns-custom_test + .rules:test:custom_test-esp32c3: rules: - <<: *if-revert-branch @@ -1113,18 +1125,6 @@ - <<: *if-dev-push changes: *patterns-custom_test -.rules:test:custom_test-esp8684: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build-only - when: never - - <<: *if-label-custom_test - - <<: *if-label-custom_test_esp8684 - - <<: *if-dev-push - changes: *patterns-custom_test - .rules:test:example_test-esp32: rules: - <<: *if-revert-branch @@ -1139,6 +1139,20 @@ - <<: *if-dev-push changes: *patterns-example_test +.rules:test:example_test-esp32c2: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-example_test + - <<: *if-label-example_test_esp32c2 + - <<: *if-dev-push + changes: *patterns-build-example_test + - <<: *if-dev-push + changes: *patterns-example_test + .rules:test:example_test-esp32c3: rules: - <<: *if-revert-branch @@ -1195,20 +1209,6 @@ - <<: *if-dev-push changes: *patterns-example_test -.rules:test:example_test-esp8684: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build-only - when: never - - <<: *if-label-example_test - - <<: *if-label-example_test_esp8684 - - <<: *if-dev-push - changes: *patterns-build-example_test - - <<: *if-dev-push - changes: *patterns-example_test - .rules:test:host_test: rules: - <<: *if-revert-branch @@ -1251,33 +1251,33 @@ when: never - <<: *if-label-component_ut - <<: *if-label-component_ut_esp32 + - <<: *if-label-component_ut_esp32c2 - <<: *if-label-component_ut_esp32c3 - <<: *if-label-component_ut_esp32h2 - <<: *if-label-component_ut_esp32s2 - <<: *if-label-component_ut_esp32s3 - - <<: *if-label-component_ut_esp8684 - <<: *if-label-custom_test - <<: *if-label-custom_test_esp32 + - <<: *if-label-custom_test_esp32c2 - <<: *if-label-custom_test_esp32c3 - <<: *if-label-custom_test_esp32h2 - <<: *if-label-custom_test_esp32s2 - <<: *if-label-custom_test_esp32s3 - - <<: *if-label-custom_test_esp8684 - <<: *if-label-example_test - <<: *if-label-example_test_esp32 + - <<: *if-label-example_test_esp32c2 - <<: *if-label-example_test_esp32c3 - <<: *if-label-example_test_esp32h2 - <<: *if-label-example_test_esp32s2 - <<: *if-label-example_test_esp32s3 - - <<: *if-label-example_test_esp8684 - <<: *if-label-integration_test - <<: *if-label-unit_test - <<: *if-label-unit_test_esp32 + - <<: *if-label-unit_test_esp32c2 - <<: *if-label-unit_test_esp32c3 - <<: *if-label-unit_test_esp32h2 - <<: *if-label-unit_test_esp32s2 - <<: *if-label-unit_test_esp32s3 - - <<: *if-label-unit_test_esp8684 - <<: *if-dev-push changes: *patterns-build-example_test - <<: *if-dev-push @@ -1303,6 +1303,18 @@ - <<: *if-dev-push changes: *patterns-unit_test +.rules:test:unit_test-esp32c2: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-unit_test + - <<: *if-label-unit_test_esp32c2 + - <<: *if-dev-push + changes: *patterns-unit_test + .rules:test:unit_test-esp32c3: rules: - <<: *if-revert-branch @@ -1350,15 +1362,3 @@ - <<: *if-label-unit_test_esp32s3 - <<: *if-dev-push changes: *patterns-unit_test - -.rules:test:unit_test-esp8684: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build-only - when: never - - <<: *if-label-unit_test - - <<: *if-label-unit_test_esp8684 - - <<: *if-dev-push - changes: *patterns-unit_test diff --git a/Kconfig b/Kconfig index 1141d5bc372..9a18909c8b9 100644 --- a/Kconfig +++ b/Kconfig @@ -82,9 +82,9 @@ mainmenu "Espressif IoT Development Framework Configuration" select ESPTOOLPY_NO_STUB # TODO: IDF-4288 endchoice - config IDF_TARGET_ESP8684 + config IDF_TARGET_ESP32C2 bool - default "y" if IDF_TARGET="esp8684" + default "y" if IDF_TARGET="esp32c2" select FREERTOS_UNICORE select IDF_TARGET_ARCH_RISCV select ESPTOOLPY_NO_STUB # remove if ESPTOOL-303 @@ -99,7 +99,7 @@ mainmenu "Espressif IoT Development Framework Configuration" default 0x0002 if IDF_TARGET_ESP32S2 default 0x0005 if IDF_TARGET_ESP32C3 default 0x0009 if IDF_TARGET_ESP32S3 - default 0x000C if IDF_TARGET_ESP8684 + default 0x000C if IDF_TARGET_ESP32C2 default 0x000A if IDF_TARGET_ESP32H2_BETA_VERSION_1 default 0x000E if IDF_TARGET_ESP32H2_BETA_VERSION_2 # ESP32H2-TODO: IDF-3475 default 0xFFFF diff --git a/components/bootloader/Kconfig.projbuild b/components/bootloader/Kconfig.projbuild index 984042d3b96..4f74c6988e2 100644 --- a/components/bootloader/Kconfig.projbuild +++ b/components/bootloader/Kconfig.projbuild @@ -681,7 +681,7 @@ menu "Security features" choice SECURE_FLASH_ENCRYPTION_KEYSIZE bool "Size of generated AES-XTS key" default SECURE_FLASH_ENCRYPTION_AES128 - depends on (IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP8684) && SECURE_FLASH_ENC_ENABLED + depends on (IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C2) && SECURE_FLASH_ENC_ENABLED help Size of generated AES-XTS key. @@ -693,11 +693,11 @@ menu "Security features" config SECURE_FLASH_ENCRYPTION_AES128 bool "AES-128 (256-bit key)" - depends on !IDF_TARGET_ESP8684 # TODO: IDF-3899 + depends on !IDF_TARGET_ESP32C2 # TODO: IDF-3899 config SECURE_FLASH_ENCRYPTION_AES256 bool "AES-256 (512-bit key)" - depends on !IDF_TARGET_ESP8684 # TODO: IDF-3899 + depends on !IDF_TARGET_ESP32C2 # TODO: IDF-3899 endchoice choice SECURE_FLASH_ENCRYPTION_MODE diff --git a/components/bootloader/subproject/main/ld/esp8684/bootloader.ld b/components/bootloader/subproject/main/ld/esp32c2/bootloader.ld similarity index 97% rename from components/bootloader/subproject/main/ld/esp8684/bootloader.ld rename to components/bootloader/subproject/main/ld/esp32c2/bootloader.ld index 145b64bfa46..863b9ab090a 100644 --- a/components/bootloader/subproject/main/ld/esp8684/bootloader.ld +++ b/components/bootloader/subproject/main/ld/esp32c2/bootloader.ld @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -36,7 +36,7 @@ SECTIONS *libbootloader_support.a:bootloader_random.*(.literal .text .literal.* .text.*) *libbootloader_support.a:bootloader_random*.*(.literal.bootloader_random_disable .text.bootloader_random_disable) *libbootloader_support.a:bootloader_random*.*(.literal.bootloader_random_enable .text.bootloader_random_enable) - *libbootloader_support.a:bootloader_efuse_esp8684.*(.literal .text .literal.* .text.*) + *libbootloader_support.a:bootloader_efuse_esp32c2.*(.literal .text .literal.* .text.*) *libbootloader_support.a:bootloader_utility.*(.literal .text .literal.* .text.*) *libbootloader_support.a:bootloader_sha.*(.literal .text .literal.* .text.*) *libbootloader_support.a:bootloader_console_loader.*(.literal .text .literal.* .text.*) diff --git a/components/bootloader/subproject/main/ld/esp32c2/bootloader.rom.ld b/components/bootloader/subproject/main/ld/esp32c2/bootloader.rom.ld new file mode 100644 index 00000000000..e8af7ec5a60 --- /dev/null +++ b/components/bootloader/subproject/main/ld/esp32c2/bootloader.rom.ld @@ -0,0 +1,6 @@ +/* + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ +/* No definition for ESP32-C2 target */ diff --git a/components/bootloader/subproject/main/ld/esp8684/bootloader.rom.ld b/components/bootloader/subproject/main/ld/esp8684/bootloader.rom.ld deleted file mode 100644 index f6cb44d8656..00000000000 --- a/components/bootloader/subproject/main/ld/esp8684/bootloader.rom.ld +++ /dev/null @@ -1,6 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -/* No definition for ESP8684 target */ diff --git a/components/bootloader_support/bootloader_flash/src/bootloader_flash.c b/components/bootloader_support/bootloader_flash/src/bootloader_flash.c index f17514e8537..18e5276a455 100644 --- a/components/bootloader_support/bootloader_flash/src/bootloader_flash.c +++ b/components/bootloader_support/bootloader_flash/src/bootloader_flash.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -128,8 +128,8 @@ esp_err_t bootloader_flash_erase_range(uint32_t start_addr, uint32_t size) #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rom/cache.h" #include "soc/cache_memory.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/cache.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/cache.h" #include "soc/cache_memory.h" #endif #include "esp_rom_spiflash.h" diff --git a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp8684.c b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c2.c similarity index 92% rename from components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp8684.c rename to components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c2.c index 27fbf9d5ee7..6913af566ea 100644 --- a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp8684.c +++ b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c2.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -9,9 +9,9 @@ #include "sdkconfig.h" #include "esp_err.h" #include "esp_log.h" -#include "esp8684/rom/gpio.h" -#include "esp8684/rom/spi_flash.h" -#include "esp8684/rom/efuse.h" +#include "esp32c2/rom/gpio.h" +#include "esp32c2/rom/spi_flash.h" +#include "esp32c2/rom/efuse.h" #include "soc/gpio_periph.h" #include "soc/efuse_reg.h" #include "soc/spi_reg.h" diff --git a/components/bootloader_support/bootloader_flash/src/flash_qio_mode.c b/components/bootloader_support/bootloader_flash/src/flash_qio_mode.c index 42b65f6421c..0b344707bb8 100644 --- a/components/bootloader_support/bootloader_flash/src/flash_qio_mode.c +++ b/components/bootloader_support/bootloader_flash/src/flash_qio_mode.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -138,7 +138,7 @@ static esp_err_t enable_qio_mode(bootloader_flash_read_status_fn_t read_status_f esp_rom_spiflash_config_readmode(mode); -#if !CONFIG_IDF_TARGET_ESP8684 +#if !CONFIG_IDF_TARGET_ESP32C2 //IDF-3914 const uint32_t spiconfig = esp_rom_efuse_get_flash_gpio_info(); #endif @@ -146,7 +146,7 @@ static esp_err_t enable_qio_mode(bootloader_flash_read_status_fn_t read_status_f #if CONFIG_IDF_TARGET_ESP32 int wp_pin = bootloader_flash_get_wp_pin(); esp_rom_spiflash_select_qio_pins(wp_pin, spiconfig); -#elif CONFIG_IDF_TARGET_ESP8684 +#elif CONFIG_IDF_TARGET_ESP32C2 //IDF-3914 esp_rom_spiflash_select_qio_pins(0, 0); #else diff --git a/components/bootloader_support/include/bootloader_common.h b/components/bootloader_support/include/bootloader_common.h index 4c7e0fc7270..a211ccf32e4 100644 --- a/components/bootloader_support/include/bootloader_common.h +++ b/components/bootloader_support/include/bootloader_common.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2018-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2018-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -20,8 +20,8 @@ #include "esp32c3/rom/rtc.h" #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rom/rtc.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/rtc.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/rtc.h" #endif #ifdef __cplusplus diff --git a/components/bootloader_support/include/esp_app_format.h b/components/bootloader_support/include/esp_app_format.h index 8733f1f3d2a..f75b3f516fc 100644 --- a/components/bootloader_support/include/esp_app_format.h +++ b/components/bootloader_support/include/esp_app_format.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -16,7 +16,7 @@ typedef enum { ESP_CHIP_ID_ESP32S2 = 0x0002, /*!< chip ID: ESP32-S2 */ ESP_CHIP_ID_ESP32C3 = 0x0005, /*!< chip ID: ESP32-C3 */ ESP_CHIP_ID_ESP32S3 = 0x0009, /*!< chip ID: ESP32-S3 */ - ESP_CHIP_ID_ESP8684 = 0x000C, /*!< chip ID: ESP32-8684 */ + ESP_CHIP_ID_ESP32C2 = 0x000C, /*!< chip ID: ESP32-C2 */ #if CONFIG_IDF_TARGET_ESP32H2_BETA_VERSION_2 ESP_CHIP_ID_ESP32H2 = 0x000E, /*!< chip ID: ESP32-H2 Beta2*/ // ESP32H2-TODO: IDF-3475 #elif CONFIG_IDF_TARGET_ESP32H2_BETA_VERSION_1 diff --git a/components/bootloader_support/include/esp_flash_encrypt.h b/components/bootloader_support/include/esp_flash_encrypt.h index d8c94004294..fc939f6b8d8 100644 --- a/components/bootloader_support/include/esp_flash_encrypt.h +++ b/components/bootloader_support/include/esp_flash_encrypt.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -55,7 +55,7 @@ static inline /** @cond */ IRAM_ATTR /** @endcond */ bool esp_flash_encryption_e #endif #else #ifndef CONFIG_EFUSE_VIRTUAL_KEEP_IN_FLASH - #if CONFIG_IDF_TARGET_ESP8684 + #if CONFIG_IDF_TARGET_ESP32C2 // IDF-3899 #else flash_crypt_cnt = REG_GET_FIELD(EFUSE_RD_REPEAT_DATA1_REG, EFUSE_SPI_BOOT_CRYPT_CNT); diff --git a/components/bootloader_support/include/esp_secure_boot.h b/components/bootloader_support/include/esp_secure_boot.h index 62c93bae6db..9b7269ee4cb 100644 --- a/components/bootloader_support/include/esp_secure_boot.h +++ b/components/bootloader_support/include/esp_secure_boot.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -28,9 +28,9 @@ #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rom/efuse.h" #include "esp32h2/rom/secure_boot.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/efuse.h" -#include "esp8684/rom/secure_boot.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/efuse.h" +#include "esp32c2/rom/secure_boot.h" #endif #ifdef CONFIG_SECURE_BOOT_V1_ENABLED diff --git a/components/bootloader_support/src/bootloader_console.c b/components/bootloader_support/src/bootloader_console.c index 245e5a317f5..95cb5136513 100644 --- a/components/bootloader_support/src/bootloader_console.c +++ b/components/bootloader_support/src/bootloader_console.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -25,9 +25,9 @@ #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rom/ets_sys.h" #include "esp32h2/rom/uart.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/ets_sys.h" -#include "esp8684/rom/uart.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/ets_sys.h" +#include "esp32c2/rom/uart.h" #endif #include "esp_rom_gpio.h" #include "esp_rom_uart.h" diff --git a/components/bootloader_support/src/bootloader_efuse_esp8684.c b/components/bootloader_support/src/bootloader_efuse_esp32c2.c similarity index 88% rename from components/bootloader_support/src/bootloader_efuse_esp8684.c rename to components/bootloader_support/src/bootloader_efuse_esp32c2.c index c6469de4e9c..f5cf24704dc 100644 --- a/components/bootloader_support/src/bootloader_efuse_esp8684.c +++ b/components/bootloader_support/src/bootloader_efuse_esp32c2.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/bootloader_support/src/bootloader_random_esp8684.c b/components/bootloader_support/src/bootloader_random_esp32c2.c similarity index 86% rename from components/bootloader_support/src/bootloader_random_esp8684.c rename to components/bootloader_support/src/bootloader_random_esp32c2.c index 598fa24bb89..beae2de4898 100644 --- a/components/bootloader_support/src/bootloader_random_esp8684.c +++ b/components/bootloader_support/src/bootloader_random_esp32c2.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/bootloader_support/src/bootloader_utility.c b/components/bootloader_support/src/bootloader_utility.c index f28cea76f79..dc8c8f35080 100644 --- a/components/bootloader_support/src/bootloader_utility.c +++ b/components/bootloader_support/src/bootloader_utility.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2018-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2018-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -48,15 +48,15 @@ #include "esp32h2/rom/secure_boot.h" #include "soc/extmem_reg.h" #include "soc/cache_memory.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/cache.h" -#include "esp8684/rom/efuse.h" -#include "esp8684/rom/ets_sys.h" -#include "esp8684/rom/crc.h" -#include "esp8684/rom/rtc.h" -#include "esp8684/rom/uart.h" -#include "esp8684/rom/gpio.h" -#include "esp8684/rom/secure_boot.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/cache.h" +#include "esp32c2/rom/efuse.h" +#include "esp32c2/rom/ets_sys.h" +#include "esp32c2/rom/crc.h" +#include "esp32c2/rom/rtc.h" +#include "esp32c2/rom/uart.h" +#include "esp32c2/rom/gpio.h" +#include "esp32c2/rom/secure_boot.h" #include "soc/extmem_reg.h" #include "soc/cache_memory.h" #else // CONFIG_IDF_TARGET_* diff --git a/components/bootloader_support/src/esp8684/bootloader_esp8684.c b/components/bootloader_support/src/esp32c2/bootloader_esp32c2.c similarity index 97% rename from components/bootloader_support/src/esp8684/bootloader_esp8684.c rename to components/bootloader_support/src/esp32c2/bootloader_esp32c2.c index 2eb9bcd27a9..4be0a5f2655 100644 --- a/components/bootloader_support/src/esp8684/bootloader_esp8684.c +++ b/components/bootloader_support/src/esp32c2/bootloader_esp32c2.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -24,10 +24,10 @@ #include "soc/extmem_reg.h" #include "soc/io_mux_reg.h" #include "soc/system_reg.h" -#include "esp8684/rom/efuse.h" -#include "esp8684/rom/cache.h" -#include "esp8684/rom/ets_sys.h" -#include "esp8684/rom/rtc.h" +#include "esp32c2/rom/efuse.h" +#include "esp32c2/rom/cache.h" +#include "esp32c2/rom/ets_sys.h" +#include "esp32c2/rom/rtc.h" #include "bootloader_common.h" #include "bootloader_init.h" #include "bootloader_clock.h" @@ -38,7 +38,7 @@ #include "bootloader_flash_priv.h" #include "esp_efuse.h" -static const char *TAG = "boot.esp8684"; +static const char *TAG = "boot.esp32c2"; void IRAM_ATTR bootloader_configure_spi_pins(int drv) { diff --git a/components/bootloader_support/src/esp8684/bootloader_sha.c b/components/bootloader_support/src/esp32c2/bootloader_sha.c similarity index 89% rename from components/bootloader_support/src/esp8684/bootloader_sha.c rename to components/bootloader_support/src/esp32c2/bootloader_sha.c index 8fe5b2986c9..35365d9f6a7 100644 --- a/components/bootloader_support/src/esp8684/bootloader_sha.c +++ b/components/bootloader_support/src/esp32c2/bootloader_sha.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -9,7 +9,7 @@ #include #include -#include "esp8684/rom/sha.h" +#include "esp32c2/rom/sha.h" static SHA_CTX ctx; diff --git a/components/bootloader_support/src/esp8684/bootloader_soc.c b/components/bootloader_support/src/esp32c2/bootloader_soc.c similarity index 52% rename from components/bootloader_support/src/esp8684/bootloader_soc.c rename to components/bootloader_support/src/esp32c2/bootloader_soc.c index be708ca820b..2b20b0415ac 100644 --- a/components/bootloader_support/src/esp8684/bootloader_soc.c +++ b/components/bootloader_support/src/esp32c2/bootloader_soc.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2019-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -7,15 +7,15 @@ void bootloader_ana_super_wdt_reset_config(bool enable) { - (void)enable; // ESP8684 has none of these features. + (void)enable; // ESP32-C2 has none of these features. } void bootloader_ana_bod_reset_config(bool enable) { - (void)enable; // ESP8684 has none of these features. + (void)enable; // ESP32-C2 has none of these features. } void bootloader_ana_clock_glitch_reset_config(bool enable) { - (void)enable; // ESP8684 has none of these features. + (void)enable; // ESP32-C2 has none of these features. } diff --git a/components/bootloader_support/src/esp8684/flash_encryption_secure_features.c b/components/bootloader_support/src/esp32c2/flash_encryption_secure_features.c similarity index 93% rename from components/bootloader_support/src/esp8684/flash_encryption_secure_features.c rename to components/bootloader_support/src/esp32c2/flash_encryption_secure_features.c index 25dc0544839..18b8bc73b9d 100644 --- a/components/bootloader_support/src/esp8684/flash_encryption_secure_features.c +++ b/components/bootloader_support/src/esp32c2/flash_encryption_secure_features.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/bootloader_support/src/esp8684/secure_boot_secure_features.c b/components/bootloader_support/src/esp32c2/secure_boot_secure_features.c similarity index 96% rename from components/bootloader_support/src/esp8684/secure_boot_secure_features.c rename to components/bootloader_support/src/esp32c2/secure_boot_secure_features.c index 64a7cfab8ce..a03b13ad363 100644 --- a/components/bootloader_support/src/esp8684/secure_boot_secure_features.c +++ b/components/bootloader_support/src/esp32c2/secure_boot_secure_features.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/bootloader_support/src/esp_image_format.c b/components/bootloader_support/src/esp_image_format.c index 60bb47f4275..2538e3b4c77 100644 --- a/components/bootloader_support/src/esp_image_format.c +++ b/components/bootloader_support/src/esp_image_format.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -30,9 +30,9 @@ #include "esp32c3/rom/secure_boot.h" #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rom/secure_boot.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/rtc.h" -#include "esp8684/rom/secure_boot.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/rtc.h" +#include "esp32c2/rom/secure_boot.h" #endif /* Checking signatures as part of verifying images is necessary: diff --git a/components/bootloader_support/src/flash_encryption/flash_encrypt.c b/components/bootloader_support/src/flash_encryption/flash_encrypt.c index e672f5cf28c..e54a8c13411 100644 --- a/components/bootloader_support/src/flash_encryption/flash_encrypt.c +++ b/components/bootloader_support/src/flash_encryption/flash_encrypt.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -15,9 +15,9 @@ #include "esp_efuse_table.h" #include "esp_log.h" #include "hal/wdt_hal.h" -#ifdef CONFIG_IDF_TARGET_ESP8684 +#ifdef CONFIG_IDF_TARGET_ESP32C2 // IDF-3899 -#warning "Not support flash encryption on esp8684 yet." +#warning "Not support flash encryption on esp32c2 yet." #endif #ifdef CONFIG_SECURE_FLASH_ENC_ENABLED diff --git a/components/bt/controller/esp8684/Kconfig.in b/components/bt/controller/esp32c2/Kconfig.in similarity index 100% rename from components/bt/controller/esp8684/Kconfig.in rename to components/bt/controller/esp32c2/Kconfig.in diff --git a/components/driver/CMakeLists.txt b/components/driver/CMakeLists.txt index 0dad5798a16..3c043f92170 100644 --- a/components/driver/CMakeLists.txt +++ b/components/driver/CMakeLists.txt @@ -108,7 +108,7 @@ if(IDF_TARGET STREQUAL "esp32h2") "twai.c") endif() -if(IDF_TARGET STREQUAL "esp8684") +if(IDF_TARGET STREQUAL "esp32c2") list(APPEND srcs "spi_slave_hd.c") endif() diff --git a/components/driver/esp8684/include/driver/temp_sensor.h b/components/driver/esp32c2/include/driver/temp_sensor.h similarity index 97% rename from components/driver/esp8684/include/driver/temp_sensor.h rename to components/driver/esp32c2/include/driver/temp_sensor.h index d5d3ee3dd2a..bf9973c6a57 100644 --- a/components/driver/esp8684/include/driver/temp_sensor.h +++ b/components/driver/esp32c2/include/driver/temp_sensor.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2010-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/driver/include/driver/adc.h b/components/driver/include/driver/adc.h index 24d964c5121..cabbc50b88a 100644 --- a/components/driver/include/driver/adc.h +++ b/components/driver/include/driver/adc.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -45,7 +45,7 @@ typedef enum { ADC1_CHANNEL_9, /*!< ADC1 channel 9 is GPIO10 */ ADC1_CHANNEL_MAX, } adc1_channel_t; -#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 +#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 /**** `adc1_channel_t` will be deprecated functions, combine into `adc_channel_t` ********/ typedef enum { ADC1_CHANNEL_0 = 0, /*!< ADC1 channel 0 is GPIO0 */ @@ -72,7 +72,7 @@ typedef enum { ADC2_CHANNEL_9, /*!< ADC2 channel 9 is GPIO26 (ESP32), GPIO20 (ESP32-S2) */ ADC2_CHANNEL_MAX, } adc2_channel_t; -#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 +#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 /**** `adc2_channel_t` will be deprecated functions, combine into `adc_channel_t` ********/ typedef enum { ADC2_CHANNEL_0 = 0, /*!< ADC2 channel 0 is GPIO5 */ diff --git a/components/driver/test/include/test/test_common_spi.h b/components/driver/test/include/test/test_common_spi.h index 1ef231a8d9e..4e7ae695eeb 100644 --- a/components/driver/test/include/test/test_common_spi.h +++ b/components/driver/test/include/test/test_common_spi.h @@ -86,7 +86,7 @@ #define ESP_SPI_SLAVE_TV 0 #define WIRE_DELAY 12.5 -#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP8684 +#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2 //NOTE: On these chips, there is only 1 GPSPI controller, so master-slave test on single board should be disabled #define TEST_SPI_HOST SPI2_HOST #define TEST_SLAVE_HOST SPI2_HOST diff --git a/components/driver/test/test_adc.c b/components/driver/test/test_adc.c index 58f0eb17f82..17b5a2684b3 100644 --- a/components/driver/test/test_adc.c +++ b/components/driver/test/test_adc.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -9,7 +9,7 @@ #include #include "esp_log.h" #include "test_utils.h" -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2) // TODO: Support ADC IDF-3908 #include "esp_adc_cal.h" #include "driver/adc.h" @@ -400,4 +400,4 @@ TEST_CASE("test_adc_single_cali_time", "[adc][ignore][manual]") } } -#endif //#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) +#endif //#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2) diff --git a/components/driver/test/test_adc2_with_wifi.c b/components/driver/test/test_adc2_with_wifi.c index 395c1af4797..3b03d2b2648 100644 --- a/components/driver/test/test_adc2_with_wifi.c +++ b/components/driver/test/test_adc2_with_wifi.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -20,7 +20,7 @@ #include "freertos/task.h" #include "driver/gpio.h" -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C3, ESP32S3, ESP8684) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C3, ESP32S3, ESP32C2) static const char* TAG = "test_adc2"; diff --git a/components/driver/test/test_adc_common.c b/components/driver/test/test_adc_common.c index 3c0d367a948..474a7b7cccd 100644 --- a/components/driver/test/test_adc_common.c +++ b/components/driver/test/test_adc_common.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -19,7 +19,7 @@ #include "test_utils.h" #include "soc/adc_periph.h" -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3,ESP32C3, ESP8684) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3,ESP32C3, ESP32C2) #include "driver/dac.h" static const char *TAG = "test_adc"; diff --git a/components/driver/test/test_gpio.c b/components/driver/test/test_gpio.c index 1fe20914afc..e7a00766a6b 100644 --- a/components/driver/test/test_gpio.c +++ b/components/driver/test/test_gpio.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -63,7 +63,7 @@ #define TEST_GPIO_USB_DP_IO 19 // USB D+ GPIO #define TEST_GPIO_INPUT_LEVEL_HIGH_PIN 10 #define TEST_GPIO_INPUT_LEVEL_LOW_PIN 1 -#elif CONFIG_IDF_TARGET_ESP8684 +#elif CONFIG_IDF_TARGET_ESP32C2 #define TEST_GPIO_EXT_OUT_IO 2 // default output GPIO #define TEST_GPIO_EXT_IN_IO 3 // default input GPIO #define TEST_GPIO_OUTPUT_PIN 1 @@ -113,7 +113,7 @@ __attribute__((unused)) static void gpio_isr_edge_handler(void *arg) edge_intr_times++; } -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP32C3, ESP8684) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP32C3, ESP32C2) //No runners // level interrupt event with "gpio_intr_disable" static void gpio_isr_level_handler(void *arg) @@ -223,7 +223,7 @@ TEST_CASE("GPIO config parameters test", "[gpio]") #endif // SOC_HAS_INPUT_ONLY_PIN } -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP32C3, ESP8684) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP32C3, ESP32C2) //No runners TEST_CASE("GPIO rising edge interrupt test", "[gpio][test_env=UT_T1_GPIO]") { @@ -527,7 +527,7 @@ TEST_CASE("GPIO io pull up/down function", "[gpio]") TEST_ASSERT_EQUAL_INT_MESSAGE(gpio_get_level(TEST_GPIO_EXT_IN_IO), 0, "gpio_pullup_dis error, it can pull up"); } -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP32C3, ESP8684) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP32C3, ESP32C2) //No runners TEST_CASE("GPIO output and input mode test", "[gpio][test_env=UT_T1_GPIO]") { diff --git a/components/driver/test/test_i2c.c b/components/driver/test/test_i2c.c index 336214b2fbb..de1f5fb558f 100644 --- a/components/driver/test/test_i2c.c +++ b/components/driver/test/test_i2c.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -276,7 +276,7 @@ TEST_CASE("I2C driver memory leaking check", "[i2c]") TEST_ASSERT_INT_WITHIN(100, size, esp_get_free_heap_size()); } -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP8684) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP32C2) // print the reading buffer static void disp_buf(uint8_t *buf, int len) @@ -657,7 +657,7 @@ TEST_CASE("I2C general API test", "[i2c]") } } -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3, ESP32C3, ESP8684) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3, ESP32C3, ESP32C2) //Init uart baud rate detection static void uart_aut_baud_det_init(int rxd_io_num) { diff --git a/components/driver/test/test_rtcio.c b/components/driver/test/test_rtcio.c index 5f5cf97c45b..8f4c69c787b 100644 --- a/components/driver/test/test_rtcio.c +++ b/components/driver/test/test_rtcio.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -21,7 +21,7 @@ #include "esp_log.h" #include "soc/rtc_io_periph.h" -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3, ESP32C3, ESP8684) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3, ESP32C3, ESP32C2) #define RTCIO_CHECK(condition) TEST_ASSERT_MESSAGE((condition == ESP_OK), "ret is not ESP_OK") #define RTCIO_VERIFY(condition, msg) TEST_ASSERT_MESSAGE((condition), msg) diff --git a/components/driver/test/test_sigmadelta.c b/components/driver/test/test_sigmadelta.c index 01889ce1327..76fe8578db7 100644 --- a/components/driver/test/test_sigmadelta.c +++ b/components/driver/test/test_sigmadelta.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -67,4 +67,4 @@ TEST_CASE("SigmaDelta pin, duty, prescale set", "[sigma_delta][ignore]") vTaskDelay(3000 / portTICK_PERIOD_MS); } -#endif // #if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) +#endif // SOC_SIGMADELTA_SUPPORTED diff --git a/components/driver/test/test_spi_bus_lock.c b/components/driver/test/test_spi_bus_lock.c index 76d7f3fe409..04a2a4eb349 100644 --- a/components/driver/test/test_spi_bus_lock.c +++ b/components/driver/test/test_spi_bus_lock.c @@ -279,7 +279,7 @@ static void test_bus_lock(bool test_flash) TEST_ESP_OK(spi_bus_free(TEST_SPI_HOST) ); } -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32C3, ESP32S3, ESP8684) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32C3, ESP32S3, ESP32C2) //no runners TEST_CASE("spi bus lock, with flash","[spi][test_env=UT_T1_ESP_FLASH]") { @@ -293,7 +293,7 @@ TEST_CASE("spi bus lock","[spi]") test_bus_lock(false); } -#if !DISABLED_FOR_TARGETS(ESP32S2, ESP32C3, ESP32S3, ESP8684, ESP32H2) +#if !DISABLED_FOR_TARGETS(ESP32S2, ESP32C3, ESP32S3, ESP32C2, ESP32H2) //disable, SPI1 is not available for GPSPI usage on chips later than ESP32 static IRAM_ATTR esp_err_t test_polling_send(spi_device_handle_t handle) { diff --git a/components/driver/test/test_spi_master.c b/components/driver/test/test_spi_master.c index d70fbc48bff..c3dcde6ba0a 100644 --- a/components/driver/test/test_spi_master.c +++ b/components/driver/test/test_spi_master.c @@ -35,7 +35,7 @@ const static char TAG[] = "test_spi"; // There is no input-only pin on esp32c3 and esp32s3 -#define TEST_SOC_HAS_INPUT_ONLY_PINS (!DISABLED_FOR_TARGETS(ESP32C3, ESP32S3, ESP8684)) +#define TEST_SOC_HAS_INPUT_ONLY_PINS (!DISABLED_FOR_TARGETS(ESP32C3, ESP32S3, ESP32C2)) static void check_spi_pre_n_for(int clk, int pre, int n) { @@ -1316,8 +1316,8 @@ TEST_CASE_MULTIPLE_DEVICES("SPI Master: FD, DMA, Master Single Direction Test", #define GET_US_BY_CCOUNT(t) ((double)t/CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ) #elif CONFIG_IDF_TARGET_ESP32C3 #define GET_US_BY_CCOUNT(t) ((double)t/CONFIG_ESP32C3_DEFAULT_CPU_FREQ_MHZ) -#elif CONFIG_IDF_TARGET_ESP8684 -#define GET_US_BY_CCOUNT(t) ((double)t/CONFIG_ESP8684_DEFAULT_CPU_FREQ_MHZ) +#elif CONFIG_IDF_TARGET_ESP32C2 +#define GET_US_BY_CCOUNT(t) ((double)t/CONFIG_ESP32C2_DEFAULT_CPU_FREQ_MHZ) #endif static void speed_setup(spi_device_handle_t *spi, bool use_dma) diff --git a/components/driver/test/test_spi_sio.c b/components/driver/test/test_spi_sio.c index c8eba810b1d..61fa57a7294 100644 --- a/components/driver/test/test_spi_sio.c +++ b/components/driver/test/test_spi_sio.c @@ -144,7 +144,7 @@ TEST_CASE("SPI Single Board Test SIO", "[spi]") //TODO IDF-4455 -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32C3, ESP32S3, ESP8684, ESP32H2) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32C3, ESP32S3, ESP32C2, ESP32H2) //These tests are ESP32 only due to lack of runners /******************************************************************************** * Test SIO Master & Slave @@ -262,4 +262,4 @@ void test_sio_slave(void) } TEST_CASE_MULTIPLE_DEVICES("sio mode", "[spi][test_env=Example_SPI_Multi_device]", test_sio_master, test_sio_slave); -#endif //#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32C3, ESP8684, ESP32H2) +#endif //#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32C3, ESP32C2, ESP32H2) diff --git a/components/efuse/efuse_table_gen.py b/components/efuse/efuse_table_gen.py index b7d10701c59..24d600cd7ed 100755 --- a/components/efuse/efuse_table_gen.py +++ b/components/efuse/efuse_table_gen.py @@ -4,7 +4,7 @@ # # Converts efuse table to header file efuse_table.h. # -# SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD # # SPDX-License-Identifier: Apache-2.0 from __future__ import division, print_function @@ -487,7 +487,7 @@ def main(): parser = argparse.ArgumentParser(description='ESP32 eFuse Manager') parser.add_argument('--idf_target', '-t', help='Target chip type', choices=['esp32', 'esp32s2', 'esp32s3', 'esp32c3', - 'esp32h2', 'esp8684'], default='esp32') + 'esp32h2', 'esp32c2'], default='esp32') parser.add_argument('--quiet', '-q', help="Don't print non-critical status messages to stderr", action='store_true') parser.add_argument('--debug', help='Create header file with debug info', default=False, action='store_false') parser.add_argument('--info', help='Print info about range of used bits', default=False, action='store_true') diff --git a/components/efuse/esp8684/esp_efuse_fields.c b/components/efuse/esp32c2/esp_efuse_fields.c similarity index 92% rename from components/efuse/esp8684/esp_efuse_fields.c rename to components/efuse/esp32c2/esp_efuse_fields.c index 8233b3c13db..e6cb85c3f98 100644 --- a/components/efuse/esp8684/esp_efuse_fields.c +++ b/components/efuse/esp32c2/esp_efuse_fields.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -9,7 +9,7 @@ #include "esp_efuse_table.h" #include "stdlib.h" #include "esp_types.h" -#include "esp8684/rom/efuse.h" +#include "esp32c2/rom/efuse.h" #include "assert.h" #include "esp_err.h" #include "esp_log.h" diff --git a/components/efuse/esp8684/esp_efuse_table.c b/components/efuse/esp32c2/esp_efuse_table.c similarity index 99% rename from components/efuse/esp8684/esp_efuse_table.c rename to components/efuse/esp32c2/esp_efuse_table.c index 378f7e40bfe..51c9fcbcdfa 100644 --- a/components/efuse/esp8684/esp_efuse_table.c +++ b/components/efuse/esp32c2/esp_efuse_table.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/efuse/esp8684/esp_efuse_table.csv b/components/efuse/esp32c2/esp_efuse_table.csv similarity index 100% rename from components/efuse/esp8684/esp_efuse_table.csv rename to components/efuse/esp32c2/esp_efuse_table.csv diff --git a/components/efuse/esp8684/esp_efuse_utility.c b/components/efuse/esp32c2/esp_efuse_utility.c similarity index 93% rename from components/efuse/esp8684/esp_efuse_utility.c rename to components/efuse/esp32c2/esp_efuse_utility.c index 1542e9b44b9..864693959ce 100644 --- a/components/efuse/esp8684/esp_efuse_utility.c +++ b/components/efuse/esp32c2/esp_efuse_utility.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -11,7 +11,7 @@ #include "esp_efuse_utility.h" #include "soc/efuse_periph.h" #include "esp_private/esp_clk.h" -#include "esp8684/rom/efuse.h" +#include "esp32c2/rom/efuse.h" /*Range addresses to read blocks*/ const esp_efuse_range_addr_t range_read_addr_blocks[] = { diff --git a/components/efuse/esp8684/include/esp_efuse.h b/components/efuse/esp32c2/include/esp_efuse.h similarity index 90% rename from components/efuse/esp8684/include/esp_efuse.h rename to components/efuse/esp32c2/include/esp_efuse.h index 245bb0f5ae6..c1909927884 100644 --- a/components/efuse/esp8684/include/esp_efuse.h +++ b/components/efuse/esp32c2/include/esp_efuse.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -11,7 +11,7 @@ extern "C" { #endif /** - * @brief Type of eFuse blocks ESP8684 + * @brief Type of eFuse blocks ESP32C2 */ typedef enum { EFUSE_BLK0 = 0, /**< Number of eFuse BLOCK0. REPEAT_DATA */ @@ -37,7 +37,7 @@ typedef enum { EFUSE_CODING_SCHEME_RS = 3, /**< Reed-Solomon coding */ } esp_efuse_coding_scheme_t; -/** For ESP8684, there's no key purpose region for efuse keys, In order to maintain +/** For ESP32C2, there's no key purpose region for efuse keys, In order to maintain * compatibility with the previous apis, we should set the parameter of 'ets_efuse_purpose_t' * as default value ETS_EFUSE_KEY_PURPOSE_INVALID. * (In fact, this parameter can be any value, the api in the rom will not process key_purpose region) diff --git a/components/efuse/esp8684/include/esp_efuse_table.h b/components/efuse/esp32c2/include/esp_efuse_table.h similarity index 99% rename from components/efuse/esp8684/include/esp_efuse_table.h rename to components/efuse/esp32c2/include/esp_efuse_table.h index 3ebc34ac27d..e07bffcf11a 100644 --- a/components/efuse/esp8684/include/esp_efuse_table.h +++ b/components/efuse/esp32c2/include/esp_efuse_table.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/efuse/esp8684/private_include/esp_efuse_utility.h b/components/efuse/esp32c2/private_include/esp_efuse_utility.h similarity index 84% rename from components/efuse/esp8684/private_include/esp_efuse_utility.h rename to components/efuse/esp32c2/private_include/esp_efuse_utility.h index 37573eea8f3..9a3b1350122 100644 --- a/components/efuse/esp8684/private_include/esp_efuse_utility.h +++ b/components/efuse/esp32c2/private_include/esp_efuse_utility.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/efuse/esp8684/sources.cmake b/components/efuse/esp32c2/sources.cmake similarity index 100% rename from components/efuse/esp8684/sources.cmake rename to components/efuse/esp32c2/sources.cmake diff --git a/components/efuse/include/esp_efuse.h b/components/efuse/include/esp_efuse.h index 17b744ff632..83d0297aae3 100644 --- a/components/efuse/include/esp_efuse.h +++ b/components/efuse/include/esp_efuse.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -25,8 +25,8 @@ #include "esp32s3/rom/secure_boot.h" #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rom/secure_boot.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/secure_boot.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/secure_boot.h" #endif #ifdef __cplusplus diff --git a/components/efuse/src/esp_efuse_api_key_esp32xx.c b/components/efuse/src/esp_efuse_api_key_esp32xx.c index 091a04e2c21..7a698e8e53d 100644 --- a/components/efuse/src/esp_efuse_api_key_esp32xx.c +++ b/components/efuse/src/esp_efuse_api_key_esp32xx.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -31,7 +31,7 @@ typedef struct { } esp_efuse_revokes_t; const esp_efuse_keys_t s_table[EFUSE_BLK_KEY_MAX - EFUSE_BLK_KEY0] = { -#if CONFIG_IDF_TARGET_ESP8684 +#if CONFIG_IDF_TARGET_ESP32C2 {ESP_EFUSE_KEY0, NULL, ESP_EFUSE_RD_DIS_KEY0, ESP_EFUSE_WR_DIS_KEY0, NULL}, #else {ESP_EFUSE_KEY0, ESP_EFUSE_KEY_PURPOSE_0, ESP_EFUSE_RD_DIS_KEY0, ESP_EFUSE_WR_DIS_KEY0, ESP_EFUSE_WR_DIS_KEY0_PURPOSE}, @@ -43,7 +43,7 @@ const esp_efuse_keys_t s_table[EFUSE_BLK_KEY_MAX - EFUSE_BLK_KEY0] = { #if 0 {ESP_EFUSE_KEY6, ESP_EFUSE_KEY_PURPOSE_6, ESP_EFUSE_RD_DIS_KEY6, ESP_EFUSE_WR_DIS_KEY6, ESP_EFUSE_WR_DIS_KEY6_PURPOSE}, #endif -#endif //#if CONFIG_IDF_TARGET_ESP8684 +#endif //#if CONFIG_IDF_TARGET_ESP32C2 }; #if SOC_SUPPORT_SECURE_BOOT_REVOKE_KEY @@ -76,7 +76,7 @@ bool esp_efuse_block_is_empty(esp_efuse_block_t block) // Sets a write protection for the whole block. esp_err_t esp_efuse_set_write_protect(esp_efuse_block_t blk) { -#if !CONFIG_IDF_TARGET_ESP8684 +#if !CONFIG_IDF_TARGET_ESP32C2 if (blk == EFUSE_BLK1) { return esp_efuse_write_field_cnt(ESP_EFUSE_WR_DIS_BLK1, 1); } else if (blk == EFUSE_BLK2) { @@ -100,7 +100,7 @@ esp_err_t esp_efuse_set_read_protect(esp_efuse_block_t blk) unsigned idx = blk - EFUSE_BLK_KEY0; return esp_efuse_write_field_cnt(s_table[idx].key_rd_dis, 1); } -#if !CONFIG_IDF_TARGET_ESP8684 // IDF-3818 +#if !CONFIG_IDF_TARGET_ESP32C2 // IDF-3818 else if (blk == EFUSE_BLK10) { return esp_efuse_write_field_cnt(ESP_EFUSE_RD_DIS_SYS_DATA_PART2, 1); } @@ -171,7 +171,7 @@ esp_err_t esp_efuse_set_key_dis_write(esp_efuse_block_t block) return esp_efuse_write_field_bit(s_table[idx].key_wr_dis); } -#if !CONFIG_IDF_TARGET_ESP8684 // cause esp8684 efuse has no purpose region +#if !CONFIG_IDF_TARGET_ESP32C2 // cause esp32c2 efuse has no purpose region esp_efuse_purpose_t esp_efuse_get_key_purpose(esp_efuse_block_t block) { if (block < EFUSE_BLK_KEY0 || block >= EFUSE_BLK_KEY_MAX) { @@ -194,7 +194,7 @@ esp_err_t esp_efuse_set_key_purpose(esp_efuse_block_t block, esp_efuse_purpose_t unsigned idx = block - EFUSE_BLK_KEY0; return esp_efuse_write_field_blob(s_table[idx].keypurpose, &purpose, s_table[idx].keypurpose[0]->bit_count); } -#endif //CONFIG_IDF_TARGET_ESP8684 +#endif //CONFIG_IDF_TARGET_ESP32C2 bool esp_efuse_get_keypurpose_dis_write(esp_efuse_block_t block) { @@ -257,7 +257,7 @@ bool esp_efuse_key_block_unused(esp_efuse_block_t block) } if ( -#if !CONFIG_IDF_TARGET_ESP8684 +#if !CONFIG_IDF_TARGET_ESP32C2 esp_efuse_get_key_purpose(block) != ESP_EFUSE_KEY_PURPOSE_USER || esp_efuse_get_keypurpose_dis_write(block) || #endif @@ -277,7 +277,7 @@ esp_err_t esp_efuse_write_key(esp_efuse_block_t block, esp_efuse_purpose_t purpo { esp_err_t err = ESP_OK; -#if CONFIG_IDF_TARGET_ESP8684 +#if CONFIG_IDF_TARGET_ESP32C2 if (block != EFUSE_BLK_KEY0) { return ESP_ERR_INVALID_ARG; } @@ -296,7 +296,7 @@ esp_err_t esp_efuse_write_key(esp_efuse_block_t block, esp_efuse_purpose_t purpo ESP_EFUSE_CHK(esp_efuse_write_field_blob(s_table[idx].key, key, key_size_bytes * 8)); ESP_EFUSE_CHK(esp_efuse_set_key_dis_write(block)); -#if !CONFIG_IDF_TARGET_ESP8684 +#if !CONFIG_IDF_TARGET_ESP32C2 if (purpose == ESP_EFUSE_KEY_PURPOSE_XTS_AES_128_KEY || #ifdef SOC_FLASH_ENCRYPTION_XTS_AES_256 purpose == ESP_EFUSE_KEY_PURPOSE_XTS_AES_256_KEY_1 || @@ -310,7 +310,7 @@ esp_err_t esp_efuse_write_key(esp_efuse_block_t block, esp_efuse_purpose_t purpo } ESP_EFUSE_CHK(esp_efuse_set_key_purpose(block, purpose)); ESP_EFUSE_CHK(esp_efuse_set_keypurpose_dis_write(block)); -#endif //#if !CONFIG_IDF_TARGET_ESP8684 +#endif //#if !CONFIG_IDF_TARGET_ESP32C2 return esp_efuse_batch_write_commit(); } err_exit: diff --git a/components/efuse/src/esp_efuse_fields.c b/components/efuse/src/esp_efuse_fields.c index d44a227581a..f274e962db6 100644 --- a/components/efuse/src/esp_efuse_fields.c +++ b/components/efuse/src/esp_efuse_fields.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -33,7 +33,7 @@ void esp_efuse_reset(void) esp_efuse_utility_reset(); } -#if !CONFIG_IDF_TARGET_ESP8684 +#if !CONFIG_IDF_TARGET_ESP32C2 // IDF-3818 uint32_t esp_efuse_read_secure_version(void) { diff --git a/components/esp8684/CMakeLists.txt b/components/esp32c2/CMakeLists.txt similarity index 75% rename from components/esp8684/CMakeLists.txt rename to components/esp32c2/CMakeLists.txt index 60d31bfb984..4bf21890553 100644 --- a/components/esp8684/CMakeLists.txt +++ b/components/esp32c2/CMakeLists.txt @@ -1,5 +1,5 @@ idf_build_get_property(target IDF_TARGET) -if(NOT "${target}" STREQUAL "esp8684") +if(NOT "${target}" STREQUAL "esp32c2") return() endif() @@ -10,4 +10,4 @@ if(NOT BOOTLOADER_BUILD) endif() idf_component_register(REQUIRES riscv "${legacy_reqs}" - REQUIRED_IDF_TARGETS esp8684) + REQUIRED_IDF_TARGETS esp32c2) diff --git a/components/esp8684/Kconfig b/components/esp32c2/Kconfig similarity index 67% rename from components/esp8684/Kconfig rename to components/esp32c2/Kconfig index 9ae896abcba..a4bc83363d7 100644 --- a/components/esp8684/Kconfig +++ b/components/esp32c2/Kconfig @@ -1,46 +1,46 @@ -menu "ESP8684-Specific" - visible if IDF_TARGET_ESP8684 +menu "ESP32C2-Specific" + visible if IDF_TARGET_ESP32C2 - choice ESP8684_DEFAULT_CPU_FREQ_MHZ + choice ESP32C2_DEFAULT_CPU_FREQ_MHZ prompt "CPU frequency" - default ESP8684_DEFAULT_CPU_FREQ_40 if IDF_ENV_FPGA - default ESP8684_DEFAULT_CPU_FREQ_120 if !IDF_ENV_FPGA + default ESP32C2_DEFAULT_CPU_FREQ_40 if IDF_ENV_FPGA + default ESP32C2_DEFAULT_CPU_FREQ_120 if !IDF_ENV_FPGA help CPU frequency to be set on application startup. - config ESP8684_DEFAULT_CPU_FREQ_40 + config ESP32C2_DEFAULT_CPU_FREQ_40 bool "40 MHz" depends on IDF_ENV_FPGA - config ESP8684_DEFAULT_CPU_FREQ_80 + config ESP32C2_DEFAULT_CPU_FREQ_80 bool "80 MHz" - config ESP8684_DEFAULT_CPU_FREQ_120 + config ESP32C2_DEFAULT_CPU_FREQ_120 bool "120 MHz" endchoice - config ESP8684_DEFAULT_CPU_FREQ_MHZ + config ESP32C2_DEFAULT_CPU_FREQ_MHZ int - default 40 if ESP8684_DEFAULT_CPU_FREQ_40 - default 80 if ESP8684_DEFAULT_CPU_FREQ_80 - default 120 if ESP8684_DEFAULT_CPU_FREQ_120 + default 40 if ESP32C2_DEFAULT_CPU_FREQ_40 + default 80 if ESP32C2_DEFAULT_CPU_FREQ_80 + default 120 if ESP32C2_DEFAULT_CPU_FREQ_120 menu "Cache config" - choice ESP8684_MMU_PAGE_SIZE + choice ESP32C2_MMU_PAGE_SIZE # TODO: IDF-3821 prompt "Cache page size" - default ESP8684_MMU_PAGE_SIZE_64KB + default ESP32C2_MMU_PAGE_SIZE_64KB help Cache page size to be set on application startup - config ESP8684_MMU_PAGE_SIZE_16KB + config ESP32C2_MMU_PAGE_SIZE_16KB bool "16KB" - config ESP8684_MMU_PAGE_SIZE_32KB + config ESP32C2_MMU_PAGE_SIZE_32KB bool "32KB" - config ESP8684_MMU_PAGE_SIZE_64KB + config ESP32C2_MMU_PAGE_SIZE_64KB bool "64KB" endchoice - config ESP8684_INSTRUCTION_CACHE_WRAP + config ESP32C2_INSTRUCTION_CACHE_WRAP bool prompt "Instruction cache wrap" help @@ -48,15 +48,15 @@ menu "ESP8684-Specific" The wrap length is fixed to 32B - config ESP8684_MMU_PAGE_MODE + config ESP32C2_MMU_PAGE_MODE int - default 0 if ESP8684_MMU_PAGE_SIZE_16KB - default 1 if ESP8684_MMU_PAGE_SIZE_32KB - default 2 if ESP8684_MMU_PAGE_SIZE_64KB + default 0 if ESP32C2_MMU_PAGE_SIZE_16KB + default 1 if ESP32C2_MMU_PAGE_SIZE_32KB + default 2 if ESP32C2_MMU_PAGE_SIZE_64KB endmenu - config ESP8684_DEBUG_OCDAWARE + config ESP32C2_DEBUG_OCDAWARE bool "Make exception and panic handlers JTAG/OCD aware" default y select FREERTOS_DEBUG_OCDAWARE @@ -64,26 +64,26 @@ menu "ESP8684-Specific" The FreeRTOS panic and unhandled exception handers can detect a JTAG OCD debugger and instead of panicking, have the debugger stop on the offending instruction. - config ESP8684_DEBUG_STUBS_ENABLE + config ESP32C2_DEBUG_STUBS_ENABLE bool "OpenOCD debug stubs" default COMPILER_OPTIMIZATION_LEVEL_DEBUG - depends on !ESP8684_TRAX + depends on !ESP32C2_TRAX help Debug stubs are used by OpenOCD to execute pre-compiled onboard code which does some useful debugging, e.g. GCOV data dump. - config ESP8684_BROWNOUT_DET + config ESP32C2_BROWNOUT_DET bool "Hardware brownout detect & reset" default y help - The ESP8684 has a built-in brownout detector which can detect if the voltage is lower than + The ESP32C2 has a built-in brownout detector which can detect if the voltage is lower than a specific value. If this happens, it will reset the chip in order to prevent unintended behaviour. - choice ESP8684_BROWNOUT_DET_LVL_SEL + choice ESP32C2_BROWNOUT_DET_LVL_SEL prompt "Brownout voltage level" - depends on ESP8684_BROWNOUT_DET - default ESP8684_BROWNOUT_DET_LVL_SEL_7 + depends on ESP32C2_BROWNOUT_DET + default ESP32C2_BROWNOUT_DET_LVL_SEL_7 help The brownout detector will reset the chip when the supply voltage is approximately below this level. Note that there may be some variation of brownout voltage level @@ -91,32 +91,32 @@ menu "ESP8684-Specific" #The voltage levels here are estimates, more work needs to be done to figure out the exact voltages #of the brownout threshold levels. - config ESP8684_BROWNOUT_DET_LVL_SEL_7 + config ESP32C2_BROWNOUT_DET_LVL_SEL_7 bool "2.51V" - config ESP8684_BROWNOUT_DET_LVL_SEL_6 + config ESP32C2_BROWNOUT_DET_LVL_SEL_6 bool "2.64V" - config ESP8684_BROWNOUT_DET_LVL_SEL_5 + config ESP32C2_BROWNOUT_DET_LVL_SEL_5 bool "2.76V" - config ESP8684_BROWNOUT_DET_LVL_SEL_4 + config ESP32C2_BROWNOUT_DET_LVL_SEL_4 bool "2.92V" - config ESP8684_BROWNOUT_DET_LVL_SEL_3 + config ESP32C2_BROWNOUT_DET_LVL_SEL_3 bool "3.10V" - config ESP8684_BROWNOUT_DET_LVL_SEL_2 + config ESP32C2_BROWNOUT_DET_LVL_SEL_2 bool "3.27V" endchoice - config ESP8684_BROWNOUT_DET_LVL + config ESP32C2_BROWNOUT_DET_LVL int - default 2 if ESP8684_BROWNOUT_DET_LVL_SEL_2 - default 3 if ESP8684_BROWNOUT_DET_LVL_SEL_3 - default 4 if ESP8684_BROWNOUT_DET_LVL_SEL_4 - default 5 if ESP8684_BROWNOUT_DET_LVL_SEL_5 - default 6 if ESP8684_BROWNOUT_DET_LVL_SEL_6 - default 7 if ESP8684_BROWNOUT_DET_LVL_SEL_7 + default 2 if ESP32C2_BROWNOUT_DET_LVL_SEL_2 + default 3 if ESP32C2_BROWNOUT_DET_LVL_SEL_3 + default 4 if ESP32C2_BROWNOUT_DET_LVL_SEL_4 + default 5 if ESP32C2_BROWNOUT_DET_LVL_SEL_5 + default 6 if ESP32C2_BROWNOUT_DET_LVL_SEL_6 + default 7 if ESP32C2_BROWNOUT_DET_LVL_SEL_7 - choice ESP8684_TIME_SYSCALL + choice ESP32C2_TIME_SYSCALL prompt "Timers used for gettimeofday function" - default ESP8684_TIME_SYSCALL_USE_RTC_SYSTIMER + default ESP32C2_TIME_SYSCALL_USE_RTC_SYSTIMER help This setting defines which hardware timers are used to implement 'gettimeofday' and 'time' functions in C library. @@ -136,41 +136,41 @@ menu "ESP8684-Specific" - When RTC is used for timekeeping, two RTC_STORE registers are used to keep time in deep sleep mode. - config ESP8684_TIME_SYSCALL_USE_RTC_SYSTIMER + config ESP32C2_TIME_SYSCALL_USE_RTC_SYSTIMER bool "RTC and high-resolution timer" select ESP_TIME_FUNCS_USE_RTC_TIMER select ESP_TIME_FUNCS_USE_ESP_TIMER - config ESP8684_TIME_SYSCALL_USE_RTC + config ESP32C2_TIME_SYSCALL_USE_RTC bool "RTC" select ESP_TIME_FUNCS_USE_RTC_TIMER - config ESP8684_TIME_SYSCALL_USE_SYSTIMER + config ESP32C2_TIME_SYSCALL_USE_SYSTIMER bool "High-resolution timer" select ESP_TIME_FUNCS_USE_ESP_TIMER - config ESP8684_TIME_SYSCALL_USE_NONE + config ESP32C2_TIME_SYSCALL_USE_NONE bool "None" select ESP_TIME_FUNCS_USE_NONE endchoice - choice ESP8684_RTC_CLK_SRC + choice ESP32C2_RTC_CLK_SRC prompt "RTC clock source" - default ESP8684_RTC_CLK_SRC_INT_RC + default ESP32C2_RTC_CLK_SRC_INT_RC help Choose which clock is used as RTC clock source. - config ESP8684_RTC_CLK_SRC_INT_RC + config ESP32C2_RTC_CLK_SRC_INT_RC bool "Internal 150kHz RC oscillator" - config ESP8684_RTC_CLK_SRC_EXT_OSC + config ESP32C2_RTC_CLK_SRC_EXT_OSC bool "External 32kHz oscillator at 32K_XP pin" - config ESP8684_RTC_CLK_SRC_INT_8MD256 + config ESP32C2_RTC_CLK_SRC_INT_8MD256 bool "Internal 8MHz oscillator, divided by 256 (~32kHz)" endchoice - config ESP8684_RTC_CLK_CAL_CYCLES + config ESP32C2_RTC_CLK_CAL_CYCLES int "Number of cycles for RTC_SLOW_CLK calibration" - default 3000 if ESP8684_RTC_CLK_SRC_EXT_CRYS || ESP8684_RTC_CLK_SRC_EXT_OSC || ESP8684_RTC_CLK_SRC_INT_8MD256 - default 1024 if ESP8684_RTC_CLK_SRC_INT_RC - range 0 27000 if ESP8684_RTC_CLK_SRC_EXT_CRYS || ESP8684_RTC_CLK_SRC_EXT_OSC || ESP8684_RTC_CLK_SRC_INT_8MD256 - range 0 32766 if ESP8684_RTC_CLK_SRC_INT_RC + default 3000 if ESP32C2_RTC_CLK_SRC_EXT_CRYS || ESP32C2_RTC_CLK_SRC_EXT_OSC || ESP32C2_RTC_CLK_SRC_INT_8MD256 + default 1024 if ESP32C2_RTC_CLK_SRC_INT_RC + range 0 27000 if ESP32C2_RTC_CLK_SRC_EXT_CRYS || ESP32C2_RTC_CLK_SRC_EXT_OSC || ESP32C2_RTC_CLK_SRC_INT_8MD256 + range 0 32766 if ESP32C2_RTC_CLK_SRC_INT_RC help When the startup code initializes RTC_SLOW_CLK, it can perform calibration by comparing the RTC_SLOW_CLK frequency with main XTAL @@ -187,7 +187,7 @@ menu "ESP8684-Specific" In case more value will help improve the definition of the launch of the crystal. If the crystal could not start, it will be switched to internal RC. - config ESP8684_NO_BLOBS + config ESP32C2_NO_BLOBS bool "No Binary Blobs" depends on !BT_ENABLED default n @@ -195,12 +195,12 @@ menu "ESP8684-Specific" If enabled, this disables the linking of binary libraries in the application build. Note that after enabling this Wi-Fi/Bluetooth will not work. - config ESP8684_LIGHTSLEEP_GPIO_RESET_WORKAROUND # IDF-3904 + config ESP32C2_LIGHTSLEEP_GPIO_RESET_WORKAROUND # IDF-3904 bool "light sleep GPIO reset workaround" default y select PM_SLP_DISABLE_GPIO if FREERTOS_USE_TICKLESS_IDLE help - ESP8684 will reset at wake-up if GPIO is received a small electrostatic pulse during + ESP32C2 will reset at wake-up if GPIO is received a small electrostatic pulse during light sleep, with specific condition - GPIO needs to be configured as input-mode only @@ -214,4 +214,4 @@ menu "ESP8684-Specific" This option provides a software workaround for this issue. Configure to isolate all GPIO pins in sleep state. -endmenu # ESP8684-Specific +endmenu # ESP32C2-Specific diff --git a/components/esp8684/project_include.cmake b/components/esp32c2/project_include.cmake similarity index 100% rename from components/esp8684/project_include.cmake rename to components/esp32c2/project_include.cmake diff --git a/components/esp_gdbstub/CMakeLists.txt b/components/esp_gdbstub/CMakeLists.txt index de74a99b484..869aaaaafb6 100644 --- a/components/esp_gdbstub/CMakeLists.txt +++ b/components/esp_gdbstub/CMakeLists.txt @@ -1,6 +1,6 @@ idf_build_get_property(target IDF_TARGET) -if(NOT "${target}" STREQUAL "esp8684") # TODO: IDF-4135 +if(NOT "${target}" STREQUAL "esp32c2") # TODO: IDF-4135 idf_component_register(SRCS "src/gdbstub.c" "src/packet.c" INCLUDE_DIRS "include" PRIV_INCLUDE_DIRS "private_include" diff --git a/components/esp_gdbstub/esp8684/gdbstub_esp8684.c b/components/esp_gdbstub/esp32c2/gdbstub_esp32c2.c similarity index 96% rename from components/esp_gdbstub/esp8684/gdbstub_esp8684.c rename to components/esp_gdbstub/esp32c2/gdbstub_esp32c2.c index ef50621482b..9e133a0d000 100644 --- a/components/esp_gdbstub/esp8684/gdbstub_esp8684.c +++ b/components/esp_gdbstub/esp32c2/gdbstub_esp32c2.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_gdbstub/esp8684/gdbstub_target_config.h b/components/esp_gdbstub/esp32c2/gdbstub_target_config.h similarity index 52% rename from components/esp_gdbstub/esp8684/gdbstub_target_config.h rename to components/esp_gdbstub/esp32c2/gdbstub_target_config.h index 2cdcefb5f74..d4749ddddc5 100644 --- a/components/esp_gdbstub/esp8684/gdbstub_target_config.h +++ b/components/esp_gdbstub/esp32c2/gdbstub_target_config.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_hw_support/cpu_util.c b/components/esp_hw_support/cpu_util.c index 1969df6e621..722fb35686d 100644 --- a/components/esp_hw_support/cpu_util.c +++ b/components/esp_hw_support/cpu_util.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -75,7 +75,7 @@ bool IRAM_ATTR esp_cpu_in_ocd_debug_mode(void) CONFIG_ESP32S3_DEBUG_OCDAWARE || \ CONFIG_ESP32C3_DEBUG_OCDAWARE || \ CONFIG_ESP32H2_DEBUG_OCDAWARE || \ - CONFIG_ESP8684_DEBUG_OCDAWARE + CONFIG_ESP32C2_DEBUG_OCDAWARE return cpu_ll_is_debugger_attached(); #else return false; // Always return false if "OCD aware" is disabled diff --git a/components/esp_hw_support/esp_clk.c b/components/esp_hw_support/esp_clk.c index 8ea3a4bb899..31170508326 100644 --- a/components/esp_hw_support/esp_clk.c +++ b/components/esp_hw_support/esp_clk.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -30,9 +30,9 @@ #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rom/rtc.h" #include "esp32h2/rtc.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/rtc.h" -#include "esp8684/rtc.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/rtc.h" +#include "esp32c2/rtc.h" #endif #define MHZ (1000000) @@ -74,7 +74,7 @@ int IRAM_ATTR esp_clk_xtal_freq(void) return rtc_clk_xtal_freq_get() * MHZ; } -#if !CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32H2 && !CONFIG_IDF_TARGET_ESP8684 +#if !CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32H2 && !CONFIG_IDF_TARGET_ESP32C2 void IRAM_ATTR ets_update_cpu_frequency(uint32_t ticks_per_us) { /* Update scale factors used by esp_rom_delay_us */ diff --git a/components/esp_hw_support/include/esp_chip_info.h b/components/esp_hw_support/include/esp_chip_info.h index c8dc8bbb8a3..9c2ba9bc06f 100644 --- a/components/esp_hw_support/include/esp_chip_info.h +++ b/components/esp_hw_support/include/esp_chip_info.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -25,7 +25,7 @@ typedef enum { CHIP_ESP32S3 = 9, //!< ESP32-S3 CHIP_ESP32C3 = 5, //!< ESP32-C3 CHIP_ESP32H2 = 6, //!< ESP32-H2 - CHIP_ESP8684 = 12, //!< ESP-8684 + CHIP_ESP32C2 = 12, //!< ESP32-C2 } esp_chip_model_t; /* Chip feature flags, used in esp_chip_info_t */ diff --git a/components/esp_hw_support/include/esp_mac.h b/components/esp_hw_support/include/esp_mac.h index 3a3a006a226..b5dc86adaf8 100644 --- a/components/esp_hw_support/include/esp_mac.h +++ b/components/esp_hw_support/include/esp_mac.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -34,8 +34,8 @@ typedef enum { #define UNIVERSAL_MAC_ADDR_NUM CONFIG_ESP32C3_UNIVERSAL_MAC_ADDRESSES #elif CONFIG_IDF_TARGET_ESP32H2 #define UNIVERSAL_MAC_ADDR_NUM CONFIG_ESP32H2_UNIVERSAL_MAC_ADDRESSES -#elif CONFIG_IDF_TARGET_ESP8684 -#define UNIVERSAL_MAC_ADDR_NUM CONFIG_ESP8684_UNIVERSAL_MAC_ADDRESSES +#elif CONFIG_IDF_TARGET_ESP32C2 +#define UNIVERSAL_MAC_ADDR_NUM CONFIG_ESP32C2_UNIVERSAL_MAC_ADDRESSES #endif /** @endcond */ diff --git a/components/esp_hw_support/include/soc/esp8684/dport_access.h b/components/esp_hw_support/include/soc/esp32c2/dport_access.h similarity index 91% rename from components/esp_hw_support/include/soc/esp8684/dport_access.h rename to components/esp_hw_support/include/soc/esp32c2/dport_access.h index e5aedd2e1b1..72c7e26f59e 100644 --- a/components/esp_hw_support/include/soc/esp8684/dport_access.h +++ b/components/esp_hw_support/include/soc/esp32c2/dport_access.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2010-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_hw_support/include/soc/esp8684/esp_crypto_lock.h b/components/esp_hw_support/include/soc/esp32c2/esp_crypto_lock.h similarity index 95% rename from components/esp_hw_support/include/soc/esp8684/esp_crypto_lock.h rename to components/esp_hw_support/include/soc/esp32c2/esp_crypto_lock.h index 67a08741b51..1109610f370 100644 --- a/components/esp_hw_support/include/soc/esp8684/esp_crypto_lock.h +++ b/components/esp_hw_support/include/soc/esp32c2/esp_crypto_lock.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_hw_support/include/soc/esp8684/memprot.h b/components/esp_hw_support/include/soc/esp32c2/memprot.h similarity index 99% rename from components/esp_hw_support/include/soc/esp8684/memprot.h rename to components/esp_hw_support/include/soc/esp32c2/memprot.h index 0954e46cb60..c0db1ee5b1b 100644 --- a/components/esp_hw_support/include/soc/esp8684/memprot.h +++ b/components/esp_hw_support/include/soc/esp32c2/memprot.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -237,7 +237,7 @@ bool esp_memprot_get_monitor_en(mem_type_prot_t mem_type); /** * @brief Gets CPU ID for currently active PMS violation interrupt * - * @return CPU ID (CPU_PRO for ESP8684) + * @return CPU ID (CPU_PRO for ESP32-C2) */ int IRAM_ATTR esp_memprot_intr_get_cpuid(void); diff --git a/components/esp_hw_support/include/soc/esp8684/rtc.h b/components/esp_hw_support/include/soc/esp32c2/rtc.h similarity index 84% rename from components/esp_hw_support/include/soc/esp8684/rtc.h rename to components/esp_hw_support/include/soc/esp32c2/rtc.h index b8aef368054..31ad001e89e 100644 --- a/components/esp_hw_support/include/soc/esp8684/rtc.h +++ b/components/esp_hw_support/include/soc/esp32c2/rtc.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -13,7 +13,7 @@ extern "C" { #endif /** - * @file esp8684/rtc.h + * @file esp32c2/rtc.h * * This file contains declarations of rtc related functions. */ diff --git a/components/esp_hw_support/include/soc_log.h b/components/esp_hw_support/include/soc_log.h index 4ce812e1a52..9fbaa3a00a9 100644 --- a/components/esp_hw_support/include/soc_log.h +++ b/components/esp_hw_support/include/soc_log.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2016-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2016-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -35,8 +35,8 @@ #include "esp32c3/rom/ets_sys.h" #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rom/ets_sys.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/ets_sys.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/ets_sys.h" #endif #define SOC_LOGE(tag, fmt, ...) esp_rom_printf("%s(err): " fmt, tag, ##__VA_ARGS__) diff --git a/components/esp_hw_support/linker.lf b/components/esp_hw_support/linker.lf index 0bae8f25d81..11e5966c0fa 100644 --- a/components/esp_hw_support/linker.lf +++ b/components/esp_hw_support/linker.lf @@ -9,7 +9,7 @@ entries: rtc_pm (noflash_text) rtc_sleep (noflash_text) rtc_time (noflash_text) - if IDF_TARGET_ESP32C3 = n && IDF_TARGET_ESP32H2 = n && IDF_TARGET_ESP8684 = n: + if IDF_TARGET_ESP32C3 = n && IDF_TARGET_ESP32H2 = n && IDF_TARGET_ESP32C2 = n: rtc_wdt (noflash_text) if IDF_TARGET_ESP32S3 = y: if SPIRAM_MODE_QUAD = y: diff --git a/components/esp_hw_support/port/esp8684/CMakeLists.txt b/components/esp_hw_support/port/esp32c2/CMakeLists.txt similarity index 95% rename from components/esp_hw_support/port/esp8684/CMakeLists.txt rename to components/esp_hw_support/port/esp32c2/CMakeLists.txt index c1725ecac12..6e60b18e0b8 100644 --- a/components/esp_hw_support/port/esp8684/CMakeLists.txt +++ b/components/esp_hw_support/port/esp32c2/CMakeLists.txt @@ -1,4 +1,4 @@ -set(srcs "cpu_util_esp8684.c" +set(srcs "cpu_util_esp32c2.c" "rtc_clk_init.c" "rtc_clk.c" "rtc_init.c" diff --git a/components/esp_hw_support/port/esp8684/Kconfig.mac b/components/esp_hw_support/port/esp32c2/Kconfig.mac similarity index 80% rename from components/esp_hw_support/port/esp8684/Kconfig.mac rename to components/esp_hw_support/port/esp32c2/Kconfig.mac index 23a18c02373..369c6abde40 100644 --- a/components/esp_hw_support/port/esp8684/Kconfig.mac +++ b/components/esp_hw_support/port/esp32c2/Kconfig.mac @@ -1,6 +1,6 @@ -choice ESP8684_UNIVERSAL_MAC_ADDRESSES +choice ESP32C2_UNIVERSAL_MAC_ADDRESSES bool "Number of universally administered (by IEEE) MAC address" - default ESP8684_UNIVERSAL_MAC_ADDRESSES_FOUR + default ESP32C2_UNIVERSAL_MAC_ADDRESSES_FOUR help Configure the number of universally administered (by IEEE) MAC addresses. @@ -21,15 +21,15 @@ choice ESP8684_UNIVERSAL_MAC_ADDRESSES a custom universal MAC address range, the correct setting will depend on the allocation of MAC addresses in this range (either 2 or 4 per device.) - Note that ESP-8684 has no integrated Ethernet MAC. Although it's possible to use the esp_read_mac() + Note that ESP32-C2 has no integrated Ethernet MAC. Although it's possible to use the esp_read_mac() API to return a MAC for Ethernet, this can only be used with an external MAC peripheral. - config ESP8684_UNIVERSAL_MAC_ADDRESSES_TWO + config ESP32C2_UNIVERSAL_MAC_ADDRESSES_TWO bool "Two" select ESP_MAC_ADDR_UNIVERSE_WIFI_STA select ESP_MAC_ADDR_UNIVERSE_BT - config ESP8684_UNIVERSAL_MAC_ADDRESSES_FOUR + config ESP32C2_UNIVERSAL_MAC_ADDRESSES_FOUR bool "Four" select ESP_MAC_ADDR_UNIVERSE_WIFI_STA select ESP_MAC_ADDR_UNIVERSE_WIFI_AP @@ -37,8 +37,8 @@ choice ESP8684_UNIVERSAL_MAC_ADDRESSES select ESP_MAC_ADDR_UNIVERSE_ETH endchoice -config ESP8684_UNIVERSAL_MAC_ADDRESSES - # TODO: check 8684 mac address WIFI-4134 +config ESP32C2_UNIVERSAL_MAC_ADDRESSES + # TODO: check ESP32-C2 mac address WIFI-4134 int - default 2 if ESP8684_UNIVERSAL_MAC_ADDRESSES_TWO - default 4 if ESP8684_UNIVERSAL_MAC_ADDRESSES_FOUR + default 2 if ESP32C2_UNIVERSAL_MAC_ADDRESSES_TWO + default 4 if ESP32C2_UNIVERSAL_MAC_ADDRESSES_FOUR diff --git a/components/esp_hw_support/port/esp8684/chip_info.c b/components/esp_hw_support/port/esp32c2/chip_info.c similarity index 78% rename from components/esp_hw_support/port/esp8684/chip_info.c rename to components/esp_hw_support/port/esp32c2/chip_info.c index d3ab76f6203..cfedff172d2 100644 --- a/components/esp_hw_support/port/esp8684/chip_info.c +++ b/components/esp_hw_support/port/esp32c2/chip_info.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2013-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2013-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -11,7 +11,7 @@ void esp_chip_info(esp_chip_info_t *out_info) { memset(out_info, 0, sizeof(*out_info)); - out_info->model = CHIP_ESP8684; + out_info->model = CHIP_ESP32C2; out_info->revision = esp_efuse_get_chip_ver(); out_info->cores = 1; out_info->features = CHIP_FEATURE_WIFI_BGN | CHIP_FEATURE_BLE; diff --git a/components/esp_hw_support/port/esp8684/cpu_util_esp8684.c b/components/esp_hw_support/port/esp32c2/cpu_util_esp32c2.c similarity index 93% rename from components/esp_hw_support/port/esp8684/cpu_util_esp8684.c rename to components/esp_hw_support/port/esp32c2/cpu_util_esp32c2.c index be12789187a..92434e26ba3 100644 --- a/components/esp_hw_support/port/esp8684/cpu_util_esp8684.c +++ b/components/esp_hw_support/port/esp32c2/cpu_util_esp32c2.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -10,7 +10,7 @@ void esp_cpu_configure_region_protection(void) { /* Notes on implementation: * - * 1) ESP-8684 CPU support overlapping PMP regions, configuration is based on static priority + * 1) ESP32-C2 CPU support overlapping PMP regions, configuration is based on static priority * feature(lowest numbered entry has highest priority). * * 2) Therefore, we use TOR (top of range) and NAOPT entries to map the effective area. diff --git a/components/esp_hw_support/port/esp8684/dport_access.c b/components/esp_hw_support/port/esp32c2/dport_access.c similarity index 86% rename from components/esp_hw_support/port/esp8684/dport_access.c rename to components/esp_hw_support/port/esp32c2/dport_access.c index 8364f5687e5..3476bbe72dd 100644 --- a/components/esp_hw_support/port/esp8684/dport_access.c +++ b/components/esp_hw_support/port/esp32c2/dport_access.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2010-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_hw_support/port/esp8684/esp_crypto_lock.c b/components/esp_hw_support/port/esp32c2/esp_crypto_lock.c similarity index 95% rename from components/esp_hw_support/port/esp8684/esp_crypto_lock.c rename to components/esp_hw_support/port/esp32c2/esp_crypto_lock.c index e8f8aeb9c65..33a9e336180 100644 --- a/components/esp_hw_support/port/esp8684/esp_crypto_lock.c +++ b/components/esp_hw_support/port/esp32c2/esp_crypto_lock.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_hw_support/port/esp8684/i2c_brownout.h b/components/esp_hw_support/port/esp32c2/i2c_brownout.h similarity index 88% rename from components/esp_hw_support/port/esp8684/i2c_brownout.h rename to components/esp_hw_support/port/esp32c2/i2c_brownout.h index 1d2ab344112..114a30543fa 100644 --- a/components/esp_hw_support/port/esp8684/i2c_brownout.h +++ b/components/esp_hw_support/port/esp32c2/i2c_brownout.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_hw_support/port/esp8684/private_include/regi2c_bbpll.h b/components/esp_hw_support/port/esp32c2/private_include/regi2c_bbpll.h similarity index 98% rename from components/esp_hw_support/port/esp8684/private_include/regi2c_bbpll.h rename to components/esp_hw_support/port/esp32c2/private_include/regi2c_bbpll.h index 8235741d58f..e71072f55a9 100644 --- a/components/esp_hw_support/port/esp8684/private_include/regi2c_bbpll.h +++ b/components/esp_hw_support/port/esp32c2/private_include/regi2c_bbpll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_hw_support/port/esp8684/private_include/regi2c_bias.h b/components/esp_hw_support/port/esp32c2/private_include/regi2c_bias.h similarity index 77% rename from components/esp_hw_support/port/esp8684/private_include/regi2c_bias.h rename to components/esp_hw_support/port/esp32c2/private_include/regi2c_bias.h index 35e859fda63..67dcd770a6a 100644 --- a/components/esp_hw_support/port/esp8684/private_include/regi2c_bias.h +++ b/components/esp_hw_support/port/esp32c2/private_include/regi2c_bias.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -11,7 +11,7 @@ * @brief Register definitions for bias * * This file lists register fields of BIAS. These definitions are used via macros defined in regi2c_ctrl.h, by - * bootloader_hardware_init function in bootloader_esp8684.c. + * bootloader_hardware_init function in bootloader_esp32c2.c. */ #define I2C_BIAS 0X6A diff --git a/components/esp_hw_support/port/esp8684/private_include/regi2c_brownout.h b/components/esp_hw_support/port/esp32c2/private_include/regi2c_brownout.h similarity index 88% rename from components/esp_hw_support/port/esp8684/private_include/regi2c_brownout.h rename to components/esp_hw_support/port/esp32c2/private_include/regi2c_brownout.h index 1aa54a20177..76c943b2046 100644 --- a/components/esp_hw_support/port/esp8684/private_include/regi2c_brownout.h +++ b/components/esp_hw_support/port/esp32c2/private_include/regi2c_brownout.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_hw_support/port/esp8684/private_include/regi2c_dig_reg.h b/components/esp_hw_support/port/esp32c2/private_include/regi2c_dig_reg.h similarity index 96% rename from components/esp_hw_support/port/esp8684/private_include/regi2c_dig_reg.h rename to components/esp_hw_support/port/esp32c2/private_include/regi2c_dig_reg.h index 9d2032b60ef..b8519186b92 100644 --- a/components/esp_hw_support/port/esp8684/private_include/regi2c_dig_reg.h +++ b/components/esp_hw_support/port/esp32c2/private_include/regi2c_dig_reg.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_hw_support/port/esp8684/private_include/regi2c_lp_bias.h b/components/esp_hw_support/port/esp32c2/private_include/regi2c_lp_bias.h similarity index 95% rename from components/esp_hw_support/port/esp8684/private_include/regi2c_lp_bias.h rename to components/esp_hw_support/port/esp32c2/private_include/regi2c_lp_bias.h index c50c1a941a3..693de751e43 100644 --- a/components/esp_hw_support/port/esp8684/private_include/regi2c_lp_bias.h +++ b/components/esp_hw_support/port/esp32c2/private_include/regi2c_lp_bias.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_hw_support/port/esp8684/private_include/regi2c_saradc.h b/components/esp_hw_support/port/esp32c2/private_include/regi2c_saradc.h similarity index 97% rename from components/esp_hw_support/port/esp8684/private_include/regi2c_saradc.h rename to components/esp_hw_support/port/esp32c2/private_include/regi2c_saradc.h index 1c35fd61ef7..dd235565272 100644 --- a/components/esp_hw_support/port/esp8684/private_include/regi2c_saradc.h +++ b/components/esp_hw_support/port/esp32c2/private_include/regi2c_saradc.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2019-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_hw_support/port/esp8684/regi2c_ctrl.h b/components/esp_hw_support/port/esp32c2/regi2c_ctrl.h similarity index 97% rename from components/esp_hw_support/port/esp8684/regi2c_ctrl.h rename to components/esp_hw_support/port/esp32c2/regi2c_ctrl.h index a4d25628f9a..423c2b0bbbe 100644 --- a/components/esp_hw_support/port/esp8684/regi2c_ctrl.h +++ b/components/esp_hw_support/port/esp32c2/regi2c_ctrl.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_hw_support/port/esp8684/rtc_clk.c b/components/esp_hw_support/port/esp32c2/rtc_clk.c similarity index 97% rename from components/esp_hw_support/port/esp8684/rtc_clk.c rename to components/esp_hw_support/port/esp32c2/rtc_clk.c index bade68108ad..a1168fb6da1 100644 --- a/components/esp_hw_support/port/esp8684/rtc_clk.c +++ b/components/esp_hw_support/port/esp32c2/rtc_clk.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -10,10 +10,10 @@ #include #include #include "sdkconfig.h" -#include "esp8684/rom/ets_sys.h" -#include "esp8684/rom/rtc.h" -#include "esp8684/rom/uart.h" -#include "esp8684/rom/gpio.h" +#include "esp32c2/rom/ets_sys.h" +#include "esp32c2/rom/rtc.h" +#include "esp32c2/rom/uart.h" +#include "esp32c2/rom/gpio.h" #include "soc/rtc.h" #include "soc/rtc_cntl_reg.h" #include "soc/efuse_reg.h" @@ -37,7 +37,7 @@ static void rtc_clk_cpu_freq_to_8m(void); void rtc_clk_32k_bootstrap(uint32_t cycle) { - /* No special bootstrapping needed for ESP-8684, 'cycle' argument is to keep the signature + /* No special bootstrapping needed for ESP32-C2, 'cycle' argument is to keep the signature * same as for the ESP32. Just enable the XTAL here. */ } @@ -137,7 +137,7 @@ static void rtc_clk_bbpll_enable(void) void rtc_clk_bbpll_configure(rtc_xtal_freq_t xtal_freq, int pll_freq) { (void) xtal_freq; - // ESP8684 only support 40M XTAL, all the parameters are given as 40M XTAL directly. + // ESP32-C2 only support 40M XTAL, all the parameters are given as 40M XTAL directly. uint8_t div_ref = 0; uint8_t div7_0 = 8; uint8_t dr1 = 0; @@ -270,7 +270,7 @@ void rtc_clk_cpu_freq_get_config(rtc_cpu_freq_config_t *out_config) case DPORT_SOC_CLK_SEL_PLL: { source = RTC_CPU_FREQ_SRC_PLL; uint32_t cpuperiod_sel = REG_GET_FIELD(SYSTEM_CPU_PER_CONF_REG, SYSTEM_CPUPERIOD_SEL); - source_freq_mhz = RTC_PLL_FREQ_480M; // PLL clock on ESP8684 was fixed to 480MHz + source_freq_mhz = RTC_PLL_FREQ_480M; // PLL clock on ESP32-C2 was fixed to 480MHz if (cpuperiod_sel == DPORT_CPUPERIOD_SEL_80) { div = 6; freq_mhz = 80; diff --git a/components/esp_hw_support/port/esp8684/rtc_clk_common.h b/components/esp_hw_support/port/esp32c2/rtc_clk_common.h similarity index 93% rename from components/esp_hw_support/port/esp8684/rtc_clk_common.h rename to components/esp_hw_support/port/esp32c2/rtc_clk_common.h index b34ae06eefd..488a9c1c98a 100644 --- a/components/esp_hw_support/port/esp8684/rtc_clk_common.h +++ b/components/esp_hw_support/port/esp32c2/rtc_clk_common.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_hw_support/port/esp8684/rtc_clk_init.c b/components/esp_hw_support/port/esp32c2/rtc_clk_init.c similarity index 94% rename from components/esp_hw_support/port/esp8684/rtc_clk_init.c rename to components/esp_hw_support/port/esp32c2/rtc_clk_init.c index 57d8062007b..53b107598d5 100644 --- a/components/esp_hw_support/port/esp8684/rtc_clk_init.c +++ b/components/esp_hw_support/port/esp32c2/rtc_clk_init.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -8,9 +8,9 @@ #include #include #include -#include "esp8684/rom/ets_sys.h" -#include "esp8684/rom/rtc.h" -#include "esp8684/rom/uart.h" +#include "esp32c2/rom/ets_sys.h" +#include "esp32c2/rom/rtc.h" +#include "esp32c2/rom/uart.h" #include "soc/rtc.h" #include "soc/rtc_periph.h" #include "soc/efuse_periph.h" diff --git a/components/esp_hw_support/port/esp8684/rtc_init.c b/components/esp_hw_support/port/esp32c2/rtc_init.c similarity index 97% rename from components/esp_hw_support/port/esp8684/rtc_init.c rename to components/esp_hw_support/port/esp32c2/rtc_init.c index a95737bbfdc..23b67f3cc6d 100644 --- a/components/esp_hw_support/port/esp8684/rtc_init.c +++ b/components/esp_hw_support/port/esp32c2/rtc_init.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -124,7 +124,7 @@ void rtc_vddsdio_set_config(rtc_vddsdio_config_t config) static void set_ocode_by_efuse(int calib_version) { -#if !CONFIG_IDF_TARGET_ESP8684 //TODO: Need check for esp8684 +#if !CONFIG_IDF_TARGET_ESP32C2 //TODO: Need check for esp32c2 assert(calib_version == 1); // use efuse ocode. uint32_t ocode; @@ -190,7 +190,7 @@ static void calibrate_ocode(void) static uint32_t get_dig_dbias_by_efuse(uint8_t chip_version) { -#if CONFIG_IDF_TARGET_ESP8684 //TODO: Need check for esp8684 +#if CONFIG_IDF_TARGET_ESP32C2 //TODO: Need check for esp32c2 return 0; #else assert(chip_version >= 3); @@ -206,7 +206,7 @@ static uint32_t get_dig_dbias_by_efuse(uint8_t chip_version) uint32_t get_rtc_dbias_by_efuse(uint8_t chip_version, uint32_t dig_dbias) { -#if CONFIG_IDF_TARGET_ESP8684 //TODO: Need check for esp8684 +#if CONFIG_IDF_TARGET_ESP32C2 //TODO: Need check for esp32c2 return 0; #else assert(chip_version >= 3); diff --git a/components/esp_hw_support/port/esp8684/rtc_pm.c b/components/esp_hw_support/port/esp32c2/rtc_pm.c similarity index 95% rename from components/esp_hw_support/port/esp8684/rtc_pm.c rename to components/esp_hw_support/port/esp32c2/rtc_pm.c index 1790d1fdd86..aef3e08e49e 100644 --- a/components/esp_hw_support/port/esp8684/rtc_pm.c +++ b/components/esp_hw_support/port/esp32c2/rtc_pm.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_hw_support/port/esp8684/rtc_sleep.c b/components/esp_hw_support/port/esp32c2/rtc_sleep.c similarity index 98% rename from components/esp_hw_support/port/esp8684/rtc_sleep.c rename to components/esp_hw_support/port/esp32c2/rtc_sleep.c index acd30c3a692..788bccf3bdb 100644 --- a/components/esp_hw_support/port/esp8684/rtc_sleep.c +++ b/components/esp_hw_support/port/esp32c2/rtc_sleep.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -17,8 +17,8 @@ #include "soc/timer_group_reg.h" #include "soc/system_reg.h" #include "soc/rtc.h" -#include "esp8684/rom/ets_sys.h" -#include "esp8684/rom/rtc.h" +#include "esp32c2/rom/ets_sys.h" +#include "esp32c2/rom/rtc.h" #include "regi2c_ctrl.h" #include "esp_efuse.h" diff --git a/components/esp_hw_support/port/esp8684/rtc_time.c b/components/esp_hw_support/port/esp32c2/rtc_time.c similarity index 97% rename from components/esp_hw_support/port/esp8684/rtc_time.c rename to components/esp_hw_support/port/esp32c2/rtc_time.c index 580179d5d08..2ec6f52f0f2 100644 --- a/components/esp_hw_support/port/esp8684/rtc_time.c +++ b/components/esp_hw_support/port/esp32c2/rtc_time.c @@ -1,11 +1,11 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ #include -#include "esp8684/rom/ets_sys.h" +#include "esp32c2/rom/ets_sys.h" #include "soc/rtc.h" #include "soc/rtc_cntl_reg.h" #include "soc/timer_group_reg.h" @@ -31,7 +31,7 @@ */ uint32_t rtc_clk_cal_internal(rtc_cal_sel_t cal_clk, uint32_t slowclk_cycles) { - /* On ESP8684, choosing RTC_CAL_RTC_MUX results in calibration of + /* On ESP32-C2, choosing RTC_CAL_RTC_MUX results in calibration of * the 150k RTC clock regardless of the currenlty selected SLOW_CLK. * On the ESP32, it used the currently selected SLOW_CLK. * The following code emulates ESP32 behavior: diff --git a/components/esp_hw_support/sleep_modes.c b/components/esp_hw_support/sleep_modes.c index 6aa72ab71c6..6079a4ec0c3 100644 --- a/components/esp_hw_support/sleep_modes.c +++ b/components/esp_hw_support/sleep_modes.c @@ -69,9 +69,9 @@ #include "esp32h2/rom/cache.h" #include "esp32h2/rom/rtc.h" #include "soc/extmem_reg.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/cache.h" -#include "esp8684/rom/rtc.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/cache.h" +#include "esp32c2/rom/rtc.h" #include "soc/extmem_reg.h" #endif @@ -104,8 +104,8 @@ #define DEFAULT_CPU_FREQ_MHZ CONFIG_ESP32H2_DEFAULT_CPU_FREQ_MHZ #define DEFAULT_SLEEP_OUT_OVERHEAD_US (105) #define DEFAULT_HARDWARE_OUT_OVERHEAD_US (37) -#elif CONFIG_IDF_TARGET_ESP8684 -#define DEFAULT_CPU_FREQ_MHZ CONFIG_ESP8684_DEFAULT_CPU_FREQ_MHZ +#elif CONFIG_IDF_TARGET_ESP32C2 +#define DEFAULT_CPU_FREQ_MHZ CONFIG_ESP32C2_DEFAULT_CPU_FREQ_MHZ #define DEFAULT_SLEEP_OUT_OVERHEAD_US (105) #define DEFAULT_HARDWARE_OUT_OVERHEAD_US (37) #endif @@ -462,7 +462,7 @@ static uint32_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags) #else #if !CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP /* If not possible stack is in RTC FAST memory, use the ROM function to calculate the CRC and save ~140 bytes IRAM */ -#if !CONFIG_IDF_TARGET_ESP8684 +#if !CONFIG_IDF_TARGET_ESP32C2 // RTC has no rtc memory, IDF-3901 set_rtc_memory_crc(); #endif diff --git a/components/esp_netif/test_apps/README.md b/components/esp_netif/test_apps/README.md index 2e61c5bda6d..3efcd3efaed 100644 --- a/components/esp_netif/test_apps/README.md +++ b/components/esp_netif/test_apps/README.md @@ -1,4 +1,4 @@ | Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C3 | | ----------------- | ----- | -------- | -------- | -------- | -Not support on ESP8684 yet, waiting esp_wifi supported. TODO: IDF-3905 +Not support on ESP32-C2 yet, waiting esp_wifi supported. TODO: IDF-3905 diff --git a/components/esp_phy/CMakeLists.txt b/components/esp_phy/CMakeLists.txt index d4efcfb40c1..d5054833869 100644 --- a/components/esp_phy/CMakeLists.txt +++ b/components/esp_phy/CMakeLists.txt @@ -1,6 +1,6 @@ idf_build_get_property(idf_target IDF_TARGET) -if(IDF_TARGET STREQUAL "esp8684") +if(IDF_TARGET STREQUAL "esp32c2") # TODO : IDF-3906 return() endif() diff --git a/components/esp_pm/include/esp8684/pm.h b/components/esp_pm/include/esp32c2/pm.h similarity index 89% rename from components/esp_pm/include/esp8684/pm.h rename to components/esp_pm/include/esp32c2/pm.h index a671e5599a0..78ad319646c 100644 --- a/components/esp_pm/include/esp8684/pm.h +++ b/components/esp_pm/include/esp32c2/pm.h @@ -16,7 +16,7 @@ extern "C" { /** - * @brief Power management config for ESP8684 + * @brief Power management config for ESP32-C2 * * Pass a pointer to this structure as an argument to esp_pm_configure function. */ @@ -24,7 +24,7 @@ typedef struct { int max_freq_mhz; /*!< Maximum CPU frequency, in MHz */ int min_freq_mhz; /*!< Minimum CPU frequency to use when no locks are taken, in MHz */ bool light_sleep_enable; /*!< Enter light sleep when no locks are taken */ -} esp_pm_config_esp8684_t; +} esp_pm_config_esp32c2_t; #ifdef __cplusplus diff --git a/components/esp_pm/include/esp_pm.h b/components/esp_pm/include/esp_pm.h index e9d9fbfb4b7..64ef7b36ffe 100644 --- a/components/esp_pm/include/esp_pm.h +++ b/components/esp_pm/include/esp_pm.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2016-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2016-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -19,8 +19,8 @@ #include "esp32c3/pm.h" #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/pm.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/pm.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/pm.h" #endif #ifdef __cplusplus diff --git a/components/esp_pm/pm_impl.c b/components/esp_pm/pm_impl.c index 5bb8f50d65d..8f9b8c2f5d1 100644 --- a/components/esp_pm/pm_impl.c +++ b/components/esp_pm/pm_impl.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2016-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2016-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -52,8 +52,8 @@ #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/pm.h" #include "driver/gpio.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/pm.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/pm.h" #include "driver/gpio.h" #endif @@ -94,9 +94,9 @@ #elif CONFIG_IDF_TARGET_ESP32H2 #define REF_CLK_DIV_MIN 2 #define DEFAULT_CPU_FREQ CONFIG_ESP32H2_DEFAULT_CPU_FREQ_MHZ -#elif CONFIG_IDF_TARGET_ESP8684 +#elif CONFIG_IDF_TARGET_ESP32C2 #define REF_CLK_DIV_MIN 2 -#define DEFAULT_CPU_FREQ CONFIG_ESP8684_DEFAULT_CPU_FREQ_MHZ +#define DEFAULT_CPU_FREQ CONFIG_ESP32C2_DEFAULT_CPU_FREQ_MHZ #endif #ifdef CONFIG_PM_PROFILING @@ -231,8 +231,8 @@ esp_err_t esp_pm_configure(const void* vconfig) const esp_pm_config_esp32c3_t* config = (const esp_pm_config_esp32c3_t*) vconfig; #elif CONFIG_IDF_TARGET_ESP32H2 const esp_pm_config_esp32h2_t* config = (const esp_pm_config_esp32h2_t*) vconfig; -#elif CONFIG_IDF_TARGET_ESP8684 - const esp_pm_config_esp8684_t* config = (const esp_pm_config_esp8684_t*) vconfig; +#elif CONFIG_IDF_TARGET_ESP32C2 + const esp_pm_config_esp32c2_t* config = (const esp_pm_config_esp32c2_t*) vconfig; #endif #ifndef CONFIG_FREERTOS_USE_TICKLESS_IDLE @@ -341,8 +341,8 @@ esp_err_t esp_pm_get_configuration(void* vconfig) esp_pm_config_esp32c3_t* config = (esp_pm_config_esp32c3_t*) vconfig; #elif CONFIG_IDF_TARGET_ESP32H2 esp_pm_config_esp32h2_t* config = (esp_pm_config_esp32h2_t*) vconfig; -#elif CONFIG_IDF_TARGET_ESP8684 - esp_pm_config_esp8684_t* config = (esp_pm_config_esp8684_t*) vconfig; +#elif CONFIG_IDF_TARGET_ESP32C2 + esp_pm_config_esp32c2_t* config = (esp_pm_config_esp32c2_t*) vconfig; #endif portENTER_CRITICAL(&s_switch_lock); @@ -779,8 +779,8 @@ void esp_pm_impl_init(void) esp_pm_config_esp32c3_t cfg = { #elif CONFIG_IDF_TARGET_ESP32H2 esp_pm_config_esp32h2_t cfg = { -#elif CONFIG_IDF_TARGET_ESP8684 - esp_pm_config_esp8684_t cfg = { +#elif CONFIG_IDF_TARGET_ESP32C2 + esp_pm_config_esp32c2_t cfg = { #endif .max_freq_mhz = DEFAULT_CPU_FREQ, .min_freq_mhz = xtal_freq, diff --git a/components/esp_pm/pm_trace.c b/components/esp_pm/pm_trace.c index 3100a257cac..a3dd7ed81d1 100644 --- a/components/esp_pm/pm_trace.c +++ b/components/esp_pm/pm_trace.c @@ -15,7 +15,7 @@ * Feel free to change when debugging. */ static const int DRAM_ATTR s_trace_io[] = { -#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32H2) && !defined(CONFIG_IDF_TARGET_ESP8684) +#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32H2) && !defined(CONFIG_IDF_TARGET_ESP32C2) BIT(4), BIT(5), // ESP_PM_TRACE_IDLE BIT(16), BIT(17), // ESP_PM_TRACE_TICK BIT(18), BIT(18), // ESP_PM_TRACE_FREQ_SWITCH diff --git a/components/esp_rom/CMakeLists.txt b/components/esp_rom/CMakeLists.txt index 57764e6174a..251f60edfb8 100644 --- a/components/esp_rom/CMakeLists.txt +++ b/components/esp_rom/CMakeLists.txt @@ -82,7 +82,7 @@ if(BOOTLOADER_BUILD) elseif(target STREQUAL "esp32h2") rom_linker_script("newlib") - elseif(target STREQUAL "esp8684") + elseif(target STREQUAL "esp32c2") rom_linker_script("newlib") rom_linker_script("mbedtls") endif() @@ -181,7 +181,7 @@ else() # Regular app build rom_linker_script("newlib-nano") endif() - elseif(target STREQUAL "esp8684") + elseif(target STREQUAL "esp32c2") rom_linker_script("newlib") rom_linker_script("version") rom_linker_script("mbedtls") diff --git a/components/esp_rom/esp8684/Kconfig.soc_caps.in b/components/esp_rom/esp32c2/Kconfig.soc_caps.in similarity index 100% rename from components/esp_rom/esp8684/Kconfig.soc_caps.in rename to components/esp_rom/esp32c2/Kconfig.soc_caps.in diff --git a/components/esp_rom/esp8684/esp_rom_caps.h b/components/esp_rom/esp32c2/esp_rom_caps.h similarity index 89% rename from components/esp_rom/esp8684/esp_rom_caps.h rename to components/esp_rom/esp32c2/esp_rom_caps.h index 3b91332a3e1..84a95c16922 100644 --- a/components/esp_rom/esp8684/esp_rom_caps.h +++ b/components/esp_rom/esp32c2/esp_rom_caps.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_rom/esp8684/ld/esp8684.rom.api.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.api.ld similarity index 96% rename from components/esp_rom/esp8684/ld/esp8684.rom.api.ld rename to components/esp_rom/esp32c2/ld/esp32c2.rom.api.ld index 4938724231d..d8631c1ce15 100644 --- a/components/esp_rom/esp8684/ld/esp8684.rom.api.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.api.ld @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_rom/esp8684/ld/esp8684.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld similarity index 99% rename from components/esp_rom/esp8684/ld/esp8684.rom.ld rename to components/esp_rom/esp32c2/ld/esp32c2.rom.ld index fd32ce046c9..57967ce2d23 100644 --- a/components/esp_rom/esp8684/ld/esp8684.rom.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld @@ -1,13 +1,13 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ -/* ROM function interface esp8684.rom.ld for esp8684 +/* ROM function interface esp32c2.rom.ld for esp32c2 * * - * Generated from ./interface-esp8684.yml md5sum 6c4d0f3a9f2d0c93477024a1a8f13746 + * Generated from ./interface-esp32c2.yml md5sum 6c4d0f3a9f2d0c93477024a1a8f13746 * * Compatible with ROM where ECO version equal or greater to 0. * diff --git a/components/esp_rom/esp8684/ld/esp8684.rom.libgcc.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.libgcc.ld similarity index 92% rename from components/esp_rom/esp8684/ld/esp8684.rom.libgcc.ld rename to components/esp_rom/esp32c2/ld/esp32c2.rom.libgcc.ld index 0d890dc6fe6..e0261e40f89 100644 --- a/components/esp_rom/esp8684/ld/esp8684.rom.libgcc.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.libgcc.ld @@ -1,13 +1,13 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ -/* ROM function interface esp8684.rom.libgcc.ld for esp8684 +/* ROM function interface esp32c2.rom.libgcc.ld for esp32c2 * * - * Generated from ./interface-esp8684.yml md5sum 6c4d0f3a9f2d0c93477024a1a8f13746 + * Generated from ./interface-esp32c2.yml md5sum 6c4d0f3a9f2d0c93477024a1a8f13746 * * Compatible with ROM where ECO version equal or greater to 0. * diff --git a/components/esp_rom/esp8684/ld/esp8684.rom.mbedtls.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.mbedtls.ld similarity index 98% rename from components/esp_rom/esp8684/ld/esp8684.rom.mbedtls.ld rename to components/esp_rom/esp32c2/ld/esp32c2.rom.mbedtls.ld index f9e85763d7b..88d5dc6d73f 100644 --- a/components/esp_rom/esp8684/ld/esp8684.rom.mbedtls.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.mbedtls.ld @@ -1,13 +1,13 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ -/* ROM function interface esp8684.rom.mbedtls.ld for esp8684 +/* ROM function interface esp32c2.rom.mbedtls.ld for esp32c2 * * - * Generated from ./interface-esp8684.yml md5sum 6c4d0f3a9f2d0c93477024a1a8f13746 + * Generated from ./interface-esp32c2.yml md5sum 6c4d0f3a9f2d0c93477024a1a8f13746 * * Compatible with ROM where ECO version equal or greater to 0. * diff --git a/components/esp_rom/esp8684/ld/esp8684.rom.newlib-nano.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.newlib-nano.ld similarity index 83% rename from components/esp_rom/esp8684/ld/esp8684.rom.newlib-nano.ld rename to components/esp_rom/esp32c2/ld/esp32c2.rom.newlib-nano.ld index c5f82e1eb04..b1e2c9bc45a 100644 --- a/components/esp_rom/esp8684/ld/esp8684.rom.newlib-nano.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.newlib-nano.ld @@ -1,13 +1,13 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ -/* ROM function interface esp8684.rom.newlib-nano.ld for esp8684 +/* ROM function interface esp32c2.rom.newlib-nano.ld for esp32c2 * * - * Generated from ./interface-esp8684.yml md5sum 6c4d0f3a9f2d0c93477024a1a8f13746 + * Generated from ./interface-esp32c2.yml md5sum 6c4d0f3a9f2d0c93477024a1a8f13746 * * Compatible with ROM where ECO version equal or greater to 0. * diff --git a/components/esp_rom/esp8684/ld/esp8684.rom.newlib.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.newlib.ld similarity index 96% rename from components/esp_rom/esp8684/ld/esp8684.rom.newlib.ld rename to components/esp_rom/esp32c2/ld/esp32c2.rom.newlib.ld index 92250ddeb49..d532c9a88ef 100644 --- a/components/esp_rom/esp8684/ld/esp8684.rom.newlib.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.newlib.ld @@ -3,10 +3,10 @@ * * SPDX-License-Identifier: Apache-2.0 */ -/* ROM function interface esp8684.rom.newlib.ld for esp8684 +/* ROM function interface esp32c2.rom.newlib.ld for esp32c2 * * - * Generated from ./interface-esp8684.yml md5sum 6c4d0f3a9f2d0c93477024a1a8f13746 + * Generated from ./interface-esp32c2.yml md5sum 6c4d0f3a9f2d0c93477024a1a8f13746 * * Compatible with ROM where ECO version equal or greater to 0. * diff --git a/components/esp_rom/esp8684/ld/esp8684.rom.version.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.version.ld similarity index 69% rename from components/esp_rom/esp8684/ld/esp8684.rom.version.ld rename to components/esp_rom/esp32c2/ld/esp32c2.rom.version.ld index eca45cf2547..e49433d550f 100644 --- a/components/esp_rom/esp8684/ld/esp8684.rom.version.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.version.ld @@ -1,10 +1,10 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ -/* ROM version variables for esp8684 +/* ROM version variables for esp32c2 * * These addresses should be compatible with any ROM version for this chip. * diff --git a/components/esp_rom/include/esp8684/rom/apb_backup_dma.h b/components/esp_rom/include/esp32c2/rom/apb_backup_dma.h similarity index 79% rename from components/esp_rom/include/esp8684/rom/apb_backup_dma.h rename to components/esp_rom/include/esp32c2/rom/apb_backup_dma.h index 8a2c05e266f..14948bbde18 100644 --- a/components/esp_rom/include/esp8684/rom/apb_backup_dma.h +++ b/components/esp_rom/include/esp32c2/rom/apb_backup_dma.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2010-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_rom/include/esp8684/rom/cache.h b/components/esp_rom/include/esp32c2/rom/cache.h similarity index 99% rename from components/esp_rom/include/esp8684/rom/cache.h rename to components/esp_rom/include/esp32c2/rom/cache.h index 40740ab792a..e5742928acc 100644 --- a/components/esp_rom/include/esp8684/rom/cache.h +++ b/components/esp_rom/include/esp32c2/rom/cache.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_rom/include/esp8684/rom/crc.h b/components/esp_rom/include/esp32c2/rom/crc.h similarity index 97% rename from components/esp_rom/include/esp8684/rom/crc.h rename to components/esp_rom/include/esp32c2/rom/crc.h index 11a4a327b60..a651ce2db64 100644 --- a/components/esp_rom/include/esp8684/rom/crc.h +++ b/components/esp_rom/include/esp32c2/rom/crc.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_rom/include/esp8684/rom/efuse.h b/components/esp_rom/include/esp32c2/rom/efuse.h similarity index 98% rename from components/esp_rom/include/esp8684/rom/efuse.h rename to components/esp_rom/include/esp32c2/rom/efuse.h index 9f776b4980d..d80d41a91e9 100644 --- a/components/esp_rom/include/esp8684/rom/efuse.h +++ b/components/esp_rom/include/esp32c2/rom/efuse.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -21,7 +21,7 @@ extern "C" { * */ -/** For ESP8684, there's no key purpose region for efuse keys, In order to maintain +/** For ESP32-C2, there's no key purpose region for efuse keys, In order to maintain * compatibility with the previous apis, we should set the parameter of 'ets_efuse_purpose_t' * as default value ETS_EFUSE_KEY_PURPOSE_INVALID. * (In fact, this parameter can be any value, the api in the rom will not process key_purpose region) diff --git a/components/esp_rom/include/esp8684/rom/esp_flash.h b/components/esp_rom/include/esp32c2/rom/esp_flash.h similarity index 94% rename from components/esp_rom/include/esp8684/rom/esp_flash.h rename to components/esp_rom/include/esp32c2/rom/esp_flash.h index 2ab679af686..85b4ae8755a 100644 --- a/components/esp_rom/include/esp8684/rom/esp_flash.h +++ b/components/esp_rom/include/esp32c2/rom/esp_flash.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_rom/include/esp8684/rom/ets_sys.h b/components/esp_rom/include/esp32c2/rom/ets_sys.h similarity index 99% rename from components/esp_rom/include/esp8684/rom/ets_sys.h rename to components/esp_rom/include/esp32c2/rom/ets_sys.h index 893404cbf45..2a875b99ab3 100644 --- a/components/esp_rom/include/esp8684/rom/ets_sys.h +++ b/components/esp_rom/include/esp32c2/rom/ets_sys.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_rom/include/esp8684/rom/gpio.h b/components/esp_rom/include/esp32c2/rom/gpio.h similarity index 99% rename from components/esp_rom/include/esp8684/rom/gpio.h rename to components/esp_rom/include/esp32c2/rom/gpio.h index 5da85507582..ed95a51a33e 100644 --- a/components/esp_rom/include/esp8684/rom/gpio.h +++ b/components/esp_rom/include/esp32c2/rom/gpio.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_rom/include/esp8684/rom/libc_stubs.h b/components/esp_rom/include/esp32c2/rom/libc_stubs.h similarity index 98% rename from components/esp_rom/include/esp8684/rom/libc_stubs.h rename to components/esp_rom/include/esp32c2/rom/libc_stubs.h index 708ef694267..94992b0457f 100644 --- a/components/esp_rom/include/esp8684/rom/libc_stubs.h +++ b/components/esp_rom/include/esp32c2/rom/libc_stubs.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_rom/include/esp8684/rom/lldesc.h b/components/esp_rom/include/esp32c2/rom/lldesc.h similarity index 98% rename from components/esp_rom/include/esp8684/rom/lldesc.h rename to components/esp_rom/include/esp32c2/rom/lldesc.h index 99457ebc932..dc80d6705fe 100644 --- a/components/esp_rom/include/esp8684/rom/lldesc.h +++ b/components/esp_rom/include/esp32c2/rom/lldesc.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_rom/include/esp8684/rom/md5_hash.h b/components/esp_rom/include/esp32c2/rom/md5_hash.h similarity index 100% rename from components/esp_rom/include/esp8684/rom/md5_hash.h rename to components/esp_rom/include/esp32c2/rom/md5_hash.h diff --git a/components/esp_rom/include/esp8684/rom/miniz.h b/components/esp_rom/include/esp32c2/rom/miniz.h similarity index 99% rename from components/esp_rom/include/esp8684/rom/miniz.h rename to components/esp_rom/include/esp32c2/rom/miniz.h index 0c8efbc41ae..ded9570b2bf 100644 --- a/components/esp_rom/include/esp8684/rom/miniz.h +++ b/components/esp_rom/include/esp32c2/rom/miniz.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_rom/include/esp8684/rom/newlib.h b/components/esp_rom/include/esp32c2/rom/newlib.h similarity index 95% rename from components/esp_rom/include/esp8684/rom/newlib.h rename to components/esp_rom/include/esp32c2/rom/newlib.h index e812d1319b9..2c84f9e7db2 100644 --- a/components/esp_rom/include/esp8684/rom/newlib.h +++ b/components/esp_rom/include/esp32c2/rom/newlib.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_rom/include/esp8684/rom/rom_layout.h b/components/esp_rom/include/esp32c2/rom/rom_layout.h similarity index 96% rename from components/esp_rom/include/esp8684/rom/rom_layout.h rename to components/esp_rom/include/esp32c2/rom/rom_layout.h index 9142867ae8d..2a5f03126f6 100644 --- a/components/esp_rom/include/esp8684/rom/rom_layout.h +++ b/components/esp_rom/include/esp32c2/rom/rom_layout.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_rom/include/esp8684/rom/rsa_pss.h b/components/esp_rom/include/esp32c2/rom/rsa_pss.h similarity index 92% rename from components/esp_rom/include/esp8684/rom/rsa_pss.h rename to components/esp_rom/include/esp32c2/rom/rsa_pss.h index 366ffb7bcd1..2ee06a8ef0e 100644 --- a/components/esp_rom/include/esp8684/rom/rsa_pss.h +++ b/components/esp_rom/include/esp32c2/rom/rsa_pss.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_rom/include/esp8684/rom/rtc.h b/components/esp_rom/include/esp32c2/rom/rtc.h similarity index 99% rename from components/esp_rom/include/esp8684/rom/rtc.h rename to components/esp_rom/include/esp32c2/rom/rtc.h index be3562de970..5a2bab1066c 100644 --- a/components/esp_rom/include/esp8684/rom/rtc.h +++ b/components/esp_rom/include/esp32c2/rom/rtc.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_rom/include/esp8684/rom/secure_boot.h b/components/esp_rom/include/esp32c2/rom/secure_boot.h similarity index 98% rename from components/esp_rom/include/esp8684/rom/secure_boot.h rename to components/esp_rom/include/esp32c2/rom/secure_boot.h index 3dcaf6f09c0..978e99b5279 100644 --- a/components/esp_rom/include/esp8684/rom/secure_boot.h +++ b/components/esp_rom/include/esp32c2/rom/secure_boot.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_rom/include/esp8684/rom/sha.h b/components/esp_rom/include/esp32c2/rom/sha.h similarity index 94% rename from components/esp_rom/include/esp8684/rom/sha.h rename to components/esp_rom/include/esp32c2/rom/sha.h index 06fa47873b8..80a8ac9335a 100644 --- a/components/esp_rom/include/esp8684/rom/sha.h +++ b/components/esp_rom/include/esp32c2/rom/sha.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_rom/include/esp8684/rom/spi_flash.h b/components/esp_rom/include/esp32c2/rom/spi_flash.h similarity index 99% rename from components/esp_rom/include/esp8684/rom/spi_flash.h rename to components/esp_rom/include/esp32c2/rom/spi_flash.h index e93a3f8f117..c67bf30ec42 100644 --- a/components/esp_rom/include/esp8684/rom/spi_flash.h +++ b/components/esp_rom/include/esp32c2/rom/spi_flash.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_rom/include/esp8684/rom/tjpgd.h b/components/esp_rom/include/esp32c2/rom/tjpgd.h similarity index 98% rename from components/esp_rom/include/esp8684/rom/tjpgd.h rename to components/esp_rom/include/esp32c2/rom/tjpgd.h index 2a3f7f01c77..635a0abf453 100644 --- a/components/esp_rom/include/esp8684/rom/tjpgd.h +++ b/components/esp_rom/include/esp32c2/rom/tjpgd.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_rom/include/esp8684/rom/uart.h b/components/esp_rom/include/esp32c2/rom/uart.h similarity index 99% rename from components/esp_rom/include/esp8684/rom/uart.h rename to components/esp_rom/include/esp32c2/rom/uart.h index e72fec0b3b3..9b2dca6805d 100644 --- a/components/esp_rom/include/esp8684/rom/uart.h +++ b/components/esp_rom/include/esp32c2/rom/uart.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_rom/include/esp_rom_md5.h b/components/esp_rom/include/esp_rom_md5.h index 390806bdd53..ca42faee22d 100644 --- a/components/esp_rom/include/esp_rom_md5.h +++ b/components/esp_rom/include/esp_rom_md5.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2010-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -18,7 +18,7 @@ extern "C" { */ #define ESP_ROM_MD5_DIGEST_LEN 16 -#if CONFIG_IDF_TARGET_ESP8684 +#if CONFIG_IDF_TARGET_ESP32C2 /** * \brief MD5 context structure * @@ -70,7 +70,7 @@ static inline void esp_rom_md5_final(uint8_t *digest, md5_context_t *context) esp_rom_mbedtls_md5_finish_ret(context, digest); } -#else //#if !CONFIG_IDF_TARGET_ESP8684 +#else //#if !CONFIG_IDF_TARGET_ESP32C2 /** * @brief Type defined for MD5 context * diff --git a/components/esp_rom/patches/esp_rom_sys.c b/components/esp_rom/patches/esp_rom_sys.c index be489a77dac..5500f3b712c 100644 --- a/components/esp_rom/patches/esp_rom_sys.c +++ b/components/esp_rom/patches/esp_rom_sys.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2010-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -26,7 +26,7 @@ IRAM_ATTR void esp_rom_install_channel_putc(int channel, void (*putc)(char c)) } } -#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 +#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 IRAM_ATTR void esp_rom_install_uart_printf(void) { extern void ets_install_uart_printf(void); diff --git a/components/esp_serial_slave_link/include/essl_spi/esp8684_defs.h b/components/esp_serial_slave_link/include/essl_spi/esp32c2_defs.h similarity index 91% rename from components/esp_serial_slave_link/include/essl_spi/esp8684_defs.h rename to components/esp_serial_slave_link/include/essl_spi/esp32c2_defs.h index a0a2e62187c..51abd189b2a 100644 --- a/components/esp_serial_slave_link/include/essl_spi/esp8684_defs.h +++ b/components/esp_serial_slave_link/include/essl_spi/esp32c2_defs.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2010-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/esp_system/CMakeLists.txt b/components/esp_system/CMakeLists.txt index 53c5cd7ced8..8b867bfa623 100644 --- a/components/esp_system/CMakeLists.txt +++ b/components/esp_system/CMakeLists.txt @@ -26,7 +26,7 @@ else() "xt_wdt.c" "debug_stubs.c") - if(NOT (${target} STREQUAL "esp8684")) + if(NOT (${target} STREQUAL "esp32c2")) list(APPEND srcs "debug_stubs.c") endif() diff --git a/components/esp_system/Kconfig b/components/esp_system/Kconfig index af1c95131ce..2b532146104 100644 --- a/components/esp_system/Kconfig +++ b/components/esp_system/Kconfig @@ -84,7 +84,7 @@ menu "ESP System Settings" default y if IDF_TARGET_ESP32C3 default y if IDF_TARGET_ESP32S3 default y if IDF_TARGET_ESP32H2 - depends on !IDF_TARGET_ESP8684 + depends on !IDF_TARGET_ESP32C2 config ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP bool "Enable RTC fast memory for dynamic allocations" @@ -267,7 +267,7 @@ menu "ESP System Settings" config ESP_CONSOLE_MULTIPLE_UART bool - default y if !IDF_TARGET_ESP32C3 && !IDF_TARGET_ESP32H2 && !IDF_TARGET_ESP8684 + default y if !IDF_TARGET_ESP32C3 && !IDF_TARGET_ESP32H2 && !IDF_TARGET_ESP32C2 choice ESP_CONSOLE_UART_NUM prompt "UART peripheral to use for console output (0-1)" diff --git a/components/esp_system/crosscore_int.c b/components/esp_system/crosscore_int.c index 3a2ffbf4a72..349d51079c6 100644 --- a/components/esp_system/crosscore_int.c +++ b/components/esp_system/crosscore_int.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -16,14 +16,14 @@ #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 #include "soc/dport_reg.h" -#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 +#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 #include "soc/system_reg.h" #endif #define REASON_YIELD BIT(0) #define REASON_FREQ_SWITCH BIT(1) -#if !CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32H2 && !IDF_TARGET_ESP8684 +#if !CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32H2 && !IDF_TARGET_ESP32C2 #define REASON_PRINT_BACKTRACE BIT(2) #endif @@ -59,7 +59,7 @@ static void IRAM_ATTR esp_crosscore_isr(void *arg) { } else { WRITE_PERI_REG(SYSTEM_CPU_INTR_FROM_CPU_1_REG, 0); } -#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 +#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 WRITE_PERI_REG(SYSTEM_CPU_INTR_FROM_CPU_0_REG, 0); #endif @@ -79,7 +79,7 @@ static void IRAM_ATTR esp_crosscore_isr(void *arg) { * to allow DFS features without the extra latency of the ISR hook. */ } -#if !CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32H2 && !CONFIG_IDF_TARGET_ESP8684 // IDF-2986 +#if !CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32H2 && !CONFIG_IDF_TARGET_ESP32C2 // IDF-2986 if (my_reason_val & REASON_PRINT_BACKTRACE) { esp_backtrace_print(100); } @@ -126,7 +126,7 @@ static void IRAM_ATTR esp_crosscore_int_send(int core_id, uint32_t reason_mask) } else { WRITE_PERI_REG(SYSTEM_CPU_INTR_FROM_CPU_1_REG, SYSTEM_CPU_INTR_FROM_CPU_1); } -#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 +#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 WRITE_PERI_REG(SYSTEM_CPU_INTR_FROM_CPU_0_REG, SYSTEM_CPU_INTR_FROM_CPU_0); #endif } @@ -141,7 +141,7 @@ void IRAM_ATTR esp_crosscore_int_send_freq_switch(int core_id) esp_crosscore_int_send(core_id, REASON_FREQ_SWITCH); } -#if !CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32H2 && !IDF_TARGET_ESP8684 +#if !CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32H2 && !IDF_TARGET_ESP32C2 void IRAM_ATTR esp_crosscore_int_send_print_backtrace(int core_id) { esp_crosscore_int_send(core_id, REASON_PRINT_BACKTRACE); diff --git a/components/esp_system/esp_system.c b/components/esp_system/esp_system.c index 6bcb8415db2..e451231da62 100644 --- a/components/esp_system/esp_system.c +++ b/components/esp_system/esp_system.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -17,8 +17,8 @@ #if CONFIG_ESP_SYSTEM_MEMPROT_FEATURE #if CONFIG_IDF_TARGET_ESP32S2 #include "esp32s2/memprot.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/memprot.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/memprot.h" #else #include "esp_memprot.h" #endif diff --git a/components/esp_system/include/esp_private/crosscore_int.h b/components/esp_system/include/esp_private/crosscore_int.h index 846daac5c71..9e68c680a72 100644 --- a/components/esp_system/include/esp_private/crosscore_int.h +++ b/components/esp_system/include/esp_private/crosscore_int.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -49,7 +49,7 @@ void esp_crosscore_int_send_yield(int core_id); void esp_crosscore_int_send_freq_switch(int core_id); -#if !CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32H2 && !CONFIG_IDF_TARGET_ESP8684 +#if !CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32H2 && !CONFIG_IDF_TARGET_ESP32C2 /** * Send an interrupt to a CPU indicating it should print its current backtrace * diff --git a/components/esp_system/int_wdt.c b/components/esp_system/int_wdt.c index 54a00f7bdcd..bf4aa5811ea 100644 --- a/components/esp_system/int_wdt.c +++ b/components/esp_system/int_wdt.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -151,8 +151,8 @@ void esp_int_wdt_cpu_init(void) #if SOC_TIMER_GROUPS > 1 intr_matrix_set(cpu_hal_get_core_id(), ETS_TG1_WDT_LEVEL_INTR_SOURCE, WDT_INT_NUM); #else - // TODO: Clean up code for ESP8684, IDF-4114 - ESP_EARLY_LOGW("INT_WDT", "ESP8684 only has one timer group"); + // TODO: Clean up code for ESP32-C2, IDF-4114 + ESP_EARLY_LOGW("INT_WDT", "ESP32-C2 only has one timer group"); #endif /* Set the type and priority to watch dog interrupts */ diff --git a/components/esp_system/ld/esp8684/memory.ld.in b/components/esp_system/ld/esp32c2/memory.ld.in similarity index 89% rename from components/esp_system/ld/esp8684/memory.ld.in rename to components/esp_system/ld/esp32c2/memory.ld.in index 0295964994a..d13f4acfa3a 100644 --- a/components/esp_system/ld/esp8684/memory.ld.in +++ b/components/esp_system/ld/esp32c2/memory.ld.in @@ -1,5 +1,5 @@ /** - * ESP8684 Linker Script Memory Layout + * ESP32-C2 Linker Script Memory Layout * This file describes the memory layout (memory blocks) by virtual memory addresses. * This linker script is passed through the C preprocessor to include configuration options. * Please use preprocessor features sparingly! @@ -11,7 +11,7 @@ #define SRAM_IRAM_START 0x4037C000 #define SRAM_DRAM_START 0x3FCA0000 -#define ICACHE_SIZE 0x4000 /* ICache size is fixed to 16KB on ESP8684 */ +#define ICACHE_SIZE 0x4000 /* ICache size is fixed to 16KB on ESP32-C2 */ #define I_D_SRAM_OFFSET (SRAM_IRAM_START - SRAM_DRAM_START + ICACHE_SIZE) #define SRAM_DRAM_END 0x403B0000 - I_D_SRAM_OFFSET /* 2nd stage bootloader iram_loader_seg start address */ @@ -20,12 +20,12 @@ #define I_D_SRAM_SIZE SRAM_DRAM_END - SRAM_DRAM_ORG -#if CONFIG_ESP8684_USE_FIXED_STATIC_RAM_SIZE -ASSERT((CONFIG_ESP8684_FIXED_STATIC_RAM_SIZE <= I_D_SRAM_SIZE), "Fixed static ram data does not fit.") -#define DRAM0_0_SEG_LEN CONFIG_ESP8684_FIXED_STATIC_RAM_SIZE +#if CONFIG_ESP32C2_USE_FIXED_STATIC_RAM_SIZE +ASSERT((CONFIG_ESP32C2_FIXED_STATIC_RAM_SIZE <= I_D_SRAM_SIZE), "Fixed static ram data does not fit.") +#define DRAM0_0_SEG_LEN CONFIG_ESP32C2_FIXED_STATIC_RAM_SIZE #else #define DRAM0_0_SEG_LEN I_D_SRAM_SIZE -#endif // CONFIG_ESP8684_USE_FIXED_STATIC_RAM_SIZE +#endif // CONFIG_ESP32C2_USE_FIXED_STATIC_RAM_SIZE MEMORY { /** @@ -65,12 +65,12 @@ MEMORY } -#if CONFIG_ESP8684_USE_FIXED_STATIC_RAM_SIZE +#if CONFIG_ESP32C2_USE_FIXED_STATIC_RAM_SIZE /* static data ends at defined address */ _static_data_end = 0x3FCA0000 + DRAM0_0_SEG_LEN; #else _static_data_end = _bss_end; -#endif // CONFIG_ESP8684_USE_FIXED_STATIC_RAM_SIZE +#endif // CONFIG_ESP32C2_USE_FIXED_STATIC_RAM_SIZE /* Heap ends at top of dram0_0_seg */ _heap_end = 0x40000000; diff --git a/components/esp_system/ld/esp8684/sections.ld.in b/components/esp_system/ld/esp32c2/sections.ld.in similarity index 98% rename from components/esp_system/ld/esp8684/sections.ld.in rename to components/esp_system/ld/esp32c2/sections.ld.in index aef1ccd0402..c103e87d979 100644 --- a/components/esp_system/ld/esp8684/sections.ld.in +++ b/components/esp_system/ld/esp32c2/sections.ld.in @@ -242,7 +242,7 @@ SECTIONS /* Marks the end of IRAM code segment */ .iram0.text_end (NOLOAD) : { - /* ESP8684 memprot requires 16B padding for possible CPU prefetch and 512B alignment for PMS split lines */ + /* ESP32-C2 memprot requires 16B padding for possible CPU prefetch and 512B alignment for PMS split lines */ . += _esp_memprot_prefetch_pad_size; . = ALIGN(_esp_memprot_align_size); /* iram_end_test section exists for use by memprot unit tests only */ diff --git a/components/esp_system/port/arch/riscv/panic_arch.c b/components/esp_system/port/arch/riscv/panic_arch.c index 9bb4a7f82ca..aacdad4bb37 100644 --- a/components/esp_system/port/arch/riscv/panic_arch.c +++ b/components/esp_system/port/arch/riscv/panic_arch.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -15,8 +15,8 @@ #include "esp_private/cache_err_int.h" #if CONFIG_ESP_SYSTEM_MEMPROT_FEATURE -#if CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/memprot.h" +#if CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/memprot.h" #else #include "esp_private/esp_memprot_internal.h" #include "esp_memprot.h" diff --git a/components/esp_system/port/brownout.c b/components/esp_system/port/brownout.c index cbb8d085835..a03c24b4f40 100644 --- a/components/esp_system/port/brownout.c +++ b/components/esp_system/port/brownout.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -33,8 +33,8 @@ #define BROWNOUT_DET_LVL CONFIG_ESP32C3_BROWNOUT_DET_LVL #elif defined(CONFIG_ESP32H2_BROWNOUT_DET_LVL) #define BROWNOUT_DET_LVL CONFIG_ESP32H2_BROWNOUT_DET_LVL -#elif defined(CONFIG_ESP8684_BROWNOUT_DET_LVL) -#define BROWNOUT_DET_LVL CONFIG_ESP8684_BROWNOUT_DET_LVL +#elif defined(CONFIG_ESP32C2_BROWNOUT_DET_LVL) +#define BROWNOUT_DET_LVL CONFIG_ESP32C2_BROWNOUT_DET_LVL #else #define BROWNOUT_DET_LVL 0 #endif diff --git a/components/esp_system/port/cpu_start.c b/components/esp_system/port/cpu_start.c index 3cd62463d21..b1f60a468d3 100644 --- a/components/esp_system/port/cpu_start.c +++ b/components/esp_system/port/cpu_start.c @@ -54,12 +54,12 @@ #include "esp32h2/rom/cache.h" #include "soc/cache_memory.h" #include "esp_memprot.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rtc.h" -#include "esp8684/rom/cache.h" -#include "esp8684/rom/rtc.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rtc.h" +#include "esp32c2/rom/cache.h" +#include "esp32c2/rom/rtc.h" #include "soc/cache_memory.h" -#include "esp8684/memprot.h" +#include "esp32c2/memprot.h" #endif #include "esp_private/spi_flash_os.h" @@ -347,7 +347,7 @@ void IRAM_ATTR call_start_cpu0(void) Cache_Resume_DCache(0); #endif // CONFIG_IDF_TARGET_ESP32S3 -#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 +#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 /* Configure the Cache MMU size for instruction and rodata in flash. */ extern uint32_t Cache_Set_IDROM_MMU_Size(uint32_t irom_size, uint32_t drom_size); extern int _rodata_reserved_start; @@ -360,7 +360,7 @@ void IRAM_ATTR call_start_cpu0(void) #endif Cache_Set_IDROM_MMU_Size(cache_mmu_irom_size, CACHE_DROM_MMU_MAX_END - cache_mmu_irom_size); -#endif // CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 +#endif // CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 #if CONFIG_ESPTOOLPY_OCT_FLASH bool efuse_opflash_en = REG_GET_FIELD(EFUSE_RD_REPEAT_DATA3_REG, EFUSE_FLASH_TYPE); @@ -506,9 +506,9 @@ void IRAM_ATTR call_start_cpu0(void) Cache_Occupy_Addr(SOC_DROM_LOW, 0x4000); #endif -#if CONFIG_IDF_TARGET_ESP8684 +#if CONFIG_IDF_TARGET_ESP32C2 // TODO : IDF-4194 -#if CONFIG_ESP8684_INSTRUCTION_CACHE_WRAP +#if CONFIG_ESP32C2_INSTRUCTION_CACHE_WRAP extern void esp_enable_cache_wrap(uint32_t icache_wrap_enable); esp_enable_cache_wrap(1); #endif @@ -545,7 +545,7 @@ void IRAM_ATTR call_start_cpu0(void) #ifndef CONFIG_IDF_ENV_FPGA // TODO: on FPGA it should be possible to configure this, not currently working with APB_CLK_FREQ changed #ifdef CONFIG_ESP_CONSOLE_UART uint32_t clock_hz = rtc_clk_apb_freq_get(); -#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 +#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 clock_hz = UART_CLK_FREQ_ROM; // From esp32-s3 on, UART clock source is selected to XTAL in ROM #endif esp_rom_uart_tx_wait_idle(CONFIG_ESP_CONSOLE_UART_NUM); @@ -605,12 +605,12 @@ void IRAM_ATTR call_start_cpu0(void) fhdr.spi_size = ESP_IMAGE_FLASH_SIZE_4MB; extern void esp_rom_spiflash_attach(uint32_t, bool); -#if !CONFIG_IDF_TARGET_ESP8684 +#if !CONFIG_IDF_TARGET_ESP32C2 esp_rom_spiflash_attach(esp_rom_efuse_get_flash_gpio_info(), false); #else - // ESP8684 cannot get flash_gpio_info from efuse + // ESP32C2 cannot get flash_gpio_info from efuse esp_rom_spiflash_attach(0, false); -#endif // CONFIG_IDF_TARGET_ESP8684 +#endif // CONFIG_IDF_TARGET_ESP32C2 bootloader_flash_unlock(); #else // This assumes that DROM is the first segment in the application binary, i.e. that we can read diff --git a/components/esp_system/port/panic_handler.c b/components/esp_system/port/panic_handler.c index 8ef243dc780..1164d51abf0 100644 --- a/components/esp_system/port/panic_handler.c +++ b/components/esp_system/port/panic_handler.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -30,8 +30,8 @@ #if CONFIG_ESP_SYSTEM_MEMPROT_FEATURE #ifdef CONFIG_IDF_TARGET_ESP32S2 #include "esp32s2/memprot.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/memprot.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/memprot.h" #else #include "esp_memprot.h" #endif diff --git a/components/esp_system/port/soc/esp8684/CMakeLists.txt b/components/esp_system/port/soc/esp32c2/CMakeLists.txt similarity index 100% rename from components/esp_system/port/soc/esp8684/CMakeLists.txt rename to components/esp_system/port/soc/esp32c2/CMakeLists.txt diff --git a/components/esp_system/port/soc/esp8684/apb_backup_dma.c b/components/esp_system/port/soc/esp32c2/apb_backup_dma.c similarity index 88% rename from components/esp_system/port/soc/esp8684/apb_backup_dma.c rename to components/esp_system/port/soc/esp32c2/apb_backup_dma.c index a783e2f82cc..2cfb2af0119 100644 --- a/components/esp_system/port/soc/esp8684/apb_backup_dma.c +++ b/components/esp_system/port/soc/esp32c2/apb_backup_dma.c @@ -1,6 +1,6 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -9,7 +9,7 @@ #include "esp_attr.h" #include "freertos/FreeRTOS.h" #include "freertos/portmacro.h" -#include "esp8684/rom/apb_backup_dma.h" +#include "esp32c2/rom/apb_backup_dma.h" static portMUX_TYPE s_apb_backup_dma_mutex = portMUX_INITIALIZER_UNLOCKED; diff --git a/components/esp_system/port/soc/esp8684/cache_err_int.c b/components/esp_system/port/soc/esp32c2/cache_err_int.c similarity index 95% rename from components/esp_system/port/soc/esp8684/cache_err_int.c rename to components/esp_system/port/soc/esp32c2/cache_err_int.c index b071a1bee77..5847eaba435 100644 --- a/components/esp_system/port/soc/esp8684/cache_err_int.c +++ b/components/esp_system/port/soc/esp32c2/cache_err_int.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -10,7 +10,7 @@ to panic the CPU, which from a debugging perspective is better than grabbing bad data from the bus. */ -#include "esp8684/rom/ets_sys.h" +#include "esp32c2/rom/ets_sys.h" #include "esp_attr.h" #include "esp_intr_alloc.h" #include "soc/extmem_reg.h" @@ -41,7 +41,7 @@ void esp_cache_err_int_init(void) * 4. icache preload configurations fault * 5. icache sync configuration fault * - * [1]: On ESP8684 boards, the caches are shared but buses are still + * [1]: On ESP32-C2 boards, the caches are shared but buses are still * distinct. So, we have an ibus and a dbus sharing the same cache. * This error can occur if the dbus performs a request but the icache * (or simply cache) is disabled. diff --git a/components/esp_system/port/soc/esp8684/clk.c b/components/esp_system/port/soc/esp32c2/clk.c similarity index 96% rename from components/esp_system/port/soc/esp8684/clk.c rename to components/esp_system/port/soc/esp32c2/clk.c index cff5514bcc4..d375d09845a 100644 --- a/components/esp_system/port/soc/esp8684/clk.c +++ b/components/esp_system/port/soc/esp32c2/clk.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -13,9 +13,9 @@ #include "esp_log.h" #include "esp_private/esp_clk.h" #include "esp_clk_internal.h" -#include "esp8684/rom/ets_sys.h" -#include "esp8684/rom/uart.h" -#include "esp8684/rom/rtc.h" +#include "esp32c2/rom/ets_sys.h" +#include "esp32c2/rom/uart.h" +#include "esp32c2/rom/rtc.h" #include "soc/system_reg.h" #include "soc/dport_access.h" #include "soc/soc.h" @@ -32,7 +32,7 @@ * Larger values increase startup delay. Smaller values may cause false positive * detection (i.e. oscillator runs for a few cycles and then stops). */ -#define SLOW_CLK_CAL_CYCLES CONFIG_ESP8684_RTC_CLK_CAL_CYCLES +#define SLOW_CLK_CAL_CYCLES CONFIG_ESP32C2_RTC_CLK_CAL_CYCLES #define MHZ (1000000) @@ -93,11 +93,11 @@ static const char *TAG = "clk"; wdt_hal_write_protect_enable(&rtc_wdt_ctx); #endif -#if defined(CONFIG_ESP8684_RTC_CLK_SRC_EXT_CRYS) +#if defined(CONFIG_ESP32C2_RTC_CLK_SRC_EXT_CRYS) select_rtc_slow_clk(SLOW_CLK_32K_XTAL); -#elif defined(CONFIG_ESP8684_RTC_CLK_SRC_EXT_OSC) +#elif defined(CONFIG_ESP32C2_RTC_CLK_SRC_EXT_OSC) select_rtc_slow_clk(SLOW_CLK_32K_EXT_OSC); -#elif defined(CONFIG_ESP8684_RTC_CLK_SRC_INT_8MD256) +#elif defined(CONFIG_ESP32C2_RTC_CLK_SRC_INT_8MD256) select_rtc_slow_clk(SLOW_CLK_8MD256); #else select_rtc_slow_clk(RTC_SLOW_FREQ_RTC); @@ -115,7 +115,7 @@ static const char *TAG = "clk"; rtc_cpu_freq_config_t old_config, new_config; rtc_clk_cpu_freq_get_config(&old_config); const uint32_t old_freq_mhz = old_config.freq_mhz; - const uint32_t new_freq_mhz = CONFIG_ESP8684_DEFAULT_CPU_FREQ_MHZ; + const uint32_t new_freq_mhz = CONFIG_ESP32C2_DEFAULT_CPU_FREQ_MHZ; bool res = rtc_clk_cpu_freq_mhz_to_config(new_freq_mhz, &new_config); assert(res); diff --git a/components/esp_system/port/soc/esp8684/reset_reason.c b/components/esp_system/port/soc/esp32c2/reset_reason.c similarity index 96% rename from components/esp_system/port/soc/esp8684/reset_reason.c rename to components/esp_system/port/soc/esp32c2/reset_reason.c index e989daaa426..ecc71610e2e 100644 --- a/components/esp_system/port/soc/esp8684/reset_reason.c +++ b/components/esp_system/port/soc/esp32c2/reset_reason.c @@ -1,14 +1,14 @@ /* - * SPDX-FileCopyrightText: 2018-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2018-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ #include "esp_system.h" -#include "esp8684/rom/rtc.h" +#include "esp32c2/rom/rtc.h" #include "esp_private/system_internal.h" #include "soc/rtc_periph.h" -#include "esp8684/rom/rtc.h" +#include "esp32c2/rom/rtc.h" #include "esp_rom_sys.h" static void esp_reset_reason_clear_hint(void); diff --git a/components/esp_system/port/soc/esp8684/system_internal.c b/components/esp_system/port/soc/esp32c2/system_internal.c similarity index 96% rename from components/esp_system/port/soc/esp8684/system_internal.c rename to components/esp_system/port/soc/esp32c2/system_internal.c index 7633cd5cde2..e661585394e 100644 --- a/components/esp_system/port/soc/esp8684/system_internal.c +++ b/components/esp_system/port/soc/esp32c2/system_internal.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2018-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2018-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -25,8 +25,8 @@ #include "hal/wdt_hal.h" #include "esp_private/cache_err_int.h" -#include "esp8684/rom/cache.h" -#include "esp8684/rom/rtc.h" +#include "esp32c2/rom/cache.h" +#include "esp32c2/rom/rtc.h" /* "inner" restart function for after RTOS, interrupts & anything else on this * core are already stopped. Stalls other core, resets hardware, diff --git a/components/esp_system/startup.c b/components/esp_system/startup.c index 34d53099e28..67cd59d1986 100644 --- a/components/esp_system/startup.c +++ b/components/esp_system/startup.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -258,7 +258,7 @@ static void do_core_init(void) CONFIG_ESP32S3_BROWNOUT_DET || \ CONFIG_ESP32C3_BROWNOUT_DET || \ CONFIG_ESP32H2_BROWNOUT_DET || \ - CONFIG_ESP8684_BROWNOUT_DET + CONFIG_ESP32C2_BROWNOUT_DET // [refactor-todo] leads to call chain rtc_is_register (driver) -> esp_intr_alloc (esp32/esp32s2) -> // malloc (newlib) -> heap_caps_malloc (heap), so heap must be at least initialized esp_brownout_init(); diff --git a/components/esp_system/system_time.c b/components/esp_system/system_time.c index 209dafe18b2..075f54dfa82 100644 --- a/components/esp_system/system_time.c +++ b/components/esp_system/system_time.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -23,8 +23,8 @@ #include "esp32c3/rtc.h" #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rtc.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rtc.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rtc.h" #endif #include "esp_private/startup_internal.h" diff --git a/components/esp_system/task_wdt.c b/components/esp_system/task_wdt.c index c7bca9d9e75..17512f285b0 100644 --- a/components/esp_system/task_wdt.c +++ b/components/esp_system/task_wdt.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -175,7 +175,7 @@ static void task_wdt_isr(void *arg) abort(); } else { -#if !CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32H2 && !CONFIG_IDF_TARGET_ESP8684 // TODO: ESP32-C3 IDF-2986 +#if !CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32H2 && !CONFIG_IDF_TARGET_ESP32C2 // TODO: ESP32-C3 IDF-2986 int current_core = xPortGetCoreID(); //Print backtrace of current core ESP_EARLY_LOGE(TAG, "Print CPU %d (current core) backtrace", current_core); diff --git a/components/esp_timer/src/esp_timer.c b/components/esp_timer/src/esp_timer.c index d9c0da4364a..4b3bd253db6 100644 --- a/components/esp_timer/src/esp_timer.c +++ b/components/esp_timer/src/esp_timer.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -33,8 +33,8 @@ #include "esp32c3/rtc.h" #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rtc.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rtc.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rtc.h" #endif #include "sdkconfig.h" diff --git a/components/esp_timer/src/system_time.c b/components/esp_timer/src/system_time.c index 951d089a82c..69e7809fc82 100644 --- a/components/esp_timer/src/system_time.c +++ b/components/esp_timer/src/system_time.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -27,8 +27,8 @@ #include "esp32c3/rtc.h" #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rtc.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rtc.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rtc.h" #endif __attribute__((unused)) static const char* TAG = "system_time"; diff --git a/components/esp_wifi/Kconfig b/components/esp_wifi/Kconfig index c786c8473ba..bca2badcc73 100644 --- a/components/esp_wifi/Kconfig +++ b/components/esp_wifi/Kconfig @@ -4,7 +4,7 @@ menu "Wi-Fi" config ESP32_WIFI_ENABLED bool - default "n" if IDF_TARGET_ESP8684 # TODO: replace with SOC_CAPS_SUPPORT_WIFI after IDF-2223 is done + default "n" if IDF_TARGET_ESP32C2 # TODO: replace with SOC_CAPS_SUPPORT_WIFI after IDF-2223 is done default "y" if !IDF_TARGET_ESP32H2 config ESP32_WIFI_SW_COEXIST_ENABLE diff --git a/components/esptool_py/Kconfig.projbuild b/components/esptool_py/Kconfig.projbuild index cc043fef80c..095ed206de0 100644 --- a/components/esptool_py/Kconfig.projbuild +++ b/components/esptool_py/Kconfig.projbuild @@ -68,7 +68,7 @@ menu "Serial flasher config" choice ESPTOOLPY_FLASHFREQ prompt "Flash SPI speed" - default ESPTOOLPY_FLASHFREQ_40M if IDF_TARGET_ESP32 || IDF_TARGET_ESP32H2 || IDF_TARGET_ESP8684 + default ESPTOOLPY_FLASHFREQ_40M if IDF_TARGET_ESP32 || IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32C2 default ESPTOOLPY_FLASHFREQ_80M help The SPI flash frequency to be used. diff --git a/components/esptool_py/esptool b/components/esptool_py/esptool index d29880b267e..41ceca0a722 160000 --- a/components/esptool_py/esptool +++ b/components/esptool_py/esptool @@ -1 +1 @@ -Subproject commit d29880b267ea0fb77bf9d333538fccfea156ec76 +Subproject commit 41ceca0a72266960252717b3181389902fd89d55 diff --git a/components/fatfs/test/test_fatfs_sdmmc.c b/components/fatfs/test/test_fatfs_sdmmc.c index 70199b83662..5cbe96ffe08 100644 --- a/components/fatfs/test/test_fatfs_sdmmc.c +++ b/components/fatfs/test/test_fatfs_sdmmc.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -320,7 +320,7 @@ TEST_CASE("(SD) opendir, readdir, rewinddir, seekdir work as expected using UTF- #endif //SDMMC HOST SUPPORTED -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3, ESP8684) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3, ESP32C2) //no runners static void sdspi_speed_test(void *buf, size_t buf_size, size_t file_size, bool write); diff --git a/components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/FreeRTOSConfig_arch.h b/components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/FreeRTOSConfig_arch.h index 9695a70831c..093954587ab 100644 --- a/components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/FreeRTOSConfig_arch.h +++ b/components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/FreeRTOSConfig_arch.h @@ -81,8 +81,8 @@ #include "esp32c3/rom/ets_sys.h" #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rom/ets_sys.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/ets_sys.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/ets_sys.h" #endif #endif // __ASSEMBLER__ diff --git a/components/hal/CMakeLists.txt b/components/hal/CMakeLists.txt index fd05f07fd8f..2b02befbeb9 100644 --- a/components/hal/CMakeLists.txt +++ b/components/hal/CMakeLists.txt @@ -145,14 +145,14 @@ if(NOT BOOTLOADER_BUILD) "esp32h2/rtc_cntl_hal.c") endif() - if(${target} STREQUAL "esp8684") + if(${target} STREQUAL "esp32c2") list(APPEND srcs "gdma_hal.c" "spi_flash_hal_gpspi.c" "spi_slave_hd_hal.c" "systimer_hal.c" - "esp8684/brownout_hal.c" - "esp8684/rtc_cntl_hal.c") + "esp32c2/brownout_hal.c" + "esp32c2/rtc_cntl_hal.c") endif() endif() diff --git a/components/hal/esp8684/brownout_hal.c b/components/hal/esp32c2/brownout_hal.c similarity index 92% rename from components/hal/esp8684/brownout_hal.c rename to components/hal/esp32c2/brownout_hal.c index c77e756844f..ea160a23ed5 100644 --- a/components/hal/esp8684/brownout_hal.c +++ b/components/hal/esp32c2/brownout_hal.c @@ -1,6 +1,6 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/hal/esp8684/include/hal/adc_hal_conf.h b/components/hal/esp32c2/include/hal/adc_hal_conf.h similarity index 90% rename from components/hal/esp8684/include/hal/adc_hal_conf.h rename to components/hal/esp32c2/include/hal/adc_hal_conf.h index d4adcbf97af..11d4d377b34 100644 --- a/components/hal/esp8684/include/hal/adc_hal_conf.h +++ b/components/hal/esp32c2/include/hal/adc_hal_conf.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/hal/esp8684/include/hal/adc_ll.h b/components/hal/esp32c2/include/hal/adc_ll.h similarity index 98% rename from components/hal/esp8684/include/hal/adc_ll.h rename to components/hal/esp32c2/include/hal/adc_ll.h index 7421ec7a7bb..6d172f10937 100644 --- a/components/hal/esp8684/include/hal/adc_ll.h +++ b/components/hal/esp32c2/include/hal/adc_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -55,7 +55,7 @@ typedef enum { * @brief ADC digital controller (DMA mode) work mode. * * @note The conversion mode affects the sampling frequency: - * ESP8684 only support ALTER_UNIT mode + * ESP32C2 only support ALTER_UNIT mode * ALTER_UNIT : When the measurement is triggered, ADC1 or ADC2 samples alternately. */ typedef enum { @@ -170,13 +170,13 @@ static inline void adc_ll_digi_convert_limit_disable(void) /** * Set adc conversion mode for digital controller. * - * @note ESP8684 only support ADC1 single mode. + * @note ESP32-C2 only support ADC1 single mode. * * @param mode Conversion mode select. */ static inline void adc_ll_digi_set_convert_mode(adc_ll_digi_convert_mode_t mode) { - //ESP8684 only supports ADC_CONV_ALTER_UNIT mode + //ESP32-C2 only supports ADC_CONV_ALTER_UNIT mode } /** @@ -559,7 +559,7 @@ static inline void adc_ll_set_power_manage(adc_ll_power_t manage) static inline void adc_ll_set_controller(adc_ll_num_t adc_n, adc_ll_controller_t ctrl) { - //Not used on ESP8684 + //Not used on ESP32-C2 } /** @@ -837,14 +837,14 @@ static inline void adc_ll_onetime_sample_enable(adc_ll_num_t adc_n, bool enable) static inline uint32_t adc_ll_adc1_read(void) { abort(); //TODO IDF-3908 - // //On ESP8684, valid data width is 12-bit + // //On ESP32-C2, valid data width is 12-bit // return (APB_SARADC.apb_saradc1_data_status.adc1_data & 0xfff); } static inline uint32_t adc_ll_adc2_read(void) { abort(); //TODO IDF-3908 - // //On ESP8684, valid data width is 12-bit + // //On ESP32-C2, valid data width is 12-bit // return (APB_SARADC.apb_saradc2_data_status.adc2_data & 0xfff); } diff --git a/components/hal/esp8684/include/hal/aes_ll.h b/components/hal/esp32c2/include/hal/aes_ll.h similarity index 98% rename from components/hal/esp8684/include/hal/aes_ll.h rename to components/hal/esp32c2/include/hal/aes_ll.h index f295e1c7c42..2a38421e1b4 100644 --- a/components/hal/esp8684/include/hal/aes_ll.h +++ b/components/hal/esp32c2/include/hal/aes_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/hal/esp8684/include/hal/clk_gate_ll.h b/components/hal/esp32c2/include/hal/clk_gate_ll.h similarity index 98% rename from components/hal/esp8684/include/hal/clk_gate_ll.h rename to components/hal/esp32c2/include/hal/clk_gate_ll.h index 6f0cc82e985..71e549b5349 100644 --- a/components/hal/esp8684/include/hal/clk_gate_ll.h +++ b/components/hal/esp32c2/include/hal/clk_gate_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/hal/esp8684/include/hal/cpu_ll.h b/components/hal/esp32c2/include/hal/cpu_ll.h similarity index 98% rename from components/hal/esp8684/include/hal/cpu_ll.h rename to components/hal/esp32c2/include/hal/cpu_ll.h index 4c41fd92fa8..3c5dfcb3ce4 100644 --- a/components/hal/esp8684/include/hal/cpu_ll.h +++ b/components/hal/esp32c2/include/hal/cpu_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/hal/esp8684/include/hal/gdma_ll.h b/components/hal/esp32c2/include/hal/gdma_ll.h similarity index 99% rename from components/hal/esp8684/include/hal/gdma_ll.h rename to components/hal/esp32c2/include/hal/gdma_ll.h index fb7a8713be2..b94da07b684 100644 --- a/components/hal/esp8684/include/hal/gdma_ll.h +++ b/components/hal/esp32c2/include/hal/gdma_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/hal/esp8684/include/hal/gpio_ll.h b/components/hal/esp32c2/include/hal/gpio_ll.h similarity index 98% rename from components/hal/esp8684/include/hal/gpio_ll.h rename to components/hal/esp32c2/include/hal/gpio_ll.h index 0f14f68452e..b23375ad3a0 100644 --- a/components/hal/esp8684/include/hal/gpio_ll.h +++ b/components/hal/esp32c2/include/hal/gpio_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -10,7 +10,7 @@ * See readme.md in soc/include/hal/readme.md ******************************************************************************/ -// The LL layer for ESP-8684 GPIO register operations +// The LL layer for ESP32-C2 GPIO register operations #pragma once @@ -107,7 +107,7 @@ static inline void gpio_ll_get_intr_status(gpio_dev_t *hw, uint32_t core_id, uin */ static inline void gpio_ll_get_intr_status_high(gpio_dev_t *hw, uint32_t core_id, uint32_t *status) { - *status = 0; // Less than 32 GPIOs in ESP8684 + *status = 0; // Less than 32 GPIOs in ESP32-C2 } /** @@ -129,7 +129,7 @@ static inline void gpio_ll_clear_intr_status(gpio_dev_t *hw, uint32_t mask) */ static inline void gpio_ll_clear_intr_status_high(gpio_dev_t *hw, uint32_t mask) { - // Less than 32 GPIOs in ESP8684. Do nothing. + // Less than 32 GPIOs in ESP32-C2. Do nothing. } /** diff --git a/components/hal/esp8684/include/hal/gpspi_flash_ll.h b/components/hal/esp32c2/include/hal/gpspi_flash_ll.h similarity index 99% rename from components/hal/esp8684/include/hal/gpspi_flash_ll.h rename to components/hal/esp32c2/include/hal/gpspi_flash_ll.h index 6b00950ac0c..0fad6c92b02 100644 --- a/components/hal/esp8684/include/hal/gpspi_flash_ll.h +++ b/components/hal/esp32c2/include/hal/gpspi_flash_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/hal/esp8684/include/hal/i2c_ll.h b/components/hal/esp32c2/include/hal/i2c_ll.h similarity index 99% rename from components/hal/esp8684/include/hal/i2c_ll.h rename to components/hal/esp32c2/include/hal/i2c_ll.h index 5629dab9142..4489dcff86c 100644 --- a/components/hal/esp8684/include/hal/i2c_ll.h +++ b/components/hal/esp32c2/include/hal/i2c_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/hal/esp8684/include/hal/interrupt_controller_ll.h b/components/hal/esp32c2/include/hal/interrupt_controller_ll.h similarity index 98% rename from components/hal/esp8684/include/hal/interrupt_controller_ll.h rename to components/hal/esp32c2/include/hal/interrupt_controller_ll.h index f65836cb12e..b5632354c97 100644 --- a/components/hal/esp8684/include/hal/interrupt_controller_ll.h +++ b/components/hal/esp32c2/include/hal/interrupt_controller_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/hal/esp8684/include/hal/ledc_ll.h b/components/hal/esp32c2/include/hal/ledc_ll.h similarity index 99% rename from components/hal/esp8684/include/hal/ledc_ll.h rename to components/hal/esp32c2/include/hal/ledc_ll.h index 69034c3e691..869168b92b9 100644 --- a/components/hal/esp8684/include/hal/ledc_ll.h +++ b/components/hal/esp32c2/include/hal/ledc_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/hal/esp8684/include/hal/memprot_ll.h b/components/hal/esp32c2/include/hal/memprot_ll.h similarity index 99% rename from components/hal/esp8684/include/hal/memprot_ll.h rename to components/hal/esp32c2/include/hal/memprot_ll.h index 2c11c49bc95..5bb209712e0 100644 --- a/components/hal/esp8684/include/hal/memprot_ll.h +++ b/components/hal/esp32c2/include/hal/memprot_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -22,7 +22,7 @@ extern "C" { #define IRAM_SRAM_START 0x4037C000 #define DRAM_SRAM_START 0x3FC7C000 -/* ICache size is fixed to 16KB on ESP-8684 */ +/* ICache size is fixed to 16KB on ESP32-C2 */ #ifndef ICACHE_SIZE #define ICACHE_SIZE 0x4000 #endif diff --git a/components/hal/esp8684/include/hal/mpu_ll.h b/components/hal/esp32c2/include/hal/mpu_ll.h similarity index 78% rename from components/hal/esp8684/include/hal/mpu_ll.h rename to components/hal/esp32c2/include/hal/mpu_ll.h index bfeac98afa7..376235c529a 100644 --- a/components/hal/esp8684/include/hal/mpu_ll.h +++ b/components/hal/esp32c2/include/hal/mpu_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -12,7 +12,7 @@ extern "C" { #endif -/* This LL is currently unused for ESP-8684 - cleanup is TODO ESP-8684 IDF-2375 */ +/* This LL is currently unused for ESP32-C2 - cleanup is TODO ESP32-C2 IDF-2375 */ static inline uint32_t mpu_ll_id_to_addr(unsigned id) { diff --git a/components/hal/esp8684/include/hal/mwdt_ll.h b/components/hal/esp32c2/include/hal/mwdt_ll.h similarity index 99% rename from components/hal/esp8684/include/hal/mwdt_ll.h rename to components/hal/esp32c2/include/hal/mwdt_ll.h index 8e9c16810dc..f40dcfa7d91 100644 --- a/components/hal/esp8684/include/hal/mwdt_ll.h +++ b/components/hal/esp32c2/include/hal/mwdt_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/hal/esp8684/include/hal/rtc_cntl_ll.h b/components/hal/esp32c2/include/hal/rtc_cntl_ll.h similarity index 96% rename from components/hal/esp8684/include/hal/rtc_cntl_ll.h rename to components/hal/esp32c2/include/hal/rtc_cntl_ll.h index 5d3b4a27239..f98d7994eb3 100644 --- a/components/hal/esp8684/include/hal/rtc_cntl_ll.h +++ b/components/hal/esp32c2/include/hal/rtc_cntl_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/hal/esp8684/include/hal/rwdt_ll.h b/components/hal/esp32c2/include/hal/rwdt_ll.h similarity index 99% rename from components/hal/esp8684/include/hal/rwdt_ll.h rename to components/hal/esp32c2/include/hal/rwdt_ll.h index 3a7105f851c..daa870d80c6 100644 --- a/components/hal/esp8684/include/hal/rwdt_ll.h +++ b/components/hal/esp32c2/include/hal/rwdt_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/hal/esp8684/include/hal/sha_ll.h b/components/hal/esp32c2/include/hal/sha_ll.h similarity index 98% rename from components/hal/esp8684/include/hal/sha_ll.h rename to components/hal/esp32c2/include/hal/sha_ll.h index b90d7731184..5bb746732ad 100644 --- a/components/hal/esp8684/include/hal/sha_ll.h +++ b/components/hal/esp32c2/include/hal/sha_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/hal/esp8684/include/hal/soc_ll.h b/components/hal/esp32c2/include/hal/soc_ll.h similarity index 95% rename from components/hal/esp8684/include/hal/soc_ll.h rename to components/hal/esp32c2/include/hal/soc_ll.h index 360853afd28..07dc2a1f728 100644 --- a/components/hal/esp8684/include/hal/soc_ll.h +++ b/components/hal/esp32c2/include/hal/soc_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/hal/esp8684/include/hal/spi_flash_encrypted_ll.h b/components/hal/esp32c2/include/hal/spi_flash_encrypted_ll.h similarity index 97% rename from components/hal/esp8684/include/hal/spi_flash_encrypted_ll.h rename to components/hal/esp32c2/include/hal/spi_flash_encrypted_ll.h index 5372746b1d5..21eedb56ded 100644 --- a/components/hal/esp8684/include/hal/spi_flash_encrypted_ll.h +++ b/components/hal/esp32c2/include/hal/spi_flash_encrypted_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/hal/esp8684/include/hal/spi_flash_ll.h b/components/hal/esp32c2/include/hal/spi_flash_ll.h similarity index 99% rename from components/hal/esp8684/include/hal/spi_flash_ll.h rename to components/hal/esp32c2/include/hal/spi_flash_ll.h index 6ab500d50fd..7351232cf9c 100644 --- a/components/hal/esp8684/include/hal/spi_flash_ll.h +++ b/components/hal/esp32c2/include/hal/spi_flash_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/hal/esp8684/include/hal/spi_ll.h b/components/hal/esp32c2/include/hal/spi_ll.h similarity index 99% rename from components/hal/esp8684/include/hal/spi_ll.h rename to components/hal/esp32c2/include/hal/spi_ll.h index ac7392c9b57..a356bc15952 100644 --- a/components/hal/esp8684/include/hal/spi_ll.h +++ b/components/hal/esp32c2/include/hal/spi_ll.h @@ -807,7 +807,7 @@ static inline void spi_ll_set_miso_bitlen(spi_dev_t *hw, size_t bitlen) */ static inline void spi_ll_slave_set_rx_bitlen(spi_dev_t *hw, size_t bitlen) { - //This is not used in esp8684 + //This is not used in esp32c2 } /** @@ -818,7 +818,7 @@ static inline void spi_ll_slave_set_rx_bitlen(spi_dev_t *hw, size_t bitlen) */ static inline void spi_ll_slave_set_tx_bitlen(spi_dev_t *hw, size_t bitlen) { - //This is not used in esp8684 + //This is not used in esp32c2 } /** diff --git a/components/hal/esp8684/include/hal/spimem_flash_ll.h b/components/hal/esp32c2/include/hal/spimem_flash_ll.h similarity index 99% rename from components/hal/esp8684/include/hal/spimem_flash_ll.h rename to components/hal/esp32c2/include/hal/spimem_flash_ll.h index 9ff52d0106a..8f1cf7ad377 100644 --- a/components/hal/esp8684/include/hal/spimem_flash_ll.h +++ b/components/hal/esp32c2/include/hal/spimem_flash_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -118,7 +118,7 @@ static inline void spimem_flash_ll_resume(spi_mem_dev_t *dev) } /** - * Initialize auto suspend mode, and esp8684 doesn't support disable auto-suspend. + * Initialize auto suspend mode, and esp32c2 doesn't support disable auto-suspend. * * @param dev Beginning address of the peripheral registers. * @param auto_sus Enable/disable Flash Auto-Suspend. diff --git a/components/hal/esp8684/include/hal/systimer_ll.h b/components/hal/esp32c2/include/hal/systimer_ll.h similarity index 98% rename from components/hal/esp8684/include/hal/systimer_ll.h rename to components/hal/esp32c2/include/hal/systimer_ll.h index a17b5add9de..b993bf53478 100644 --- a/components/hal/esp8684/include/hal/systimer_ll.h +++ b/components/hal/esp32c2/include/hal/systimer_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/hal/esp8684/include/hal/timer_ll.h b/components/hal/esp32c2/include/hal/timer_ll.h similarity index 98% rename from components/hal/esp8684/include/hal/timer_ll.h rename to components/hal/esp32c2/include/hal/timer_ll.h index f35de704a82..e37db6fd066 100644 --- a/components/hal/esp8684/include/hal/timer_ll.h +++ b/components/hal/esp32c2/include/hal/timer_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/hal/esp8684/include/hal/uart_ll.h b/components/hal/esp32c2/include/hal/uart_ll.h similarity index 99% rename from components/hal/esp8684/include/hal/uart_ll.h rename to components/hal/esp32c2/include/hal/uart_ll.h index d773d8257ad..1123afbbfb2 100644 --- a/components/hal/esp8684/include/hal/uart_ll.h +++ b/components/hal/esp32c2/include/hal/uart_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/hal/esp8684/rtc_cntl_hal.c b/components/hal/esp32c2/rtc_cntl_hal.c similarity index 95% rename from components/hal/esp8684/rtc_cntl_hal.c rename to components/hal/esp32c2/rtc_cntl_hal.c index bc39e3b8dd3..09121d3e622 100644 --- a/components/hal/esp8684/rtc_cntl_hal.c +++ b/components/hal/esp32c2/rtc_cntl_hal.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/hal/include/hal/adc_types.h b/components/hal/include/hal/adc_types.h index d2779f0354a..98d9bfdd376 100644 --- a/components/hal/include/hal/adc_types.h +++ b/components/hal/include/hal/adc_types.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -133,7 +133,7 @@ typedef struct { }; } adc_digi_output_data_t; -#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 +#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 /** * @brief ADC digital controller (DMA mode) output data format. * Used to analyze the acquired ADC (DMA) data. @@ -237,7 +237,7 @@ typedef enum { * Expression: filter_data = (k-1)/k * last_data + new_data / k. */ typedef enum { -#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 +#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 ADC_DIGI_FILTER_DIS = -1, /*!< Disable filter */ #endif ADC_DIGI_FILTER_IIR_2 = 0, /*! threshold, Generates monitor interrupt. */ @@ -309,7 +309,7 @@ typedef struct { adc_channel_t channel; /*! -#if !CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32H2 && !CONFIG_IDF_TARGET_ESP8684 +#if !CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32H2 && !CONFIG_IDF_TARGET_ESP32C2 #include "soc/soc_caps.h" #include "hal/rtc_io_ll.h" #endif diff --git a/components/hal/include/hal/sha_types.h b/components/hal/include/hal/sha_types.h index af729f67d1a..6a9b6ea1c1a 100644 --- a/components/hal/include/hal/sha_types.h +++ b/components/hal/include/hal/sha_types.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -19,8 +19,8 @@ #include "esp32c3/rom/sha.h" #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rom/sha.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/sha.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/sha.h" #endif #ifdef __cplusplus diff --git a/components/hal/linker.lf b/components/hal/linker.lf index 23f3bc95b1e..ad1f7e30340 100644 --- a/components/hal/linker.lf +++ b/components/hal/linker.lf @@ -14,7 +14,7 @@ entries: cpu_hal (noflash) soc_hal (noflash) wdt_hal_iram (noflash) - if IDF_TARGET_ESP32C3 = n && IDF_TARGET_ESP32H2 = n && IDF_TARGET_ESP8684 = n: + if IDF_TARGET_ESP32C3 = n && IDF_TARGET_ESP32H2 = n && IDF_TARGET_ESP32C2 = n: if TWAI_ISR_IN_IRAM = y: twai_hal_iram (noflash) else: diff --git a/components/hal/wdt_hal_iram.c b/components/hal/wdt_hal_iram.c index a5477865284..995c96a9683 100644 --- a/components/hal/wdt_hal_iram.c +++ b/components/hal/wdt_hal_iram.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -67,7 +67,7 @@ void wdt_hal_init(wdt_hal_context_t *hal, wdt_inst_t wdt_inst, uint32_t prescale mwdt_ll_disable_stage(hal->mwdt_dev, 1); mwdt_ll_disable_stage(hal->mwdt_dev, 2); mwdt_ll_disable_stage(hal->mwdt_dev, 3); -#if !CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32H2 && !CONFIG_IDF_TARGET_ESP8684 +#if !CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32H2 && !CONFIG_IDF_TARGET_ESP32C2 //Enable or disable level interrupt. Edge interrupt is always disabled. mwdt_ll_set_edge_intr(hal->mwdt_dev, false); mwdt_ll_set_level_intr(hal->mwdt_dev, enable_intr); diff --git a/components/heap/port/esp8684/memory_layout.c b/components/heap/port/esp32c2/memory_layout.c similarity index 98% rename from components/heap/port/esp8684/memory_layout.c rename to components/heap/port/esp32c2/memory_layout.c index 06d74c7316e..de66846e9f7 100644 --- a/components/heap/port/esp8684/memory_layout.c +++ b/components/heap/port/esp32c2/memory_layout.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/heap/port/memory_layout_utils.c b/components/heap/port/memory_layout_utils.c index f0d7a76c05e..4a356fc8e08 100644 --- a/components/heap/port/memory_layout_utils.c +++ b/components/heap/port/memory_layout_utils.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2018-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2018-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -17,8 +17,8 @@ #define ROM_HAS_LAYOUT_TABLE 1 #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rom/rom_layout.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/rom_layout.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/rom_layout.h" #define ROM_HAS_LAYOUT_TABLE 1 #else #define ROM_HAS_LAYOUT_TABLE 0 diff --git a/components/idf_test/include/esp8684/idf_performance_target.h b/components/idf_test/include/esp32c2/idf_performance_target.h similarity index 100% rename from components/idf_test/include/esp8684/idf_performance_target.h rename to components/idf_test/include/esp32c2/idf_performance_target.h diff --git a/components/log/include/esp_log.h b/components/log/include/esp_log.h index 2c57affd739..84ec2866dcd 100644 --- a/components/log/include/esp_log.h +++ b/components/log/include/esp_log.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -21,8 +21,8 @@ #include "esp32c3/rom/ets_sys.h" #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rom/ets_sys.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/ets_sys.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/ets_sys.h" #endif #ifdef __cplusplus diff --git a/components/mbedtls/Kconfig b/components/mbedtls/Kconfig index 1b62d5322a5..407e4c8d2d8 100644 --- a/components/mbedtls/Kconfig +++ b/components/mbedtls/Kconfig @@ -241,7 +241,7 @@ menu "mbedTLS" config MBEDTLS_HARDWARE_AES bool "Enable hardware AES acceleration" default y - depends on !SPIRAM_CACHE_WORKAROUND_STRATEGY_DUPLDST && !IDF_TARGET_ESP8684 + depends on !SPIRAM_CACHE_WORKAROUND_STRATEGY_DUPLDST && !IDF_TARGET_ESP32C2 help Enable hardware accelerated AES encryption & decryption. @@ -273,7 +273,7 @@ menu "mbedTLS" config MBEDTLS_HARDWARE_MPI bool "Enable hardware MPI (bignum) acceleration" default y - depends on !SPIRAM_CACHE_WORKAROUND_STRATEGY_DUPLDST && !IDF_TARGET_ESP8684 + depends on !SPIRAM_CACHE_WORKAROUND_STRATEGY_DUPLDST && !IDF_TARGET_ESP32C2 help Enable hardware accelerated multiple precision integer operations. @@ -905,7 +905,7 @@ menu "mbedTLS" config MBEDTLS_LARGE_KEY_SOFTWARE_MPI bool "Fallback to software implementation for larger MPI values" depends on MBEDTLS_HARDWARE_MPI - default y if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32H2 || IDF_TARGET_ESP8684 # HW max 3072 bits + default y if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32C2 # HW max 3072 bits default n help Fallback to software implementation for RSA key lengths diff --git a/components/mbedtls/port/esp_ds/esp_rsa_sign_alt.c b/components/mbedtls/port/esp_ds/esp_rsa_sign_alt.c index 4088be25632..8eeebf2b5f6 100644 --- a/components/mbedtls/port/esp_ds/esp_rsa_sign_alt.c +++ b/components/mbedtls/port/esp_ds/esp_rsa_sign_alt.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -15,8 +15,8 @@ #include "esp32h2/rom/digital_signature.h" #elif CONFIG_IDF_TARGET_ESP32S3 #include "esp32s3/rom/digital_signature.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/digital_signature.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/digital_signature.h" #else #error "Selected target does not support esp_rsa_sign_alt (for DS)" #endif diff --git a/components/mbedtls/port/include/md/esp_md.h b/components/mbedtls/port/include/md/esp_md.h index 4506264d42e..f6c0a92d027 100644 --- a/components/mbedtls/port/include/md/esp_md.h +++ b/components/mbedtls/port/include/md/esp_md.h @@ -19,7 +19,7 @@ extern "C" { #endif -#if CONFIG_IDF_TARGET_ESP8684 +#if CONFIG_IDF_TARGET_ESP32C2 typedef struct mbedtls_md5_context mbedtls_md5_context; #else typedef struct MD5Context mbedtls_md5_context; diff --git a/components/mbedtls/port/sha/dma/sha.c b/components/mbedtls/port/sha/dma/sha.c index d1142a50eeb..42b85d52e96 100644 --- a/components/mbedtls/port/sha/dma/sha.c +++ b/components/mbedtls/port/sha/dma/sha.c @@ -55,8 +55,8 @@ #include "esp32s3/rom/cache.h" #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rom/cache.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/cache.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/cache.h" #endif #if SOC_SHA_GDMA diff --git a/components/newlib/locks.c b/components/newlib/locks.c index afde8c6de2b..33ebe6d72a6 100644 --- a/components/newlib/locks.c +++ b/components/newlib/locks.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -384,7 +384,7 @@ void esp_newlib_locks_init(void) __sinit_recursive_mutex = (_lock_t) &s_common_recursive_mutex; extern _lock_t __sfp_recursive_mutex; __sfp_recursive_mutex = (_lock_t) &s_common_recursive_mutex; -#elif defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32H2) || defined(CONFIG_IDF_TARGET_ESP8684) +#elif defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32H2) || defined(CONFIG_IDF_TARGET_ESP32C2) /* Newlib 3.3.0 is used in ROM, built with _RETARGETABLE_LOCKING. * No access to lock variables for the purpose of ECO forward compatibility, * however we have an API to initialize lock variables used in the ROM. diff --git a/components/newlib/newlib_init.c b/components/newlib/newlib_init.c index 4ebe6477b47..b63065ce9ca 100644 --- a/components/newlib/newlib_init.c +++ b/components/newlib/newlib_init.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -31,8 +31,8 @@ #include "esp32c3/rom/libc_stubs.h" #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rom/libc_stubs.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/libc_stubs.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/libc_stubs.h" #endif static struct _reent s_reent; @@ -109,7 +109,7 @@ static struct syscall_stub_table s_stub_table = { ._printf_float = NULL, ._scanf_float = NULL, #endif -#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 +#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 /* TODO IDF-2570 : mark that this assert failed in ROM, to avoid confusion between IDF & ROM assertion failures (as function names & source file names will be similar) */ @@ -132,7 +132,7 @@ void esp_newlib_init(void) syscall_table_ptr_pro = syscall_table_ptr_app = &s_stub_table; #elif CONFIG_IDF_TARGET_ESP32S2 syscall_table_ptr_pro = &s_stub_table; -#elif CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 +#elif CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 syscall_table_ptr = &s_stub_table; #endif diff --git a/components/newlib/port/esp_time_impl.c b/components/newlib/port/esp_time_impl.c index 6576b19d61b..ef347bb68b8 100644 --- a/components/newlib/port/esp_time_impl.c +++ b/components/newlib/port/esp_time_impl.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -36,9 +36,9 @@ #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rom/rtc.h" #include "esp32h2/rtc.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/rtc.h" -#include "esp8684/rtc.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/rtc.h" +#include "esp32c2/rtc.h" #endif diff --git a/components/newlib/test/test_newlib.c b/components/newlib/test/test_newlib.c index ae892302b84..ec836ea1220 100644 --- a/components/newlib/test/test_newlib.c +++ b/components/newlib/test/test_newlib.c @@ -141,7 +141,7 @@ TEST_CASE("check if ROM or Flash is used for functions", "[newlib]") #if defined(CONFIG_IDF_TARGET_ESP32) && !defined(CONFIG_SPIRAM) TEST_ASSERT(fn_in_rom(atoi)); TEST_ASSERT(fn_in_rom(strtol)); -#elif defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32H2) || defined(CONFIG_IDF_TARGET_ESP8684) +#elif defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32H2) || defined(CONFIG_IDF_TARGET_ESP32C2) /* S3 and C3 always use these from ROM */ TEST_ASSERT(fn_in_rom(atoi)); TEST_ASSERT(fn_in_rom(strtol)); diff --git a/components/newlib/test/test_time.c b/components/newlib/test/test_time.c index 7e88d39afd9..efe1388dfad 100644 --- a/components/newlib/test/test_time.c +++ b/components/newlib/test/test_time.c @@ -39,8 +39,8 @@ #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rtc.h" #define TARGET_DEFAULT_CPU_FREQ_MHZ CONFIG_ESP32H2_DEFAULT_CPU_FREQ_MHZ -#elif CONFIG_IDF_TARGET_ESP8684 -#define TARGET_DEFAULT_CPU_FREQ_MHZ CONFIG_ESP8684_DEFAULT_CPU_FREQ_MHZ +#elif CONFIG_IDF_TARGET_ESP32C2 +#define TARGET_DEFAULT_CPU_FREQ_MHZ CONFIG_ESP32C2_DEFAULT_CPU_FREQ_MHZ #endif #if portNUM_PROCESSORS == 2 diff --git a/components/perfmon/CMakeLists.txt b/components/perfmon/CMakeLists.txt index c24304238ee..21af896bb7a 100644 --- a/components/perfmon/CMakeLists.txt +++ b/components/perfmon/CMakeLists.txt @@ -1,5 +1,5 @@ idf_build_get_property(target IDF_TARGET) -if(${target} STREQUAL "esp32c3" OR ${target} STREQUAL "esp32h2" OR ${target} STREQUAL "esp8684") +if(${target} STREQUAL "esp32c3" OR ${target} STREQUAL "esp32h2" OR ${target} STREQUAL "esp32c2") return() endif() diff --git a/components/riscv/CMakeLists.txt b/components/riscv/CMakeLists.txt index 9fd1f540aa8..594345b6eaf 100644 --- a/components/riscv/CMakeLists.txt +++ b/components/riscv/CMakeLists.txt @@ -1,7 +1,7 @@ idf_build_get_property(target IDF_TARGET) # should test arch here not target: IDF-1754 -if(NOT "${target}" STREQUAL "esp32c3" AND NOT "${target}" STREQUAL "esp32h2" AND NOT "${target}" STREQUAL "esp8684") +if(NOT "${target}" STREQUAL "esp32c3" AND NOT "${target}" STREQUAL "esp32h2" AND NOT "${target}" STREQUAL "esp32c2") return() endif() diff --git a/components/soc/esp8684/CMakeLists.txt b/components/soc/esp32c2/CMakeLists.txt similarity index 100% rename from components/soc/esp8684/CMakeLists.txt rename to components/soc/esp32c2/CMakeLists.txt diff --git a/components/soc/esp8684/adc_periph.c b/components/soc/esp32c2/adc_periph.c similarity index 87% rename from components/soc/esp8684/adc_periph.c rename to components/soc/esp32c2/adc_periph.c index 597df5118a3..d235bdf947f 100644 --- a/components/soc/esp8684/adc_periph.c +++ b/components/soc/esp32c2/adc_periph.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/dedic_gpio_periph.c b/components/soc/esp32c2/dedic_gpio_periph.c similarity index 94% rename from components/soc/esp8684/dedic_gpio_periph.c rename to components/soc/esp32c2/dedic_gpio_periph.c index 711274f8930..84070ee47b8 100644 --- a/components/soc/esp8684/dedic_gpio_periph.c +++ b/components/soc/esp32c2/dedic_gpio_periph.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/gdma_periph.c b/components/soc/esp32c2/gdma_periph.c similarity index 86% rename from components/soc/esp8684/gdma_periph.c rename to components/soc/esp32c2/gdma_periph.c index 0cd2196c72b..3fd3493cbd2 100644 --- a/components/soc/esp8684/gdma_periph.c +++ b/components/soc/esp32c2/gdma_periph.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/gpio_periph.c b/components/soc/esp32c2/gpio_periph.c similarity index 95% rename from components/soc/esp8684/gpio_periph.c rename to components/soc/esp32c2/gpio_periph.c index ea88860216c..3bb5104fa6b 100644 --- a/components/soc/esp8684/gpio_periph.c +++ b/components/soc/esp32c2/gpio_periph.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/i2c_bbpll.h b/components/soc/esp32c2/i2c_bbpll.h similarity index 98% rename from components/soc/esp8684/i2c_bbpll.h rename to components/soc/esp32c2/i2c_bbpll.h index a2e231cf506..cf24f090a46 100644 --- a/components/soc/esp8684/i2c_bbpll.h +++ b/components/soc/esp32c2/i2c_bbpll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/i2c_periph.c b/components/soc/esp32c2/i2c_periph.c similarity index 89% rename from components/soc/esp8684/i2c_periph.c rename to components/soc/esp32c2/i2c_periph.c index 03b52bb68aa..cb8e7fa2468 100644 --- a/components/soc/esp8684/i2c_periph.c +++ b/components/soc/esp32c2/i2c_periph.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in similarity index 100% rename from components/soc/esp8684/include/soc/Kconfig.soc_caps.in rename to components/soc/esp32c2/include/soc/Kconfig.soc_caps.in diff --git a/components/soc/esp8684/include/soc/adc_channel.h b/components/soc/esp32c2/include/soc/adc_channel.h similarity index 90% rename from components/soc/esp8684/include/soc/adc_channel.h rename to components/soc/esp32c2/include/soc/adc_channel.h index 106e41666b4..128cd4e4e4b 100644 --- a/components/soc/esp8684/include/soc/adc_channel.h +++ b/components/soc/esp32c2/include/soc/adc_channel.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/apb_saradc_reg.h b/components/soc/esp32c2/include/soc/apb_saradc_reg.h similarity index 99% rename from components/soc/esp8684/include/soc/apb_saradc_reg.h rename to components/soc/esp32c2/include/soc/apb_saradc_reg.h index d144a2e5570..48da47ee506 100644 --- a/components/soc/esp8684/include/soc/apb_saradc_reg.h +++ b/components/soc/esp32c2/include/soc/apb_saradc_reg.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/apb_saradc_struct.h b/components/soc/esp32c2/include/soc/apb_saradc_struct.h similarity index 99% rename from components/soc/esp8684/include/soc/apb_saradc_struct.h rename to components/soc/esp32c2/include/soc/apb_saradc_struct.h index d48083c3de2..0927c9593ad 100644 --- a/components/soc/esp8684/include/soc/apb_saradc_struct.h +++ b/components/soc/esp32c2/include/soc/apb_saradc_struct.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/assist_debug_reg.h b/components/soc/esp32c2/include/soc/assist_debug_reg.h similarity index 99% rename from components/soc/esp8684/include/soc/assist_debug_reg.h rename to components/soc/esp32c2/include/soc/assist_debug_reg.h index 11a4ad6bb5b..960a91e20aa 100644 --- a/components/soc/esp8684/include/soc/assist_debug_reg.h +++ b/components/soc/esp32c2/include/soc/assist_debug_reg.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/bb_reg.h b/components/soc/esp32c2/include/soc/bb_reg.h similarity index 92% rename from components/soc/esp8684/include/soc/bb_reg.h rename to components/soc/esp32c2/include/soc/bb_reg.h index 8a242977b43..cd950c4da9d 100644 --- a/components/soc/esp8684/include/soc/bb_reg.h +++ b/components/soc/esp32c2/include/soc/bb_reg.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2010-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/boot_mode.h b/components/soc/esp32c2/include/soc/boot_mode.h similarity index 98% rename from components/soc/esp8684/include/soc/boot_mode.h rename to components/soc/esp32c2/include/soc/boot_mode.h index cceefe45001..e34acfab76e 100644 --- a/components/soc/esp8684/include/soc/boot_mode.h +++ b/components/soc/esp32c2/include/soc/boot_mode.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/cache_memory.h b/components/soc/esp32c2/include/soc/cache_memory.h similarity index 97% rename from components/soc/esp8684/include/soc/cache_memory.h rename to components/soc/esp32c2/include/soc/cache_memory.h index 4089526cae1..7a561667d73 100644 --- a/components/soc/esp8684/include/soc/cache_memory.h +++ b/components/soc/esp32c2/include/soc/cache_memory.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -11,7 +11,7 @@ extern "C" { #endif #include -#include "esp8684/rom/cache.h" +#include "esp32c2/rom/cache.h" /*IRAM0 is connected with Cache IBUS0*/ #define MMU_PAGE_MODE MMU_Get_Page_Mode() diff --git a/components/soc/esp8684/include/soc/clkout_channel.h b/components/soc/esp32c2/include/soc/clkout_channel.h similarity index 88% rename from components/soc/esp8684/include/soc/clkout_channel.h rename to components/soc/esp32c2/include/soc/clkout_channel.h index 6b9b35ec7ef..0a213304f6a 100644 --- a/components/soc/esp8684/include/soc/clkout_channel.h +++ b/components/soc/esp32c2/include/soc/clkout_channel.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2010-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/dport_access.h b/components/soc/esp32c2/include/soc/dport_access.h similarity index 97% rename from components/soc/esp8684/include/soc/dport_access.h rename to components/soc/esp32c2/include/soc/dport_access.h index d3f8c3a52da..e09a9e477ed 100644 --- a/components/soc/esp8684/include/soc/dport_access.h +++ b/components/soc/esp32c2/include/soc/dport_access.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -10,7 +10,7 @@ #include #include "esp_attr.h" #include "esp_attr.h" -#include "esp8684/dport_access.h" +#include "esp32c2/dport_access.h" #include "soc.h" #include "uart_reg.h" diff --git a/components/soc/esp8684/include/soc/efuse_reg.h b/components/soc/esp32c2/include/soc/efuse_reg.h similarity index 99% rename from components/soc/esp8684/include/soc/efuse_reg.h rename to components/soc/esp32c2/include/soc/efuse_reg.h index 7b697079ef8..82de857ff5a 100644 --- a/components/soc/esp8684/include/soc/efuse_reg.h +++ b/components/soc/esp32c2/include/soc/efuse_reg.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/efuse_struct.h b/components/soc/esp32c2/include/soc/efuse_struct.h similarity index 99% rename from components/soc/esp8684/include/soc/efuse_struct.h rename to components/soc/esp32c2/include/soc/efuse_struct.h index 74751f5596a..7fc768f6f7b 100644 --- a/components/soc/esp8684/include/soc/efuse_struct.h +++ b/components/soc/esp32c2/include/soc/efuse_struct.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/extmem_reg.h b/components/soc/esp32c2/include/soc/extmem_reg.h similarity index 99% rename from components/soc/esp8684/include/soc/extmem_reg.h rename to components/soc/esp32c2/include/soc/extmem_reg.h index a58a7927d24..f975487e681 100644 --- a/components/soc/esp8684/include/soc/extmem_reg.h +++ b/components/soc/esp32c2/include/soc/extmem_reg.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/fe_reg.h b/components/soc/esp32c2/include/soc/fe_reg.h similarity index 93% rename from components/soc/esp8684/include/soc/fe_reg.h rename to components/soc/esp32c2/include/soc/fe_reg.h index aa6f0336536..52bd44bd49c 100644 --- a/components/soc/esp8684/include/soc/fe_reg.h +++ b/components/soc/esp32c2/include/soc/fe_reg.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/gdma_channel.h b/components/soc/esp32c2/include/soc/gdma_channel.h similarity index 86% rename from components/soc/esp8684/include/soc/gdma_channel.h rename to components/soc/esp32c2/include/soc/gdma_channel.h index 97148478253..1fc4dde9a04 100644 --- a/components/soc/esp8684/include/soc/gdma_channel.h +++ b/components/soc/esp32c2/include/soc/gdma_channel.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/gdma_reg.h b/components/soc/esp32c2/include/soc/gdma_reg.h similarity index 99% rename from components/soc/esp8684/include/soc/gdma_reg.h rename to components/soc/esp32c2/include/soc/gdma_reg.h index 2961c79ed9d..643009e6e8b 100644 --- a/components/soc/esp8684/include/soc/gdma_reg.h +++ b/components/soc/esp32c2/include/soc/gdma_reg.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/gdma_struct.h b/components/soc/esp32c2/include/soc/gdma_struct.h similarity index 99% rename from components/soc/esp8684/include/soc/gdma_struct.h rename to components/soc/esp32c2/include/soc/gdma_struct.h index fc91fb5055d..3697f9488b2 100644 --- a/components/soc/esp8684/include/soc/gdma_struct.h +++ b/components/soc/esp32c2/include/soc/gdma_struct.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/gpio_pins.h b/components/soc/esp32c2/include/soc/gpio_pins.h similarity index 78% rename from components/soc/esp8684/include/soc/gpio_pins.h rename to components/soc/esp32c2/include/soc/gpio_pins.h index 61c87944515..57ccedaeb9c 100644 --- a/components/soc/esp8684/include/soc/gpio_pins.h +++ b/components/soc/esp32c2/include/soc/gpio_pins.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/gpio_reg.h b/components/soc/esp32c2/include/soc/gpio_reg.h similarity index 99% rename from components/soc/esp8684/include/soc/gpio_reg.h rename to components/soc/esp32c2/include/soc/gpio_reg.h index de048c74408..5372b926600 100644 --- a/components/soc/esp8684/include/soc/gpio_reg.h +++ b/components/soc/esp32c2/include/soc/gpio_reg.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/gpio_sig_map.h b/components/soc/esp32c2/include/soc/gpio_sig_map.h similarity index 98% rename from components/soc/esp8684/include/soc/gpio_sig_map.h rename to components/soc/esp32c2/include/soc/gpio_sig_map.h index 8ab35e7fd51..3ad4981dbbb 100644 --- a/components/soc/esp8684/include/soc/gpio_sig_map.h +++ b/components/soc/esp32c2/include/soc/gpio_sig_map.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/gpio_struct.h b/components/soc/esp32c2/include/soc/gpio_struct.h similarity index 99% rename from components/soc/esp8684/include/soc/gpio_struct.h rename to components/soc/esp32c2/include/soc/gpio_struct.h index 4ec50831edd..83f7f414023 100644 --- a/components/soc/esp8684/include/soc/gpio_struct.h +++ b/components/soc/esp32c2/include/soc/gpio_struct.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/hwcrypto_reg.h b/components/soc/esp32c2/include/soc/hwcrypto_reg.h similarity index 94% rename from components/soc/esp8684/include/soc/hwcrypto_reg.h rename to components/soc/esp32c2/include/soc/hwcrypto_reg.h index 388428ccd74..ec30793e9e7 100644 --- a/components/soc/esp8684/include/soc/hwcrypto_reg.h +++ b/components/soc/esp32c2/include/soc/hwcrypto_reg.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/i2c_reg.h b/components/soc/esp32c2/include/soc/i2c_reg.h similarity index 99% rename from components/soc/esp8684/include/soc/i2c_reg.h rename to components/soc/esp32c2/include/soc/i2c_reg.h index 234331a0a04..8c07a7398f1 100644 --- a/components/soc/esp8684/include/soc/i2c_reg.h +++ b/components/soc/esp32c2/include/soc/i2c_reg.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/i2c_struct.h b/components/soc/esp32c2/include/soc/i2c_struct.h similarity index 99% rename from components/soc/esp8684/include/soc/i2c_struct.h rename to components/soc/esp32c2/include/soc/i2c_struct.h index da776149510..d3432771961 100644 --- a/components/soc/esp8684/include/soc/i2c_struct.h +++ b/components/soc/esp32c2/include/soc/i2c_struct.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/interrupt_core0_reg.h b/components/soc/esp32c2/include/soc/interrupt_core0_reg.h similarity index 99% rename from components/soc/esp8684/include/soc/interrupt_core0_reg.h rename to components/soc/esp32c2/include/soc/interrupt_core0_reg.h index b1a9500b06e..fa1653620ac 100644 --- a/components/soc/esp8684/include/soc/interrupt_core0_reg.h +++ b/components/soc/esp32c2/include/soc/interrupt_core0_reg.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/interrupt_reg.h b/components/soc/esp32c2/include/soc/interrupt_reg.h similarity index 52% rename from components/soc/esp8684/include/soc/interrupt_reg.h rename to components/soc/esp32c2/include/soc/interrupt_reg.h index d65d574fca3..9cd7df0d39e 100644 --- a/components/soc/esp8684/include/soc/interrupt_reg.h +++ b/components/soc/esp32c2/include/soc/interrupt_reg.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/io_mux_reg.h b/components/soc/esp32c2/include/soc/io_mux_reg.h similarity index 99% rename from components/soc/esp8684/include/soc/io_mux_reg.h rename to components/soc/esp32c2/include/soc/io_mux_reg.h index 3bbd6edbc55..d5f9f9359b2 100644 --- a/components/soc/esp8684/include/soc/io_mux_reg.h +++ b/components/soc/esp32c2/include/soc/io_mux_reg.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/ledc_reg.h b/components/soc/esp32c2/include/soc/ledc_reg.h similarity index 99% rename from components/soc/esp8684/include/soc/ledc_reg.h rename to components/soc/esp32c2/include/soc/ledc_reg.h index 078180365d9..728371f1d5c 100644 --- a/components/soc/esp8684/include/soc/ledc_reg.h +++ b/components/soc/esp32c2/include/soc/ledc_reg.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/ledc_struct.h b/components/soc/esp32c2/include/soc/ledc_struct.h similarity index 99% rename from components/soc/esp8684/include/soc/ledc_struct.h rename to components/soc/esp32c2/include/soc/ledc_struct.h index c7267e22e49..2e4d20643ba 100644 --- a/components/soc/esp8684/include/soc/ledc_struct.h +++ b/components/soc/esp32c2/include/soc/ledc_struct.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/mmu.h b/components/soc/esp32c2/include/soc/mmu.h similarity index 95% rename from components/soc/esp8684/include/soc/mmu.h rename to components/soc/esp32c2/include/soc/mmu.h index 1623d11d0b2..3b4ae0b6a32 100644 --- a/components/soc/esp8684/include/soc/mmu.h +++ b/components/soc/esp32c2/include/soc/mmu.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/nrx_reg.h b/components/soc/esp32c2/include/soc/nrx_reg.h similarity index 95% rename from components/soc/esp8684/include/soc/nrx_reg.h rename to components/soc/esp32c2/include/soc/nrx_reg.h index 5dbabc74c32..2e5b56fdb8f 100644 --- a/components/soc/esp8684/include/soc/nrx_reg.h +++ b/components/soc/esp32c2/include/soc/nrx_reg.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/periph_defs.h b/components/soc/esp32c2/include/soc/periph_defs.h similarity index 97% rename from components/soc/esp8684/include/soc/periph_defs.h rename to components/soc/esp32c2/include/soc/periph_defs.h index 17a58a8f711..728bfcc7d1c 100644 --- a/components/soc/esp8684/include/soc/periph_defs.h +++ b/components/soc/esp32c2/include/soc/periph_defs.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -16,7 +16,7 @@ typedef enum { PERIPH_UART1_MODULE, PERIPH_I2C0_MODULE, PERIPH_TIMG0_MODULE, - PERIPH_TIMG1_MODULE, //No timg1 on esp8684, please remove TODO: IDF-3825 + PERIPH_TIMG1_MODULE, //No timg1 on esp32c2, please remove TODO: IDF-3825 PERIPH_UHCI0_MODULE, PERIPH_SPI_MODULE, //SPI1 PERIPH_SPI2_MODULE, //SPI2 diff --git a/components/soc/esp8684/include/soc/reg_base.h b/components/soc/esp32c2/include/soc/reg_base.h similarity index 100% rename from components/soc/esp8684/include/soc/reg_base.h rename to components/soc/esp32c2/include/soc/reg_base.h diff --git a/components/soc/esp8684/include/soc/reset_reasons.h b/components/soc/esp32c2/include/soc/reset_reasons.h similarity index 97% rename from components/soc/esp8684/include/soc/reset_reasons.h rename to components/soc/esp32c2/include/soc/reset_reasons.h index 5debb5df2e8..ca4e4238ddb 100644 --- a/components/soc/esp8684/include/soc/reset_reasons.h +++ b/components/soc/esp32c2/include/soc/reset_reasons.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/rtc.h b/components/soc/esp32c2/include/soc/rtc.h similarity index 99% rename from components/soc/esp8684/include/soc/rtc.h rename to components/soc/esp32c2/include/soc/rtc.h index c65b49ddba1..35616e179e5 100644 --- a/components/soc/esp8684/include/soc/rtc.h +++ b/components/soc/esp32c2/include/soc/rtc.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/rtc_cntl_reg.h b/components/soc/esp32c2/include/soc/rtc_cntl_reg.h similarity index 99% rename from components/soc/esp8684/include/soc/rtc_cntl_reg.h rename to components/soc/esp32c2/include/soc/rtc_cntl_reg.h index 7308082df42..1c5abf57322 100644 --- a/components/soc/esp8684/include/soc/rtc_cntl_reg.h +++ b/components/soc/esp32c2/include/soc/rtc_cntl_reg.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/rtc_cntl_struct.h b/components/soc/esp32c2/include/soc/rtc_cntl_struct.h similarity index 99% rename from components/soc/esp8684/include/soc/rtc_cntl_struct.h rename to components/soc/esp32c2/include/soc/rtc_cntl_struct.h index 7a83c28aa01..b4c8460f6e1 100644 --- a/components/soc/esp8684/include/soc/rtc_cntl_struct.h +++ b/components/soc/esp32c2/include/soc/rtc_cntl_struct.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/sensitive_reg.h b/components/soc/esp32c2/include/soc/sensitive_reg.h similarity index 99% rename from components/soc/esp8684/include/soc/sensitive_reg.h rename to components/soc/esp32c2/include/soc/sensitive_reg.h index e3de172e730..e63b9fcc2db 100644 --- a/components/soc/esp8684/include/soc/sensitive_reg.h +++ b/components/soc/esp32c2/include/soc/sensitive_reg.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/sensitive_struct.h b/components/soc/esp32c2/include/soc/sensitive_struct.h similarity index 99% rename from components/soc/esp8684/include/soc/sensitive_struct.h rename to components/soc/esp32c2/include/soc/sensitive_struct.h index 1105743a958..015d8d81906 100644 --- a/components/soc/esp8684/include/soc/sensitive_struct.h +++ b/components/soc/esp32c2/include/soc/sensitive_struct.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/soc.h b/components/soc/esp32c2/include/soc/soc.h similarity index 100% rename from components/soc/esp8684/include/soc/soc.h rename to components/soc/esp32c2/include/soc/soc.h diff --git a/components/soc/esp8684/include/soc/soc_caps.h b/components/soc/esp32c2/include/soc/soc_caps.h similarity index 96% rename from components/soc/esp8684/include/soc/soc_caps.h rename to components/soc/esp32c2/include/soc/soc_caps.h index 2b5edda33fc..37e94fe626b 100644 --- a/components/soc/esp8684/include/soc/soc_caps.h +++ b/components/soc/esp32c2/include/soc/soc_caps.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -101,16 +101,16 @@ #define SOC_GDMA_TX_RX_SHARE_INTERRUPT (1) // TX and RX channel in the same pair will share the same interrupt source number /*-------------------------- GPIO CAPS ---------------------------------------*/ -// ESP8684 has 1 GPIO peripheral +// ESP32-C2 has 1 GPIO peripheral #define SOC_GPIO_PORT (1U) #define SOC_GPIO_PIN_COUNT (21) // Target has no full RTC IO subsystem, so GPIO is 100% "independent" of RTC -// On ESP8684, Digital IOs have their own registers to control pullup/down capability, independent of RTC registers. +// On ESP32-C2, Digital IOs have their own registers to control pullup/down capability, independent of RTC registers. #define SOC_GPIO_SUPPORTS_RTC_INDEPENDENT (1) -// Force hold is a new function of ESP8684 +// Force hold is a new function of ESP32-C2 #define SOC_GPIO_SUPPORT_FORCE_HOLD (1) -// GPIO0~5 on ESP8684 can support chip deep sleep wakeup +// GPIO0~5 on ESP32-C2 can support chip deep sleep wakeup #define SOC_GPIO_SUPPORT_DEEPSLEEP_WAKEUP (1) #define SOC_GPIO_VALID_GPIO_MASK ((1U<> 3)) /*-------------------------- RTCIO CAPS --------------------------------------*/ -/* No dedicated RTCIO subsystem on ESP8684. RTC functions are still supported +/* No dedicated RTCIO subsystem on ESP32-C2. RTC functions are still supported * for hold, wake & 32kHz crystal functions - via rtc_cntl_reg */ #define SOC_RTCIO_PIN_COUNT (0U) @@ -237,13 +237,13 @@ #define SOC_TIMER_GROUP_TOTAL_TIMERS (1U) /*-------------------------- TOUCH SENSOR CAPS -------------------------------*/ -#define SOC_TOUCH_SENSOR_NUM (0U) /*! No touch sensors on ESP8684 */ +#define SOC_TOUCH_SENSOR_NUM (0U) /*! No touch sensors on ESP32-C2 */ /*-------------------------- Flash Encryption CAPS----------------------------*/ #define SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX (32) /*-------------------------- UART CAPS ---------------------------------------*/ -// ESP8684 has 2 UARTs +// ESP32-C2 has 2 UARTs #define SOC_UART_NUM (2) #define SOC_UART_FIFO_LEN (128) /*!< The UART hardware FIFO length */ #define SOC_UART_BITRATE_MAX (5000000) /*!< Max bit rate supported by UART */ diff --git a/components/soc/esp8684/include/soc/soc_pins.h b/components/soc/esp32c2/include/soc/soc_pins.h similarity index 86% rename from components/soc/esp8684/include/soc/soc_pins.h rename to components/soc/esp32c2/include/soc/soc_pins.h index 37781757d3e..05a7c3b4168 100644 --- a/components/soc/esp8684/include/soc/soc_pins.h +++ b/components/soc/esp32c2/include/soc/soc_pins.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/spi_mem_reg.h b/components/soc/esp32c2/include/soc/spi_mem_reg.h similarity index 99% rename from components/soc/esp8684/include/soc/spi_mem_reg.h rename to components/soc/esp32c2/include/soc/spi_mem_reg.h index 649eeecf1cf..bd22f94efb1 100644 --- a/components/soc/esp8684/include/soc/spi_mem_reg.h +++ b/components/soc/esp32c2/include/soc/spi_mem_reg.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/spi_mem_struct.h b/components/soc/esp32c2/include/soc/spi_mem_struct.h similarity index 99% rename from components/soc/esp8684/include/soc/spi_mem_struct.h rename to components/soc/esp32c2/include/soc/spi_mem_struct.h index 90d17401b01..8fd02234d0d 100644 --- a/components/soc/esp8684/include/soc/spi_mem_struct.h +++ b/components/soc/esp32c2/include/soc/spi_mem_struct.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/spi_pins.h b/components/soc/esp32c2/include/soc/spi_pins.h similarity index 90% rename from components/soc/esp8684/include/soc/spi_pins.h rename to components/soc/esp32c2/include/soc/spi_pins.h index 4ca6dd6ac70..0921353333c 100644 --- a/components/soc/esp8684/include/soc/spi_pins.h +++ b/components/soc/esp32c2/include/soc/spi_pins.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/spi_reg.h b/components/soc/esp32c2/include/soc/spi_reg.h similarity index 99% rename from components/soc/esp8684/include/soc/spi_reg.h rename to components/soc/esp32c2/include/soc/spi_reg.h index 6c67a39d612..24fa77c80eb 100644 --- a/components/soc/esp8684/include/soc/spi_reg.h +++ b/components/soc/esp32c2/include/soc/spi_reg.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/spi_struct.h b/components/soc/esp32c2/include/soc/spi_struct.h similarity index 99% rename from components/soc/esp8684/include/soc/spi_struct.h rename to components/soc/esp32c2/include/soc/spi_struct.h index c2230e50784..da359da8450 100644 --- a/components/soc/esp8684/include/soc/spi_struct.h +++ b/components/soc/esp32c2/include/soc/spi_struct.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/syscon_reg.h b/components/soc/esp32c2/include/soc/syscon_reg.h similarity index 99% rename from components/soc/esp8684/include/soc/syscon_reg.h rename to components/soc/esp32c2/include/soc/syscon_reg.h index 4ae0bf9261e..bdbade2d89e 100644 --- a/components/soc/esp8684/include/soc/syscon_reg.h +++ b/components/soc/esp32c2/include/soc/syscon_reg.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/syscon_struct.h b/components/soc/esp32c2/include/soc/syscon_struct.h similarity index 99% rename from components/soc/esp8684/include/soc/syscon_struct.h rename to components/soc/esp32c2/include/soc/syscon_struct.h index cecee16211e..7e8deca1a86 100644 --- a/components/soc/esp8684/include/soc/syscon_struct.h +++ b/components/soc/esp32c2/include/soc/syscon_struct.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/system_reg.h b/components/soc/esp32c2/include/soc/system_reg.h similarity index 99% rename from components/soc/esp8684/include/soc/system_reg.h rename to components/soc/esp32c2/include/soc/system_reg.h index 9a9c9317499..caf223db039 100644 --- a/components/soc/esp8684/include/soc/system_reg.h +++ b/components/soc/esp32c2/include/soc/system_reg.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/system_struct.h b/components/soc/esp32c2/include/soc/system_struct.h similarity index 99% rename from components/soc/esp8684/include/soc/system_struct.h rename to components/soc/esp32c2/include/soc/system_struct.h index b53e34d622a..f194474386d 100644 --- a/components/soc/esp8684/include/soc/system_struct.h +++ b/components/soc/esp32c2/include/soc/system_struct.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/systimer_reg.h b/components/soc/esp32c2/include/soc/systimer_reg.h similarity index 99% rename from components/soc/esp8684/include/soc/systimer_reg.h rename to components/soc/esp32c2/include/soc/systimer_reg.h index 34cf8e53770..1b0899828a5 100644 --- a/components/soc/esp8684/include/soc/systimer_reg.h +++ b/components/soc/esp32c2/include/soc/systimer_reg.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/systimer_struct.h b/components/soc/esp32c2/include/soc/systimer_struct.h similarity index 99% rename from components/soc/esp8684/include/soc/systimer_struct.h rename to components/soc/esp32c2/include/soc/systimer_struct.h index b2ff110383a..35d603c3864 100644 --- a/components/soc/esp8684/include/soc/systimer_struct.h +++ b/components/soc/esp32c2/include/soc/systimer_struct.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/timer_group_reg.h b/components/soc/esp32c2/include/soc/timer_group_reg.h similarity index 99% rename from components/soc/esp8684/include/soc/timer_group_reg.h rename to components/soc/esp32c2/include/soc/timer_group_reg.h index 72ec5ea1e61..f92a355c663 100644 --- a/components/soc/esp8684/include/soc/timer_group_reg.h +++ b/components/soc/esp32c2/include/soc/timer_group_reg.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/timer_group_struct.h b/components/soc/esp32c2/include/soc/timer_group_struct.h similarity index 99% rename from components/soc/esp8684/include/soc/timer_group_struct.h rename to components/soc/esp32c2/include/soc/timer_group_struct.h index f540f072639..34cba27ee69 100644 --- a/components/soc/esp8684/include/soc/timer_group_struct.h +++ b/components/soc/esp32c2/include/soc/timer_group_struct.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/uart_channel.h b/components/soc/esp32c2/include/soc/uart_channel.h similarity index 96% rename from components/soc/esp8684/include/soc/uart_channel.h rename to components/soc/esp32c2/include/soc/uart_channel.h index da453ea18aa..c482f66bfa7 100644 --- a/components/soc/esp8684/include/soc/uart_channel.h +++ b/components/soc/esp32c2/include/soc/uart_channel.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/uart_pins.h b/components/soc/esp32c2/include/soc/uart_pins.h similarity index 93% rename from components/soc/esp8684/include/soc/uart_pins.h rename to components/soc/esp32c2/include/soc/uart_pins.h index ae7cbbd5828..95d6844f64f 100644 --- a/components/soc/esp8684/include/soc/uart_pins.h +++ b/components/soc/esp32c2/include/soc/uart_pins.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/uart_reg.h b/components/soc/esp32c2/include/soc/uart_reg.h similarity index 99% rename from components/soc/esp8684/include/soc/uart_reg.h rename to components/soc/esp32c2/include/soc/uart_reg.h index 1b228f9c7a0..0f105fa0b2f 100644 --- a/components/soc/esp8684/include/soc/uart_reg.h +++ b/components/soc/esp32c2/include/soc/uart_reg.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/uart_struct.h b/components/soc/esp32c2/include/soc/uart_struct.h similarity index 99% rename from components/soc/esp8684/include/soc/uart_struct.h rename to components/soc/esp32c2/include/soc/uart_struct.h index fec9eeeba21..fe8733c9ad6 100644 --- a/components/soc/esp8684/include/soc/uart_struct.h +++ b/components/soc/esp32c2/include/soc/uart_struct.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/include/soc/wdev_reg.h b/components/soc/esp32c2/include/soc/wdev_reg.h similarity index 72% rename from components/soc/esp8684/include/soc/wdev_reg.h rename to components/soc/esp32c2/include/soc/wdev_reg.h index 839c3612553..755fd25f74c 100644 --- a/components/soc/esp8684/include/soc/wdev_reg.h +++ b/components/soc/esp32c2/include/soc/wdev_reg.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/interrupts.c b/components/soc/esp32c2/interrupts.c similarity index 95% rename from components/soc/esp8684/interrupts.c rename to components/soc/esp32c2/interrupts.c index f6f964c636d..1d1d2d4e453 100644 --- a/components/soc/esp8684/interrupts.c +++ b/components/soc/esp32c2/interrupts.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/ld/esp8684.peripherals.ld b/components/soc/esp32c2/ld/esp32c2.peripherals.ld similarity index 91% rename from components/soc/esp8684/ld/esp8684.peripherals.ld rename to components/soc/esp32c2/ld/esp32c2.peripherals.ld index 1263ad0a7c3..374ee5f5d6b 100644 --- a/components/soc/esp8684/ld/esp8684.peripherals.ld +++ b/components/soc/esp32c2/ld/esp32c2.peripherals.ld @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/ledc_periph.c b/components/soc/esp32c2/ledc_periph.c similarity index 81% rename from components/soc/esp8684/ledc_periph.c rename to components/soc/esp32c2/ledc_periph.c index a3c4cc30772..a401e1f80a5 100644 --- a/components/soc/esp8684/ledc_periph.c +++ b/components/soc/esp32c2/ledc_periph.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/spi_periph.c b/components/soc/esp32c2/spi_periph.c similarity index 97% rename from components/soc/esp8684/spi_periph.c rename to components/soc/esp32c2/spi_periph.c index e27b10db05b..0ac8169ea8c 100644 --- a/components/soc/esp8684/spi_periph.c +++ b/components/soc/esp32c2/spi_periph.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/timer_periph.c b/components/soc/esp32c2/timer_periph.c similarity index 84% rename from components/soc/esp8684/timer_periph.c rename to components/soc/esp32c2/timer_periph.c index 736cbe26d65..9b25afd355f 100644 --- a/components/soc/esp8684/timer_periph.c +++ b/components/soc/esp32c2/timer_periph.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/esp8684/uart_periph.c b/components/soc/esp32c2/uart_periph.c similarity index 97% rename from components/soc/esp8684/uart_periph.c rename to components/soc/esp32c2/uart_periph.c index 50b43a905f6..a23ff14937d 100644 --- a/components/soc/esp8684/uart_periph.c +++ b/components/soc/esp32c2/uart_periph.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/components/soc/include/soc/lldesc.h b/components/soc/include/soc/lldesc.h index ed11686f8fd..4e6692620ba 100644 --- a/components/soc/include/soc/lldesc.h +++ b/components/soc/include/soc/lldesc.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2010-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -18,8 +18,8 @@ #include "esp32c3/rom/lldesc.h" #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rom/lldesc.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/lldesc.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/lldesc.h" #endif //the size field has 12 bits, but 0 not for 4096. diff --git a/components/spi_flash/cache_utils.c b/components/spi_flash/cache_utils.c index f3e4c349f80..e1771c39135 100644 --- a/components/spi_flash/cache_utils.c +++ b/components/spi_flash/cache_utils.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -31,8 +31,8 @@ #include "esp32h2/rom/cache.h" #include "soc/extmem_reg.h" #include "soc/cache_memory.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/cache.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/cache.h" #include "soc/extmem_reg.h" #include "soc/cache_memory.h" #endif @@ -328,7 +328,7 @@ static void IRAM_ATTR spi_flash_disable_cache(uint32_t cpuid, uint32_t *saved_st icache_state = Cache_Suspend_ICache() << 16; dcache_state = Cache_Suspend_DCache(); *saved_state = icache_state | dcache_state; -#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 +#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 uint32_t icache_state; icache_state = Cache_Suspend_ICache() << 16; *saved_state = icache_state; @@ -354,7 +354,7 @@ static void IRAM_ATTR spi_flash_restore_cache(uint32_t cpuid, uint32_t saved_sta #elif CONFIG_IDF_TARGET_ESP32S3 Cache_Resume_DCache(saved_state & 0xffff); Cache_Resume_ICache(saved_state >> 16); -#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 +#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 Cache_Resume_ICache(saved_state >> 16); #endif } @@ -368,7 +368,7 @@ IRAM_ATTR bool spi_flash_cache_enabled(void) #endif #elif CONFIG_IDF_TARGET_ESP32S2 bool result = (REG_GET_BIT(EXTMEM_PRO_ICACHE_CTRL_REG, EXTMEM_PRO_ICACHE_ENABLE) != 0); -#elif CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 +#elif CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 bool result = (REG_GET_BIT(EXTMEM_ICACHE_CTRL_REG, EXTMEM_ICACHE_ENABLE) != 0); #endif return result; @@ -483,19 +483,19 @@ esp_err_t esp_enable_cache_wrap(bool icache_wrap_enable, bool dcache_wrap_enable int i; bool flash_spiram_wrap_together, flash_support_wrap = true, spiram_support_wrap = true; uint32_t drom0_in_icache = 1;//always 1 in esp32s2 -#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 +#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 drom0_in_icache = 0; #endif if (icache_wrap_enable) { -#if CONFIG_ESP32S2_INSTRUCTION_CACHE_LINE_16B || CONFIG_ESP32S3_INSTRUCTION_CACHE_LINE_16B || CONFIG_ESP32C3_INSTRUCTION_CACHE_LINE_16B || CONFIG_ESP32H2_INSTRUCTION_CACHE_LINE_16B || CONFIG_ESP8684_INSTRUCTION_CACHE_LINE_16B +#if CONFIG_ESP32S2_INSTRUCTION_CACHE_LINE_16B || CONFIG_ESP32S3_INSTRUCTION_CACHE_LINE_16B || CONFIG_ESP32C3_INSTRUCTION_CACHE_LINE_16B || CONFIG_ESP32H2_INSTRUCTION_CACHE_LINE_16B || CONFIG_ESP32C2_INSTRUCTION_CACHE_LINE_16B icache_wrap_size = 16; #else icache_wrap_size = 32; #endif } if (dcache_wrap_enable) { -#if CONFIG_ESP32S2_DATA_CACHE_LINE_16B || CONFIG_ESP32S3_DATA_CACHE_LINE_16B || CONFIG_ESP32C3_INSTRUCTION_CACHE_LINE_16B || CONFIG_ESP32H2_INSTRUCTION_CACHE_LINE_16B || CONFIG_ESP8684_INSTRUCTION_CACHE_LINE_16B +#if CONFIG_ESP32S2_DATA_CACHE_LINE_16B || CONFIG_ESP32S3_DATA_CACHE_LINE_16B || CONFIG_ESP32C3_INSTRUCTION_CACHE_LINE_16B || CONFIG_ESP32H2_INSTRUCTION_CACHE_LINE_16B || CONFIG_ESP32C2_INSTRUCTION_CACHE_LINE_16B dcache_wrap_size = 16; #else dcache_wrap_size = 32; @@ -884,7 +884,7 @@ esp_err_t esp_enable_cache_wrap(bool icache_wrap_enable, bool dcache_wrap_enable } #endif -#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 +#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 static IRAM_ATTR void esp_enable_cache_flash_wrap(bool icache) { @@ -926,7 +926,7 @@ esp_err_t esp_enable_cache_wrap(bool icache_wrap_enable) } return ESP_OK; } -#endif // CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 +#endif // CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 void IRAM_ATTR spi_flash_enable_cache(uint32_t cpuid) { diff --git a/components/spi_flash/esp8684/flash_ops_esp8684.c b/components/spi_flash/esp32c2/flash_ops_esp32c2.c similarity index 96% rename from components/spi_flash/esp8684/flash_ops_esp8684.c rename to components/spi_flash/esp32c2/flash_ops_esp32c2.c index ad62448c620..0a37f9ffd0c 100644 --- a/components/spi_flash/esp8684/flash_ops_esp8684.c +++ b/components/spi_flash/esp32c2/flash_ops_esp32c2.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -10,14 +10,14 @@ #include "esp_spi_flash.h" #include "soc/system_reg.h" #include "soc/soc_memory_layout.h" -#include "esp8684/rom/cache.h" +#include "esp32c2/rom/cache.h" #include "hal/spi_flash_hal.h" #include "esp_flash.h" #include "esp_log.h" #include "esp_attr.h" #include "esp_rom_spiflash.h" -static const char *TAG = "spiflash_8684"; +static const char *TAG = "spiflash_esp32c2"; #define SPICACHE SPIMEM0 #define SPIFLASH SPIMEM1 diff --git a/components/spi_flash/esp_flash_spi_init.c b/components/spi_flash/esp_flash_spi_init.c index 58ecbc68c68..898236cf2fa 100644 --- a/components/spi_flash/esp_flash_spi_init.c +++ b/components/spi_flash/esp_flash_spi_init.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -90,7 +90,7 @@ esp_flash_t *esp_flash_default_chip = NULL; .input_delay_ns = 0,\ .cs_setup = 1,\ } -#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP8684 +#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2 #if !CONFIG_SPI_FLASH_AUTO_SUSPEND #define ESP_FLASH_HOST_CONFIG_DEFAULT() (memspi_host_config_t){ \ .host_id = SPI1_HOST,\ @@ -273,7 +273,7 @@ esp_err_t esp_flash_init_default_chip(void) const esp_rom_spiflash_chip_t *legacy_chip = &g_rom_flashchip; memspi_host_config_t cfg = ESP_FLASH_HOST_CONFIG_DEFAULT(); - #if !CONFIG_IDF_TARGET_ESP32 && !CONFIG_IDF_TARGET_ESP8684 + #if !CONFIG_IDF_TARGET_ESP32 && !CONFIG_IDF_TARGET_ESP32C2 // For esp32s2 spi IOs are configured as from IO MUX by default cfg.iomux = esp_rom_efuse_get_flash_gpio_info() == 0 ? true : false; #endif diff --git a/components/spi_flash/flash_mmap.c b/components/spi_flash/flash_mmap.c index e08c5cc1dd5..61e12f53f8b 100644 --- a/components/spi_flash/flash_mmap.c +++ b/components/spi_flash/flash_mmap.c @@ -50,8 +50,8 @@ #include "esp32h2/rom/cache.h" #include "soc/cache_memory.h" #include "soc/mmu.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/cache.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/cache.h" #include "soc/cache_memory.h" #include "soc/mmu.h" #endif diff --git a/components/spi_flash/flash_ops.c b/components/spi_flash/flash_ops.c index 90bcd93fe45..f40925edb27 100644 --- a/components/spi_flash/flash_ops.c +++ b/components/spi_flash/flash_ops.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -36,8 +36,8 @@ #include "esp32c3/rom/cache.h" #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rom/cache.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/cache.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/cache.h" #endif #include "esp_rom_spiflash.h" #include "esp_flash_partitions.h" diff --git a/components/spi_flash/spi_flash_os_func_noos.c b/components/spi_flash/spi_flash_os_func_noos.c index a04eeedfb4f..f1ce890d3dd 100644 --- a/components/spi_flash/spi_flash_os_func_noos.c +++ b/components/spi_flash/spi_flash_os_func_noos.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -23,9 +23,9 @@ #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rom/ets_sys.h" #include "esp32h2/rom/cache.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/ets_sys.h" -#include "esp8684/rom/cache.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/ets_sys.h" +#include "esp32c2/rom/cache.h" #endif #include "esp_attr.h" @@ -37,7 +37,7 @@ typedef struct { } spi_noos_arg_t; static DRAM_ATTR spi_noos_arg_t spi_arg = { 0 }; -#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 +#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 typedef struct { uint32_t icache_autoload; } spi_noos_arg_t; @@ -54,7 +54,7 @@ static IRAM_ATTR esp_err_t start(void *arg) spi_noos_arg_t *spi_arg = arg; spi_arg->icache_autoload = Cache_Suspend_ICache(); spi_arg->dcache_autoload = Cache_Suspend_DCache(); -#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 +#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 spi_noos_arg_t *spi_arg = arg; spi_arg->icache_autoload = Cache_Suspend_ICache(); #endif @@ -73,7 +73,7 @@ static IRAM_ATTR esp_err_t end(void *arg) Cache_Invalidate_ICache_All(); Cache_Resume_ICache(spi_arg->icache_autoload); Cache_Resume_DCache(spi_arg->dcache_autoload); -#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP8684 +#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2 spi_noos_arg_t *spi_arg = arg; Cache_Invalidate_ICache_All(); Cache_Resume_ICache(spi_arg->icache_autoload); diff --git a/components/spi_flash/test/test_esp_flash.c b/components/spi_flash/test/test_esp_flash.c index 5b319b810b9..7307def0510 100644 --- a/components/spi_flash/test/test_esp_flash.c +++ b/components/spi_flash/test/test_esp_flash.c @@ -32,11 +32,11 @@ #include "esp32c3/rom/cache.h" #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rom/cache.h" -#elif CONFIG_IDF_TARGET_ESP8684 -#include "esp8684/rom/cache.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/cache.h" #endif -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2) // TODO: SPI_FLASH IDF-4025 #define FUNC_SPI 1 @@ -1233,4 +1233,4 @@ FLASH_TEST_CASE("esp_flash_read large PSRAM buffer low memory", test_flash_read_ #endif -#endif //#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) +#endif //#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2) diff --git a/components/spi_flash/test/test_read_write.c b/components/spi_flash/test/test_read_write.c index 12bd471af6d..e0028c0cd12 100644 --- a/components/spi_flash/test/test_read_write.c +++ b/components/spi_flash/test/test_read_write.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2010-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -24,7 +24,7 @@ #include "esp32/rom/spi_flash.h" #endif -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2) // TODO: SPI_FLASH IDF-4025 #define MIN_BLOCK_SIZE 12 @@ -383,4 +383,4 @@ TEST_CASE("spi_flash_read less than 16 bytes into buffer in external RAM", "[spi #endif // CONFIG_SPIRAM -#endif // #if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) +#endif // #if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2) diff --git a/components/spi_flash/test/test_spi_flash.c b/components/spi_flash/test/test_spi_flash.c index a6b56b41c33..a3aab60bb2c 100644 --- a/components/spi_flash/test/test_spi_flash.c +++ b/components/spi_flash/test/test_spi_flash.c @@ -20,7 +20,7 @@ #include "sdkconfig.h" -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2) // TODO: SPI_FLASH IDF-4025 struct flash_test_ctx { uint32_t offset; @@ -354,4 +354,4 @@ TEST_CASE("bootloader_flash_xmc_startup can be called when cache disabled", "[sp test_xmc_startup(); } -#endif //#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) +#endif //#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2) diff --git a/components/xtensa/CMakeLists.txt b/components/xtensa/CMakeLists.txt index 497fd4ff583..e167b7c4d75 100644 --- a/components/xtensa/CMakeLists.txt +++ b/components/xtensa/CMakeLists.txt @@ -1,7 +1,7 @@ idf_build_get_property(target IDF_TARGET) # should test arch here not target: IDF-1754 -if("${target}" STREQUAL "esp32c3" OR "${target}" STREQUAL "esp32h2" OR "${target}" STREQUAL "esp8684") +if("${target}" STREQUAL "esp32c3" OR "${target}" STREQUAL "esp32h2" OR "${target}" STREQUAL "esp32c2") return() endif() diff --git a/docs/docs_not_updated/esp8684.txt b/docs/docs_not_updated/esp32c2.txt similarity index 100% rename from docs/docs_not_updated/esp8684.txt rename to docs/docs_not_updated/esp32c2.txt diff --git a/docs/doxygen/Doxyfile_esp8684 b/docs/doxygen/Doxyfile_esp32c2 similarity index 100% rename from docs/doxygen/Doxyfile_esp8684 rename to docs/doxygen/Doxyfile_esp32c2 diff --git a/docs/en/COPYRIGHT.rst b/docs/en/COPYRIGHT.rst index 8e58e27a036..e0388fcbae1 100644 --- a/docs/en/COPYRIGHT.rst +++ b/docs/en/COPYRIGHT.rst @@ -84,7 +84,7 @@ Documentation ROM Source Code Copyrights ========================== -ESP32, ESP8684, ESP32-S and ESP32-C Series SoCs mask ROM hardware includes binaries compiled from portions of the following third party software: +ESP32, ESP32-S and ESP32-C Series SoCs mask ROM hardware includes binaries compiled from portions of the following third party software: * :component:`Newlib `, licensed under the BSD License and is Copyright of various parties, as described in :component_file:`COPYING.NEWLIB`. diff --git a/docs/en/about.rst b/docs/en/about.rst index 7f0aa594031..33a0618a5ce 100644 --- a/docs/en/about.rst +++ b/docs/en/about.rst @@ -23,7 +23,7 @@ About The {IDF_TARGET_NAME} is a 2.4 GHz Wi-Fi Bluetooth Low Energy combo SoC, which integrates a Xtensa® 32-bit LX7 CPU. -.. only:: esp32c3 or esp8684 +.. only:: esp32c3 or esp32c2 This is documentation of `ESP-IDF `_, the framework to develop applications for {IDF_TARGET_NAME}. diff --git a/docs/en/api-guides/index.rst b/docs/en/api-guides/index.rst index 8d81a53e2fc..0ffe98c58af 100644 --- a/docs/en/api-guides/index.rst +++ b/docs/en/api-guides/index.rst @@ -31,7 +31,7 @@ API Guides OpenThread Partition Tables Performance - :not esp8684: RF Calibration + :not esp32c2: RF Calibration :esp32: Secure Boot <../security/secure-boot-v1> Secure Boot V2 <../security/secure-boot-v2> Thread Local Storage diff --git a/docs/en/api-guides/jtag-debugging/esp8684.inc b/docs/en/api-guides/jtag-debugging/esp32c2.inc similarity index 67% rename from docs/en/api-guides/jtag-debugging/esp8684.inc rename to docs/en/api-guides/jtag-debugging/esp32c2.inc index 299542fe695..2c4151ea409 100644 --- a/docs/en/api-guides/jtag-debugging/esp8684.inc +++ b/docs/en/api-guides/jtag-debugging/esp32c2.inc @@ -11,9 +11,9 @@ :: - openocd -f board/esp8684-BOARD_NAME.cfg + openocd -f board/esp32c2-BOARD_NAME.cfg -.. |run-openocd-device-name| replace:: ESP8684 +.. |run-openocd-device-name| replace:: ESP32C2 --- @@ -23,7 +23,7 @@ CHIP SPECIFIC LOG OUTPUT -.. |run-openocd-cfg-file-err| replace:: ``Can't find board/esp8684-BOARD_NAME.cfg`` +.. |run-openocd-cfg-file-err| replace:: ``Can't find board/esp32c2-BOARD_NAME.cfg`` --- @@ -31,7 +31,7 @@ :: - openocd -f board/esp8684-BOARD_NAME.cfg -c "program_esp filename.bin 0x10000 verify exit" + openocd -f board/esp32c2-BOARD_NAME.cfg -c "program_esp filename.bin 0x10000 verify exit" --- @@ -39,7 +39,7 @@ .. code-block:: bash - src/openocd -f board/esp8684-BOARD_NAME.cfg + src/openocd -f board/esp32c2-BOARD_NAME.cfg --- @@ -47,13 +47,13 @@ .. code-block:: batch - src\openocd -f board/esp8684-BOARD_NAME.cfg + src\openocd -f board/esp32c2-BOARD_NAME.cfg --- .. idf-py-openocd-default-cfg -.. |idf-py-def-cfg| replace:: ``-f board/esp8684-BOARD_NAME.cfg`` +.. |idf-py-def-cfg| replace:: ``-f board/esp32c2-BOARD_NAME.cfg`` --- @@ -61,13 +61,13 @@ :: - openocd -f board/esp8684-BOARD_NAME.cfg -c "init; halt; esp appimage_offset 0x210000" + openocd -f board/esp32c2-BOARD_NAME.cfg -c "init; halt; esp appimage_offset 0x210000" --- .. openocd-cfg-files -.. list-table:: OpenOCD configuration files for ESP8684 +.. list-table:: OpenOCD configuration files for ESP32C2 :widths: 25 75 :header-rows: 1 @@ -86,11 +86,11 @@ .. jtag-pins -.. list-table:: ESP8684 pins and JTAG signals +.. list-table:: ESP32C2 pins and JTAG signals :widths: 25 75 :header-rows: 1 - * - ESP8684 Pin + * - ESP32C2 Pin - JTAG Signal * - MTDO / GPIOX - TDO @@ -110,7 +110,7 @@ :: - openocd -l openocd_log.txt -d3 -f board/esp8684-BOARD_NAME.cfg + openocd -l openocd_log.txt -d3 -f board/esp32c2-BOARD_NAME.cfg --- @@ -118,7 +118,7 @@ :: - openocd -d3 -f board/esp8684-BOARD_NAME.cfg 2>&1 | tee openocd.log + openocd -d3 -f board/esp32c2-BOARD_NAME.cfg 2>&1 | tee openocd.log --- @@ -132,7 +132,7 @@ .. devkit-defs -.. |devkit-name| replace:: ESP8684 +.. |devkit-name| replace:: ESP32C2 .. |devkit-name-with-link| replace:: LINK TO DEVKIT --- diff --git a/docs/en/api-guides/memory-types.rst b/docs/en/api-guides/memory-types.rst index 24f229574e1..8499fcd08c7 100644 --- a/docs/en/api-guides/memory-types.rst +++ b/docs/en/api-guides/memory-types.rst @@ -134,7 +134,7 @@ The same region of RTC FAST memory can be accessed as both instruction and data In single core mode, remaining RTC FAST memory is added to the heap unless the option :ref:`CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP` is disabled. This memory can be used interchangeably with :ref:`DRAM`, but is slightly slower to access and not DMA capable. -.. only:: not esp32 and not esp8684 +.. only:: not esp32 and not esp32c2 Remaining RTC FAST memory is added to the heap unless the option :ref:`CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP` is disabled. This memory can be used interchangeably with :ref:`DRAM`, but is slightly slower to access. diff --git a/docs/en/api-guides/partition-tables.rst b/docs/en/api-guides/partition-tables.rst index c6dbca1c9c9..ca817c99295 100644 --- a/docs/en/api-guides/partition-tables.rst +++ b/docs/en/api-guides/partition-tables.rst @@ -88,7 +88,7 @@ The ESP-IDF bootloader ignores any partition types other than ``app`` (0x00) and SubType ~~~~~~~ -{IDF_TARGET_ESP_PHY_REF:default = ":ref:`CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION`", esp8684 = "(not updated yet)"} +{IDF_TARGET_ESP_PHY_REF:default = ":ref:`CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION`", esp32c2 = "(not updated yet)"} The 8-bit subtype field is specific to a given partition type. ESP-IDF currently only specifies the meaning of the subtype field for ``app`` and ``data`` partition types. diff --git a/docs/en/api-guides/unit-tests.rst b/docs/en/api-guides/unit-tests.rst index 6288d245533..33ed7c54e36 100644 --- a/docs/en/api-guides/unit-tests.rst +++ b/docs/en/api-guides/unit-tests.rst @@ -300,7 +300,7 @@ Refer to :component_file:`cmock/CMock/docs/CMock_Summary.md` for more details on Requirements ^^^^^^^^^^^^ -The following requirements are necessary to generate the mocks: +The following requirements are necessary to generate the mocks: .. list:: - Installed ESP-IDF with all its requirements @@ -316,7 +316,7 @@ In the component mock, the following parts are specified: .. list:: - The headers providing the functions to generate mocks for - - Include paths of the aforementioned headers + - Include paths of the aforementioned headers - Dependencies of the mock component (this is necessary e.g. if the headers include files from other components) All these parts have to be specified using the IDF build system function ``idf_component_mock``. You can use the IDF build system function ``idf_component_get_property`` with the tag ``COMPONENT_OVERRIDEN_DIR`` to access the component directory of the original component and then register the mock component parts using ``idf_component_mock``: diff --git a/docs/en/api-reference/peripherals/spi_master.rst b/docs/en/api-reference/peripherals/spi_master.rst index 411510464fa..1dbf658eb20 100644 --- a/docs/en/api-reference/peripherals/spi_master.rst +++ b/docs/en/api-reference/peripherals/spi_master.rst @@ -7,7 +7,7 @@ SPI Master driver is a program that controls {IDF_TARGET_NAME}'s SPI peripherals Overview of {IDF_TARGET_NAME}'s SPI peripherals ----------------------------------------------- -{IDF_TARGET_MAX_PERIPH_NUM:default="4", esp32c3="3", esp8684="3"} +{IDF_TARGET_MAX_PERIPH_NUM:default="4", esp32c3="3", esp32c2="3"} {IDF_TARGET_SPI2_CS_NUM:default="6", esp32="3"} {IDF_TARGET_SPI3_CS_NUM:default="3"} @@ -32,7 +32,7 @@ Overview of {IDF_TARGET_NAME}'s SPI peripherals - SPI2 and SPI3 are general purpose SPI controllers. They are open to users. SPI2 and SPI3 have independent signal buses with the same respective names. SPI2 has {IDF_TARGET_SPI2_CS_NUM} CS lines. SPI3 has {IDF_TARGET_SPI3_CS_NUM} CS lines. Each CS line can be used to drive one SPI slave. -.. only:: esp32c3 or esp8684 +.. only:: esp32c3 or esp32c2 - SPI2 is a general purpose SPI controller. It has an independent signal bus with the same name. The bus has {IDF_TARGET_SPI2_CS_NUM} CS lines to drive up to {IDF_TARGET_SPI2_CS_NUM} SPI slaves. @@ -230,7 +230,7 @@ If using more than one data lines to transmit, please set `SPI_DEVICE_HALFDUPLEX Half-duplex transactions with both read and write phases are not supported when using DMA. For details and workarounds, see :ref:`spi_known_issues`. -.. only:: esp32s3 or esp32c3 or esp8684 +.. only:: esp32s3 or esp32c3 or esp32c2 .. note:: @@ -439,10 +439,10 @@ The main parameter that determines the transfer speed for large transactions is Transaction Duration ^^^^^^^^^^^^^^^^^^^^ -{IDF_TARGET_TRANS_TIME_INTR_DMA:default="28", esp32="28", esp32s2="23", esp32c3="28", esp32s3="26", esp8684="42"} -{IDF_TARGET_TRANS_TIME_POLL_DMA:default="10", esp32="10", esp32s2="9", esp32c3="10", esp32s3="11", esp8684="17"} -{IDF_TARGET_TRANS_TIME_INTR_CPU:default="25", esp32="25", esp32s2="22", esp32c3="27", esp32s3="24", esp8684="40"} -{IDF_TARGET_TRANS_TIME_POLL_CPU:default="8", esp32="8", esp32s2="8", esp32c3="9", esp32s3="9", esp8684="15"} +{IDF_TARGET_TRANS_TIME_INTR_DMA:default="28", esp32="28", esp32s2="23", esp32c3="28", esp32s3="26", esp32c2="42"} +{IDF_TARGET_TRANS_TIME_POLL_DMA:default="10", esp32="10", esp32s2="9", esp32c3="10", esp32s3="11", esp32c2="17"} +{IDF_TARGET_TRANS_TIME_INTR_CPU:default="25", esp32="25", esp32s2="22", esp32c3="27", esp32s3="24", esp32c2="40"} +{IDF_TARGET_TRANS_TIME_POLL_CPU:default="8", esp32="8", esp32s2="8", esp32c3="9", esp32s3="9", esp32c2="15"} Transaction duration includes setting up SPI peripheral registers, copying data to FIFOs or setting up DMA links, and the time for SPI transaction. diff --git a/docs/en/api-reference/peripherals/spi_slave.rst b/docs/en/api-reference/peripherals/spi_slave.rst index 4cce72ac36d..61278c183e0 100644 --- a/docs/en/api-reference/peripherals/spi_slave.rst +++ b/docs/en/api-reference/peripherals/spi_slave.rst @@ -18,7 +18,7 @@ Overview of {IDF_TARGET_NAME}'s SPI peripherals SPI2 and SPI3 have independent signal buses with the same respective names. -.. only:: esp32c3 or esp8684 +.. only:: esp32c3 or esp32c2 {IDF_TARGET_NAME} integrates one general purpose SPI controller which can be used as slave node driven by an off-chip SPI master. The controller is called SPI2 and has an independent signal bus with the same name. diff --git a/docs/en/api-reference/system/inc/espefuse_summary_ESP8684.rst b/docs/en/api-reference/system/inc/espefuse_summary_ESP32-C2.rst similarity index 100% rename from docs/en/api-reference/system/inc/espefuse_summary_ESP8684.rst rename to docs/en/api-reference/system/inc/espefuse_summary_ESP32-C2.rst diff --git a/docs/en/hw-reference/index.rst b/docs/en/hw-reference/index.rst index af3be650017..c6b4922bcb6 100644 --- a/docs/en/hw-reference/index.rst +++ b/docs/en/hw-reference/index.rst @@ -6,7 +6,7 @@ .. toctree:: :maxdepth: 3 - :not esp8684: Technical Reference Manual (PDF) <{IDF_TARGET_TRM_EN_URL}> + :not esp32c2: Technical Reference Manual (PDF) <{IDF_TARGET_TRM_EN_URL}> :esp32: ESP32 Datasheet (PDF) :esp32s2: ESP32-S2 Datasheet (PDF) :esp32c3: ESP32-C3 Datasheet (PDF) diff --git a/docs/en/index.rst b/docs/en/index.rst index 7b06f96f075..a031268550b 100644 --- a/docs/en/index.rst +++ b/docs/en/index.rst @@ -8,7 +8,7 @@ ESP-IDF Programming Guide The function API documentation is excluded from the preview. Add docs_full label to the MR to generate the complete documentation. -This is the documentation for Espressif IoT Development Framework (`esp-idf `_). ESP-IDF is the official development framework for the `ESP32, ESP8684, ESP32-S and ESP32-C Series SoCs `_. +This is the documentation for Espressif IoT Development Framework (`esp-idf `_). ESP-IDF is the official development framework for the `ESP32, ESP32-S and ESP32-C Series SoCs `_. .. only:: html diff --git a/docs/zh_CN/security/esp8684_log.inc b/docs/en/security/esp32c2_log.inc similarity index 52% rename from docs/zh_CN/security/esp8684_log.inc rename to docs/en/security/esp32c2_log.inc index 4d6e47427f3..e6758466cfe 100644 --- a/docs/zh_CN/security/esp8684_log.inc +++ b/docs/en/security/esp32c2_log.inc @@ -3,7 +3,7 @@ .. code-block:: none - Update with ESP8684 specific info IDF-4208 + Update with ESP32C2 specific info IDF-4208 ------ @@ -12,7 +12,7 @@ .. code-block:: none - Update with ESP8684 specific info IDF-4208 + Update with ESP32C2 specific info IDF-4208 ------ diff --git a/docs/zh_CN/api-guides/index.rst b/docs/zh_CN/api-guides/index.rst index a5e28665aea..7dcf08f9bc2 100644 --- a/docs/zh_CN/api-guides/index.rst +++ b/docs/zh_CN/api-guides/index.rst @@ -31,7 +31,7 @@ API 指南 Memory Types 分区表 Performance - :not esp8684: 射频校准 + :not esp32c2: 射频校准 :esp32: 安全启动 <../security/secure-boot-v1> 安全启动 V2 <../security/secure-boot-v2> 线程本地存储 diff --git a/docs/zh_CN/api-guides/jtag-debugging/esp8684.inc b/docs/zh_CN/api-guides/jtag-debugging/esp32c2.inc similarity index 67% rename from docs/zh_CN/api-guides/jtag-debugging/esp8684.inc rename to docs/zh_CN/api-guides/jtag-debugging/esp32c2.inc index 299542fe695..2c4151ea409 100644 --- a/docs/zh_CN/api-guides/jtag-debugging/esp8684.inc +++ b/docs/zh_CN/api-guides/jtag-debugging/esp32c2.inc @@ -11,9 +11,9 @@ :: - openocd -f board/esp8684-BOARD_NAME.cfg + openocd -f board/esp32c2-BOARD_NAME.cfg -.. |run-openocd-device-name| replace:: ESP8684 +.. |run-openocd-device-name| replace:: ESP32C2 --- @@ -23,7 +23,7 @@ CHIP SPECIFIC LOG OUTPUT -.. |run-openocd-cfg-file-err| replace:: ``Can't find board/esp8684-BOARD_NAME.cfg`` +.. |run-openocd-cfg-file-err| replace:: ``Can't find board/esp32c2-BOARD_NAME.cfg`` --- @@ -31,7 +31,7 @@ :: - openocd -f board/esp8684-BOARD_NAME.cfg -c "program_esp filename.bin 0x10000 verify exit" + openocd -f board/esp32c2-BOARD_NAME.cfg -c "program_esp filename.bin 0x10000 verify exit" --- @@ -39,7 +39,7 @@ .. code-block:: bash - src/openocd -f board/esp8684-BOARD_NAME.cfg + src/openocd -f board/esp32c2-BOARD_NAME.cfg --- @@ -47,13 +47,13 @@ .. code-block:: batch - src\openocd -f board/esp8684-BOARD_NAME.cfg + src\openocd -f board/esp32c2-BOARD_NAME.cfg --- .. idf-py-openocd-default-cfg -.. |idf-py-def-cfg| replace:: ``-f board/esp8684-BOARD_NAME.cfg`` +.. |idf-py-def-cfg| replace:: ``-f board/esp32c2-BOARD_NAME.cfg`` --- @@ -61,13 +61,13 @@ :: - openocd -f board/esp8684-BOARD_NAME.cfg -c "init; halt; esp appimage_offset 0x210000" + openocd -f board/esp32c2-BOARD_NAME.cfg -c "init; halt; esp appimage_offset 0x210000" --- .. openocd-cfg-files -.. list-table:: OpenOCD configuration files for ESP8684 +.. list-table:: OpenOCD configuration files for ESP32C2 :widths: 25 75 :header-rows: 1 @@ -86,11 +86,11 @@ .. jtag-pins -.. list-table:: ESP8684 pins and JTAG signals +.. list-table:: ESP32C2 pins and JTAG signals :widths: 25 75 :header-rows: 1 - * - ESP8684 Pin + * - ESP32C2 Pin - JTAG Signal * - MTDO / GPIOX - TDO @@ -110,7 +110,7 @@ :: - openocd -l openocd_log.txt -d3 -f board/esp8684-BOARD_NAME.cfg + openocd -l openocd_log.txt -d3 -f board/esp32c2-BOARD_NAME.cfg --- @@ -118,7 +118,7 @@ :: - openocd -d3 -f board/esp8684-BOARD_NAME.cfg 2>&1 | tee openocd.log + openocd -d3 -f board/esp32c2-BOARD_NAME.cfg 2>&1 | tee openocd.log --- @@ -132,7 +132,7 @@ .. devkit-defs -.. |devkit-name| replace:: ESP8684 +.. |devkit-name| replace:: ESP32C2 .. |devkit-name-with-link| replace:: LINK TO DEVKIT --- diff --git a/docs/zh_CN/api-guides/memory-types.rst b/docs/zh_CN/api-guides/memory-types.rst index c51537b544e..5ff1f2c06db 100644 --- a/docs/zh_CN/api-guides/memory-types.rst +++ b/docs/zh_CN/api-guides/memory-types.rst @@ -134,7 +134,7 @@ RTC FAST memory 的同一区域既可以作为指令存储器也可以作为数 在单核模式下，除非禁用 :ref:`CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP` 选项，否则剩余的 RTC FAST memory 会被添加到堆中。该部分内存可以和 :ref:`DRAM` 互换使用，但是访问速度稍慢，且不具备 DMA 功能。 -.. only:: not esp32 and not esp8684 +.. only:: not esp32 and not esp32c2 除非禁用 :ref:`CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP` 选项，否则剩余的 RTC FAST memory 会被添加到堆中。该部分内存可以和 :ref:`DRAM` 互换使用，但是访问速度稍慢一点。 diff --git a/docs/zh_CN/api-guides/partition-tables.rst b/docs/zh_CN/api-guides/partition-tables.rst index 4a2e6f48f0f..0f4a998a752 100644 --- a/docs/zh_CN/api-guides/partition-tables.rst +++ b/docs/zh_CN/api-guides/partition-tables.rst @@ -88,7 +88,7 @@ Type 字段可以指定为 app (0x00) 或者 data (0x01)，也可以直接使用 SubType 字段 ~~~~~~~~~~~~ -{IDF_TARGET_ESP_PHY_REF:default = ":ref:`CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION`", esp8684 = "(not updated yet)"} +{IDF_TARGET_ESP_PHY_REF:default = ":ref:`CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION`", esp32c2 = "(not updated yet)"} SubType 字段长度为 8 bit，内容与具体分区 Type 有关。目前，esp-idf 仅仅规定了 “app” 和 “data” 两种分区类型的子类型含义。 diff --git a/docs/zh_CN/api-reference/system/inc/espefuse_summary_ESP8684.rst b/docs/zh_CN/api-reference/system/inc/espefuse_summary_ESP32-C2.rst similarity index 100% rename from docs/zh_CN/api-reference/system/inc/espefuse_summary_ESP8684.rst rename to docs/zh_CN/api-reference/system/inc/espefuse_summary_ESP32-C2.rst diff --git a/docs/zh_CN/hw-reference/index.rst b/docs/zh_CN/hw-reference/index.rst index c9587c6ffb2..1e29168d3c1 100644 --- a/docs/zh_CN/hw-reference/index.rst +++ b/docs/zh_CN/hw-reference/index.rst @@ -6,7 +6,7 @@ .. toctree:: :maxdepth: 3 - :not esp8684: {IDF_TARGET_NAME} 技术参考手册 (PDF) <{IDF_TARGET_TRM_CN_URL}> + :not esp32c2: {IDF_TARGET_NAME} 技术参考手册 (PDF) <{IDF_TARGET_TRM_CN_URL}> :esp32: ESP32 技术规格书 (PDF) :esp32s2: ESP32-S2 技术规格书 (PDF) :esp32c3: ESP32-C3 技术规格书 (PDF) diff --git a/docs/en/security/esp8684_log.inc b/docs/zh_CN/security/esp32c2_log.inc similarity index 52% rename from docs/en/security/esp8684_log.inc rename to docs/zh_CN/security/esp32c2_log.inc index 4d6e47427f3..e6758466cfe 100644 --- a/docs/en/security/esp8684_log.inc +++ b/docs/zh_CN/security/esp32c2_log.inc @@ -3,7 +3,7 @@ .. code-block:: none - Update with ESP8684 specific info IDF-4208 + Update with ESP32C2 specific info IDF-4208 ------ @@ -12,7 +12,7 @@ .. code-block:: none - Update with ESP8684 specific info IDF-4208 + Update with ESP32C2 specific info IDF-4208 ------ diff --git a/examples/build_system/cmake/idf_as_lib/CMakeLists.txt b/examples/build_system/cmake/idf_as_lib/CMakeLists.txt index 13c8fccab16..01e8333351c 100644 --- a/examples/build_system/cmake/idf_as_lib/CMakeLists.txt +++ b/examples/build_system/cmake/idf_as_lib/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5) project(idf_as_lib C) -set(targets "esp32" "esp32s2" "esp32s3" "esp32c3" "esp32h2" "esp8684") +set(targets "esp32" "esp32s2" "esp32s3" "esp32c3" "esp32h2" "esp32c2") if("${TARGET}" IN_LIST targets) # Include for ESP-IDF build system functions diff --git a/examples/build_system/cmake/idf_as_lib/build-esp8684.sh b/examples/build_system/cmake/idf_as_lib/build-esp32c2.sh similarity index 100% rename from examples/build_system/cmake/idf_as_lib/build-esp8684.sh rename to examples/build_system/cmake/idf_as_lib/build-esp32c2.sh diff --git a/examples/build_system/cmake/idf_as_lib/run-esp328684.sh b/examples/build_system/cmake/idf_as_lib/run-esp32c2.sh similarity index 100% rename from examples/build_system/cmake/idf_as_lib/run-esp328684.sh rename to examples/build_system/cmake/idf_as_lib/run-esp32c2.sh diff --git a/examples/build_system/cmake/idf_as_lib/run-esp8684.sh b/examples/build_system/cmake/idf_as_lib/run-esp8684.sh deleted file mode 120000 index cde8585ed41..00000000000 --- a/examples/build_system/cmake/idf_as_lib/run-esp8684.sh +++ /dev/null @@ -1 +0,0 @@ -run-esp32.sh \ No newline at end of file diff --git a/examples/cxx/experimental/experimental_cpp_component/gpio_cxx.cpp b/examples/cxx/experimental/experimental_cpp_component/gpio_cxx.cpp index 73b895d04d2..83f485be414 100644 --- a/examples/cxx/experimental/experimental_cpp_component/gpio_cxx.cpp +++ b/examples/cxx/experimental/experimental_cpp_component/gpio_cxx.cpp @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -25,7 +25,7 @@ constexpr std::array INVALID_GPIOS = {22, 23, 24, 25}; constexpr std::array INVALID_GPIOS = {22, 23, 24, 25}; #elif CONFIG_IDF_TARGET_ESP32C3 constexpr std::array INVALID_GPIOS = {}; -#elif CONFIG_IDF_TARGET_ESP8684 +#elif CONFIG_IDF_TARGET_ESP32C2 constexpr std::array INVALID_GPIOS = {}; #else #error "No GPIOs defined for the current target" diff --git a/examples/cxx/experimental/experimental_cpp_component/test/test_cxx_exceptions.cpp b/examples/cxx/experimental/experimental_cpp_component/test/test_cxx_exceptions.cpp index 18e1d54a05c..b9b62162f98 100644 --- a/examples/cxx/experimental/experimental_cpp_component/test/test_cxx_exceptions.cpp +++ b/examples/cxx/experimental/experimental_cpp_component/test/test_cxx_exceptions.cpp @@ -14,7 +14,7 @@ using namespace idf; #if CONFIG_IDF_TARGET_ESP32 #define LEAKS "300" -#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP8684 +#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2 #define LEAKS "800" #else #error "unknown target in CXX tests, can't set leaks threshold" diff --git a/examples/cxx/experimental/experimental_cpp_component/test/test_i2c.cpp b/examples/cxx/experimental/experimental_cpp_component/test/test_i2c.cpp index 59a99d6efde..da834d70c54 100644 --- a/examples/cxx/experimental/experimental_cpp_component/test/test_i2c.cpp +++ b/examples/cxx/experimental/experimental_cpp_component/test/test_i2c.cpp @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -32,7 +32,7 @@ static constexpr I2CNumber I2C_SLAVE_NUM(I2CNumber::I2C0()); /*!