diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS index fb03c3b3a4..0d3be4d605 100644 --- a/.gitlab/CODEOWNERS +++ b/.gitlab/CODEOWNERS @@ -73,6 +73,7 @@ /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 93dade58ef..d19dfda6b8 100644 --- a/.gitlab/ci/build.yml +++ b/.gitlab/ci/build.yml @@ -193,6 +193,13 @@ build_esp_idf_tests_cmake_esp32c3: variables: IDF_TARGET: esp32c3 +build_esp_idf_tests_cmake_esp8684: + extends: + - .build_esp_idf_tests_cmake_template + - .rules:build:unit_test-esp8684 + variables: + IDF_TARGET: esp8684 + .build_examples_template: extends: .build_template dependencies: # set dependencies to null to avoid missing artifacts issue @@ -308,6 +315,14 @@ build_test_apps_esp32c3: variables: IDF_TARGET: esp32c3 +build_test_apps_esp8684: + extends: + - .build_test_apps_template + - .rules:build:custom_test-esp8684 + parallel: 8 + variables: + IDF_TARGET: esp8684 + .build_component_ut_template: extends: .build_test_apps_template variables: @@ -342,6 +357,13 @@ build_component_ut_esp32c3: variables: IDF_TARGET: esp32c3 +build_component_ut_esp8684: + extends: + - .build_component_ut_template + - .rules:build:component_ut-esp8684 + variables: + IDF_TARGET: esp8684 + .test_build_system_template: stage: host_test extends: diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml index db3ca17794..6be0939deb 100644 --- a/.gitlab/ci/dependencies/dependencies.yml +++ b/.gitlab/ci/dependencies/dependencies.yml @@ -3,6 +3,7 @@ - esp32s2 - esp32s3 - esp32c3 + - esp8684 .target_test: &target_test - example_test diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index b4952f3e49..d1e3274ada 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -285,6 +285,9 @@ .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' @@ -300,6 +303,9 @@ .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' @@ -318,6 +324,9 @@ .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' @@ -357,6 +366,9 @@ .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' @@ -442,6 +454,23 @@ - <<: *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 @@ -503,6 +532,21 @@ - <<: *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 @@ -582,6 +626,23 @@ - <<: *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 @@ -618,16 +679,19 @@ - <<: *if-label-component_ut_esp32c3 - <<: *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_esp32c3 - <<: *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_esp32c3 - <<: *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 @@ -635,6 +699,7 @@ - <<: *if-label-unit_test_esp32c3 - <<: *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 @@ -713,6 +778,21 @@ - <<: *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 @@ -762,16 +842,19 @@ - <<: *if-label-component_ut_esp32c3 - <<: *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_esp32c3 - <<: *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_esp32c3 - <<: *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 @@ -780,6 +863,7 @@ - <<: *if-label-unit_test_esp32c3 - <<: *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 @@ -852,6 +936,20 @@ - <<: *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 @@ -900,6 +998,18 @@ - <<: *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 @@ -956,6 +1066,20 @@ - <<: *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 @@ -1001,22 +1125,26 @@ - <<: *if-label-component_ut_esp32c3 - <<: *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_esp32c3 - <<: *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_esp32c3 - <<: *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_esp32c3 - <<: *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 @@ -1077,3 +1205,15 @@ - <<: *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/components/bootloader/subproject/main/ld/esp8684/bootloader.ld b/components/bootloader/subproject/main/ld/esp8684/bootloader.ld index 88b7d8d548..145b64bfa4 100644 --- a/components/bootloader/subproject/main/ld/esp8684/bootloader.ld +++ b/components/bootloader/subproject/main/ld/esp8684/bootloader.ld @@ -41,6 +41,7 @@ SECTIONS *libbootloader_support.a:bootloader_sha.*(.literal .text .literal.* .text.*) *libbootloader_support.a:bootloader_console_loader.*(.literal .text .literal.* .text.*) *libbootloader_support.a:bootloader_panic.*(.literal .text .literal.* .text.*) + *libbootloader_support.a:bootloader_soc.*(.literal .text .literal.* .text.*) *libbootloader_support.a:esp_image_format.*(.literal .text .literal.* .text.*) *libbootloader_support.a:flash_encrypt.*(.literal .text .literal.* .text.*) *libbootloader_support.a:flash_encryption_secure_features.*(.literal .text .literal.* .text.*) diff --git a/components/driver/CMakeLists.txt b/components/driver/CMakeLists.txt index 0629f99c5c..c608893847 100644 --- a/components/driver/CMakeLists.txt +++ b/components/driver/CMakeLists.txt @@ -104,7 +104,8 @@ if(IDF_TARGET STREQUAL "esp32h2") endif() if(IDF_TARGET STREQUAL "esp8684") - list(APPEND srcs "spi_slave_hd.c") + list(APPEND srcs "gdma.c" + "spi_slave_hd.c") endif() idf_component_register(SRCS "${srcs}" diff --git a/components/driver/test/test_adc.c b/components/driver/test/test_adc.c index 9141590594..ac735fde99 100644 --- a/components/driver/test/test_adc.c +++ b/components/driver/test/test_adc.c @@ -9,6 +9,8 @@ #include #include "esp_log.h" #include "test_utils.h" +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) +// TODO: Support ADC IDF-3908 #include "esp_adc_cal.h" #include "driver/adc_common.h" @@ -396,3 +398,5 @@ TEST_CASE("test_adc_single_cali_time", "[adc][ignore][manual]") } } } + +#endif //#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) diff --git a/components/driver/test/test_adc2_with_wifi.c b/components/driver/test/test_adc2_with_wifi.c index 3c1b584ab1..6c72609274 100644 --- a/components/driver/test/test_adc2_with_wifi.c +++ b/components/driver/test/test_adc2_with_wifi.c @@ -15,14 +15,12 @@ #include "esp_log.h" #include "nvs_flash.h" #include "test_utils.h" -#include "driver/i2s.h" #include "driver/gpio.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "driver/gpio.h" - -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C3, ESP32S3) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C3, ESP32S3, ESP8684) static const char* TAG = "test_adc2"; @@ -216,6 +214,8 @@ TEST_CASE("adc2 work with wifi","[adc]") #ifdef CONFIG_IDF_TARGET_ESP32 +#include "driver/i2s.h" + #define ADC1_CHANNEL_4_IO (32) #define SAMPLE_RATE (36000) #define SAMPLE_BITS (16) diff --git a/components/driver/test/test_adc_common.c b/components/driver/test/test_adc_common.c index 1b78c453af..3c0d367a94 100644 --- a/components/driver/test/test_adc_common.c +++ b/components/driver/test/test_adc_common.c @@ -19,7 +19,7 @@ #include "test_utils.h" #include "soc/adc_periph.h" -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3,ESP32C3) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3,ESP32C3, ESP8684) #include "driver/dac.h" static const char *TAG = "test_adc"; diff --git a/components/driver/test/test_common_spi.c b/components/driver/test/test_common_spi.c index 773a2d7c03..78b838eec8 100644 --- a/components/driver/test/test_common_spi.c +++ b/components/driver/test/test_common_spi.c @@ -9,6 +9,9 @@ #include "driver/gpio.h" #include "hal/gpio_hal.h" +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) +// TODO: SPI support IDF-4024 + int test_freq_default[]=TEST_FREQ_DEFAULT(); const char MASTER_TAG[] = "test_master"; @@ -247,3 +250,5 @@ void get_tx_buffer(uint32_t seed, uint8_t *master_send_buf, uint8_t *slave_send_ master_send_buf[i] = rand(); } } + +#endif // #if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) diff --git a/components/driver/test/test_dac.c b/components/driver/test/test_dac.c index 377573516c..7a71f828c7 100644 --- a/components/driver/test/test_dac.c +++ b/components/driver/test/test_dac.c @@ -16,10 +16,10 @@ #include "esp_log.h" #include "nvs_flash.h" #include "test_utils.h" -#include "driver/i2s.h" #include "soc/soc_caps.h" #if SOC_DAC_SUPPORTED +#include "driver/i2s.h" #include "driver/dac.h" #include "esp_adc_cal.h" diff --git a/components/driver/test/test_gpio.c b/components/driver/test/test_gpio.c index fa0827aff7..f7ae464272 100644 --- a/components/driver/test/test_gpio.c +++ b/components/driver/test/test_gpio.c @@ -63,6 +63,13 @@ #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 +#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 +#define TEST_GPIO_OUTPUT_MAX GPIO_NUM_21 +#define TEST_GPIO_INPUT_LEVEL_HIGH_PIN 10 +#define TEST_GPIO_INPUT_LEVEL_LOW_PIN 1 #endif // If there is any input-only pin, enable input-only pin part of some tests. @@ -105,7 +112,7 @@ __attribute__((unused)) static void gpio_isr_edge_handler(void *arg) edge_intr_times++; } -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP32C3) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP32C3, ESP8684) //No runners // level interrupt event with "gpio_intr_disable" static void gpio_isr_level_handler(void *arg) @@ -215,7 +222,7 @@ TEST_CASE("GPIO config parameters test", "[gpio]") #endif // SOC_HAS_INPUT_ONLY_PIN } -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP32C3) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP32C3, ESP8684) //No runners TEST_CASE("GPIO rising edge interrupt test", "[gpio][test_env=UT_T1_GPIO]") { @@ -519,7 +526,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) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP32C3, ESP8684) //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 8c3cbe046b..336214b2fb 100644 --- a/components/driver/test/test_i2c.c +++ b/components/driver/test/test_i2c.c @@ -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) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP8684) // 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) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3, ESP32C3, ESP8684) //Init uart baud rate detection static void uart_aut_baud_det_init(int rxd_io_num) { diff --git a/components/driver/test/test_i2s.c b/components/driver/test/test_i2s.c index bbae397e1f..4e7717090b 100644 --- a/components/driver/test/test_i2s.c +++ b/components/driver/test/test_i2s.c @@ -1,7 +1,7 @@ /* * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD * - * SPDX-License-Identifier: CC0-1.0 + * SPDX-License-Identifier: Apache-2.0 */ /** @@ -11,17 +11,19 @@ * Please do not connect GPIO32(ESP32) any pull-up resistors externally, it will be used to test i2s adc function. */ + #include #include #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "freertos/queue.h" -#include "driver/i2s.h" #include "driver/gpio.h" #include "hal/gpio_hal.h" #include "unity.h" #include "math.h" #include "esp_rom_gpio.h" +#if SOC_I2S_SUPPORTED +#include "driver/i2s.h" #define SAMPLE_RATE (36000) #define SAMPLE_BITS (16) @@ -731,3 +733,5 @@ TEST_CASE("I2S dac test", "[i2s]") TEST_ESP_OK(i2s_driver_uninstall(I2S_NUM_0)); } #endif + +#endif //SOC_I2S_SUPPORTED diff --git a/components/driver/test/test_rmt.c b/components/driver/test/test_rmt.c index dbc85718db..5eba428e8d 100644 --- a/components/driver/test/test_rmt.c +++ b/components/driver/test/test_rmt.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ // RMT driver unit test is based on extended NEC protocol + #include #include #include "sdkconfig.h" @@ -12,12 +13,14 @@ #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "esp_log.h" -#include "driver/rmt.h" -#include "ir_tools.h" #include "unity.h" #include "test_utils.h" #include "esp_rom_gpio.h" +#if SOC_RMT_SUPPORTED +#include "ir_tools.h" +#include "driver/rmt.h" + #define RMT_RX_CHANNEL_ENCODING_START (SOC_RMT_CHANNELS_PER_GROUP-SOC_RMT_TX_CANDIDATES_PER_GROUP) #define RMT_TX_CHANNEL_ENCODING_END (SOC_RMT_TX_CANDIDATES_PER_GROUP-1) @@ -595,3 +598,5 @@ TEST_CASE("RMT TX loop", "[rmt]") rmt_clean_testbench(tx_channel, rx_channel); } #endif + +#endif // SOC_RMT_SUPPORTED diff --git a/components/driver/test/test_rtcio.c b/components/driver/test/test_rtcio.c index 5c547758f6..5f5cf97c45 100644 --- a/components/driver/test/test_rtcio.c +++ b/components/driver/test/test_rtcio.c @@ -21,7 +21,7 @@ #include "esp_log.h" #include "soc/rtc_io_periph.h" -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3, ESP32C3) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3, ESP32C3, ESP8684) #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 a5f4a7c9b5..01889ce132 100644 --- a/components/driver/test/test_sigmadelta.c +++ b/components/driver/test/test_sigmadelta.c @@ -8,8 +8,10 @@ #include "unity.h" #include "test_utils.h" #include "soc/soc_caps.h" +#if SOC_SIGMADELTA_SUPPORTED #include "driver/sigmadelta.h" + TEST_CASE("SigmaDelta config test", "[sigma_delta]") { sigmadelta_config_t sigmadelta_cfg = { @@ -64,3 +66,5 @@ TEST_CASE("SigmaDelta pin, duty, prescale set", "[sigma_delta][ignore]") TEST_ESP_OK(sigmadelta_set_pin(sigmadelta_cfg.channel, 5)); vTaskDelay(3000 / portTICK_PERIOD_MS); } + +#endif // #if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) diff --git a/components/driver/test/test_spi_bus_lock.c b/components/driver/test/test_spi_bus_lock.c index e4ac40adb0..03de30b102 100644 --- a/components/driver/test/test_spi_bus_lock.c +++ b/components/driver/test/test_spi_bus_lock.c @@ -12,7 +12,8 @@ #include "test/test_common_spi.h" #include "unity.h" -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3, ESP32C3) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3, ESP32C3, ESP8684) +// No runners currently. #if CONFIG_IDF_TARGET_ESP32 // The VSPI pins on UT_T1_ESP_FLASH are connected to a external flash diff --git a/components/driver/test/test_spi_master.c b/components/driver/test/test_spi_master.c index 5540ad5167..890e9f6aa5 100644 --- a/components/driver/test/test_spi_master.c +++ b/components/driver/test/test_spi_master.c @@ -30,10 +30,13 @@ #include "soc/soc_memory_layout.h" #include "driver/spi_common_internal.h" +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) +// TODO: SPI SUPPORT IDF-4024 + 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)) +#define TEST_SOC_HAS_INPUT_ONLY_PINS (!DISABLED_FOR_TARGETS(ESP32C3, ESP32S3, ESP8684)) static void check_spi_pre_n_for(int clk, int pre, int n) { @@ -1442,3 +1445,5 @@ TEST_CASE("spi_speed", "[spi]") master_free_device_bus(spi); } #endif // CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE + +#endif // #if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) diff --git a/components/driver/test/test_spi_param.c b/components/driver/test/test_spi_param.c index b1db3ad745..86bfb244d7 100644 --- a/components/driver/test/test_spi_param.c +++ b/components/driver/test/test_spi_param.c @@ -11,8 +11,8 @@ #include "driver/spi_master.h" #include "driver/spi_slave.h" -#if !DISABLED_FOR_TARGETS(ESP32C3) -//There is only one GPSPI controller on ESP32C3, so single-board test is disabled. +#if !DISABLED_FOR_TARGETS(ESP32C3, ESP8684) +//There is only one GPSPI controller on ESP32C3 and ESP8684, so single-board test is disabled. #ifndef MIN #define MIN(a, b)((a) > (b)? (b): (a)) @@ -1177,4 +1177,4 @@ TEST_SPI_MASTER_SLAVE(MODE, mode_conf, "") #endif // !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP32C3) -#endif // !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C3) +#endif // !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C3, ESP8684) diff --git a/components/driver/test/test_spi_sio.c b/components/driver/test/test_spi_sio.c index 8f3993b46c..28584426c9 100644 --- a/components/driver/test/test_spi_sio.c +++ b/components/driver/test/test_spi_sio.c @@ -29,7 +29,7 @@ #include "hal/spi_ll.h" -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3, ESP8684) #if !DISABLED_FOR_TARGETS(ESP32C3) //There is only one GPSPI controller, so single-board test is disabled. /******************************************************************************** @@ -110,7 +110,7 @@ TEST_CASE("local test sio", "[spi]") #endif //!DISABLED_FOR_TARGETS(ESP32C3) //There is only one GPSPI controller, so single-board test is disabled. -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32C3) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32C3, ESP8684) //These tests are ESP32 only due to lack of runners /******************************************************************************** * Test SIO Master & Slave diff --git a/components/driver/test/test_spi_slave.c b/components/driver/test/test_spi_slave.c index 240f2e7df0..9b645a86be 100644 --- a/components/driver/test/test_spi_slave.c +++ b/components/driver/test/test_spi_slave.c @@ -17,6 +17,9 @@ #include "esp_log.h" #include "esp_rom_gpio.h" +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) +// TODO: SPI SUPPORT IDF-4024 + //There is only one GPSPI controller, so single-board test is disabled. #if !DISABLED_FOR_TARGETS(ESP32C3) @@ -383,3 +386,5 @@ static void unaligned_test_slave(void) TEST_CASE_MULTIPLE_DEVICES("SPI_Slave_Unaligned_Test", "[spi_ms][test_env=Example_SPI_Multi_device][timeout=120]", unaligned_test_master, unaligned_test_slave); #endif //#if !DISABLED_FOR_TARGETS(ESP32, ESP32S2, ESP32S3) + +#endif //#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) diff --git a/components/driver/test/test_spi_slave_hd.c b/components/driver/test/test_spi_slave_hd.c index cb0738f8b9..b52e3bdb45 100644 --- a/components/driver/test/test_spi_slave_hd.c +++ b/components/driver/test/test_spi_slave_hd.c @@ -17,6 +17,9 @@ #include "driver/spi_master.h" #include "esp_serial_slave_link/essl_spi.h" +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) +// TODO: SPI SUPPORT IDF-4024 + #if !DISABLED_FOR_TARGETS(ESP32C3) //There is only one GPSPI controller on ESP32C3, so single-board test is disabled. @@ -750,3 +753,5 @@ TEST_CASE_MULTIPLE_DEVICES("SPI Slave HD: segment mode, master sends too long", #endif //#if SOC_SPI_SUPPORT_SLAVE_HD_VER2 #endif //#if !DISABLED_FOR_TARGETS(ESP32, ESP32S2, ESP32S3) + +#endif // #if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) diff --git a/components/driver/test/test_timer.c b/components/driver/test/test_timer.c index 48eb782c5b..f338cee4fb 100644 --- a/components/driver/test/test_timer.c +++ b/components/driver/test/test_timer.c @@ -15,6 +15,9 @@ #include "soc/soc_caps.h" #include "esp_rom_sys.h" +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) +// TODO: Timer support IDF-3825 + #define TIMER_DIVIDER 16 #define TIMER_SCALE (TIMER_BASE_CLK / TIMER_DIVIDER) /*!< used to calculate counter value */ #define TIMER_DELTA 0.001 @@ -1040,3 +1043,5 @@ TEST_CASE("Timer check reinitialization sequence", "[hw_timer]") // The pending timer interrupt should not be triggered TEST_ASSERT_EQUAL(0, timer_group_get_intr_status_in_isr(TIMER_GROUP_0) & TIMER_INTR_T0); } + +#endif // #if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) diff --git a/components/esp8684/Makefile.projbuild b/components/esp8684/Makefile.projbuild deleted file mode 100644 index 9c0b00af76..0000000000 --- a/components/esp8684/Makefile.projbuild +++ /dev/null @@ -1 +0,0 @@ -# ESP8684 is not supported in the GNU Make build system. diff --git a/components/esp8684/component.mk b/components/esp8684/component.mk deleted file mode 100644 index a2f7dc1797..0000000000 --- a/components/esp8684/component.mk +++ /dev/null @@ -1,4 +0,0 @@ -# -# Component Makefile -# -COMPONENT_CONFIG_ONLY := 1 diff --git a/components/esp_netif/test_apps/README.md b/components/esp_netif/test_apps/README.md new file mode 100644 index 0000000000..2e61c5bda6 --- /dev/null +++ b/components/esp_netif/test_apps/README.md @@ -0,0 +1,4 @@ +| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C3 | +| ----------------- | ----- | -------- | -------- | -------- | + +Not support on ESP8684 yet, waiting esp_wifi supported. TODO: IDF-3905 diff --git a/components/esp_netif/test_apps/main/esp_netif_test.c b/components/esp_netif/test_apps/main/esp_netif_test.c index 264435507b..12bef72e57 100644 --- a/components/esp_netif/test_apps/main/esp_netif_test.c +++ b/components/esp_netif/test_apps/main/esp_netif_test.c @@ -10,7 +10,6 @@ #include "lwip/sockets.h" #include "test_utils.h" - TEST_GROUP(esp_netif); TEST_SETUP(esp_netif) diff --git a/components/esp_rom/esp8684/ld/esp8684.rom.api.ld b/components/esp_rom/esp8684/ld/esp8684.rom.api.ld index b4ef7b8406..4351eb7c49 100644 --- a/components/esp_rom/esp8684/ld/esp8684.rom.api.ld +++ b/components/esp_rom/esp8684/ld/esp8684.rom.api.ld @@ -37,3 +37,5 @@ PROVIDE ( esp_rom_mbedtls_md5_finish_ret = 0x40002a3c ); PROVIDE ( esp_rom_printf = ets_printf ); PROVIDE ( esp_rom_delay_us = ets_delay_us ); PROVIDE ( esp_rom_get_reset_reason = rtc_get_reset_reason ); + +PROVIDE( esp_rom_spiflash_attach = spi_flash_attach ); diff --git a/components/esp_system/port/cpu_start.c b/components/esp_system/port/cpu_start.c index ad9b5fcc58..78af18c983 100644 --- a/components/esp_system/port/cpu_start.c +++ b/components/esp_system/port/cpu_start.c @@ -601,7 +601,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 esp_rom_spiflash_attach(esp_rom_efuse_get_flash_gpio_info(), false); +#else + // ESP8684 cannot get flash_gpio_info from efuse + esp_rom_spiflash_attach(0, false); +#endif // CONFIG_IDF_TARGET_ESP8684 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/fatfs/test/test_fatfs_sdmmc.c b/components/fatfs/test/test_fatfs_sdmmc.c index 18e544d966..70199b8366 100644 --- a/components/fatfs/test/test_fatfs_sdmmc.c +++ b/components/fatfs/test/test_fatfs_sdmmc.c @@ -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) +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3, ESP8684) //no runners static void sdspi_speed_test(void *buf, size_t buf_size, size_t file_size, bool write); diff --git a/components/freertos/test/test_isr_latency.c b/components/freertos/test/test_isr_latency.c index 907dcbcf01..28dad5fe4b 100644 --- a/components/freertos/test/test_isr_latency.c +++ b/components/freertos/test/test_isr_latency.c @@ -20,7 +20,7 @@ #define TEST_CLR_INT_MASK(mask) esprv_intc_int_disable(mask) #endif -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C3) +#ifndef __riscv // TODO: IDF-4416 #define SW_ISR_LEVEL_1 7 @@ -113,4 +113,4 @@ TEST_CASE("isr latency test vport-yield-from-isr with parameter", "[freertos][ig esp_intr_free(handle); } -#endif // #if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C3) +#endif // __riscv diff --git a/components/soc/esp32/include/soc/Kconfig.soc_caps.in b/components/soc/esp32/include/soc/Kconfig.soc_caps.in index 2be5c3c1a6..eb476676af 100644 --- a/components/soc/esp32/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32/include/soc/Kconfig.soc_caps.in @@ -75,6 +75,18 @@ config SOC_RTC_SLOW_MEM_SUPPORTED bool default y +config SOC_I2S_SUPPORTED + bool + default y + +config SOC_RMT_SUPPORTED + bool + default y + +config SOC_SIGMADELTA_SUPPORTED + bool + default y + config SOC_ADC_RTC_CTRL_SUPPORTED bool default y diff --git a/components/soc/esp32/include/soc/soc_caps.h b/components/soc/esp32/include/soc/soc_caps.h index b9a9da8689..fa5609db55 100644 --- a/components/soc/esp32/include/soc/soc_caps.h +++ b/components/soc/esp32/include/soc/soc_caps.h @@ -78,6 +78,9 @@ #define SOC_EFUSE_SECURE_BOOT_KEY_DIGESTS 1 #define SOC_RTC_FAST_MEM_SUPPORTED 1 #define SOC_RTC_SLOW_MEM_SUPPORTED 1 +#define SOC_I2S_SUPPORTED 1 +#define SOC_RMT_SUPPORTED 1 +#define SOC_SIGMADELTA_SUPPORTED 1 /*-------------------------- ADC CAPS ----------------------------------------*/ diff --git a/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in index 9edf869d0c..8ce2bf9357 100644 --- a/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in @@ -79,6 +79,18 @@ config SOC_SUPPORT_SECURE_BOOT_REVOKE_KEY bool default y +config SOC_I2S_SUPPORTED + bool + default y + +config SOC_RMT_SUPPORTED + bool + default y + +config SOC_SIGMADELTA_SUPPORTED + bool + default y + config SOC_AES_SUPPORT_DMA bool default y diff --git a/components/soc/esp32c3/include/soc/soc_caps.h b/components/soc/esp32c3/include/soc/soc_caps.h index 2b6ea27ff1..79e599d21c 100644 --- a/components/soc/esp32c3/include/soc/soc_caps.h +++ b/components/soc/esp32c3/include/soc/soc_caps.h @@ -38,6 +38,9 @@ #define SOC_RTC_FAST_MEM_SUPPORTED 1 #define SOC_RTC_SLOW_MEM_SUPPORTED 0 #define SOC_SUPPORT_SECURE_BOOT_REVOKE_KEY 1 +#define SOC_I2S_SUPPORTED 1 +#define SOC_RMT_SUPPORTED 1 +#define SOC_SIGMADELTA_SUPPORTED 1 /*-------------------------- AES CAPS -----------------------------------------*/ #define SOC_AES_SUPPORT_DMA (1) diff --git a/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in b/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in index 6d3ba2b0dd..787a7d2e51 100644 --- a/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in @@ -67,6 +67,18 @@ config SOC_SUPPORT_SECURE_BOOT_REVOKE_KEY bool default y +config SOC_I2S_SUPPORTED + bool + default y + +config SOC_RMT_SUPPORTED + bool + default y + +config SOC_SIGMADELTA_SUPPORTED + bool + default y + config SOC_AES_SUPPORT_DMA bool default y diff --git a/components/soc/esp32h2/include/soc/soc_caps.h b/components/soc/esp32h2/include/soc/soc_caps.h index 4c1b2b0a45..05ffdf19fa 100644 --- a/components/soc/esp32h2/include/soc/soc_caps.h +++ b/components/soc/esp32h2/include/soc/soc_caps.h @@ -40,6 +40,9 @@ #define SOC_RTC_FAST_MEM_SUPPORTED 1 #define SOC_RTC_SLOW_MEM_SUPPORTED 0 #define SOC_SUPPORT_SECURE_BOOT_REVOKE_KEY 1 +#define SOC_I2S_SUPPORTED 1 +#define SOC_RMT_SUPPORTED 1 +#define SOC_SIGMADELTA_SUPPORTED 1 /*-------------------------- AES CAPS -----------------------------------------*/ diff --git a/components/soc/esp32s2/include/soc/Kconfig.soc_caps.in b/components/soc/esp32s2/include/soc/Kconfig.soc_caps.in index 8660d4938d..3e2212025e 100644 --- a/components/soc/esp32s2/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32s2/include/soc/Kconfig.soc_caps.in @@ -107,6 +107,18 @@ config SOC_SUPPORT_SECURE_BOOT_REVOKE_KEY bool default y +config SOC_I2S_SUPPORTED + bool + default y + +config SOC_RMT_SUPPORTED + bool + default y + +config SOC_SIGMADELTA_SUPPORTED + bool + default y + config SOC_ADC_RTC_CTRL_SUPPORTED bool default y diff --git a/components/soc/esp32s2/include/soc/soc_caps.h b/components/soc/esp32s2/include/soc/soc_caps.h index be7da42928..fed0bf8a17 100644 --- a/components/soc/esp32s2/include/soc/soc_caps.h +++ b/components/soc/esp32s2/include/soc/soc_caps.h @@ -65,6 +65,9 @@ #define SOC_PSRAM_DMA_CAPABLE 1 #define SOC_XT_WDT_SUPPORTED 1 #define SOC_SUPPORT_SECURE_BOOT_REVOKE_KEY 1 +#define SOC_I2S_SUPPORTED 1 +#define SOC_RMT_SUPPORTED 1 +#define SOC_SIGMADELTA_SUPPORTED 1 /*-------------------------- ADC CAPS ----------------------------------------*/ diff --git a/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in b/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in index de34cbeff1..cf1dbe45fc 100644 --- a/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in @@ -243,6 +243,18 @@ config SOC_XT_WDT_SUPPORTED bool default y +config SOC_I2S_SUPPORTED + bool + default y + +config SOC_RMT_SUPPORTED + bool + default y + +config SOC_SIGMADELTA_SUPPORTED + bool + default y + config SOC_APPCPU_HAS_CLOCK_GATING_BUG bool default y diff --git a/components/soc/esp32s3/include/soc/soc_caps.h b/components/soc/esp32s3/include/soc/soc_caps.h index 70f6eacf86..9be14f2bc3 100644 --- a/components/soc/esp32s3/include/soc/soc_caps.h +++ b/components/soc/esp32s3/include/soc/soc_caps.h @@ -52,6 +52,9 @@ #define SOC_SUPPORT_SECURE_BOOT_REVOKE_KEY 1 #define SOC_PSRAM_DMA_CAPABLE 1 #define SOC_XT_WDT_SUPPORTED 1 +#define SOC_I2S_SUPPORTED 1 +#define SOC_RMT_SUPPORTED 1 +#define SOC_SIGMADELTA_SUPPORTED 1 /*-------------------------- SOC CAPS ----------------------------------------*/ #define SOC_APPCPU_HAS_CLOCK_GATING_BUG (1) diff --git a/components/spi_flash/test/test_esp_flash.c b/components/spi_flash/test/test_esp_flash.c index bbf61a7d61..0e5d703640 100644 --- a/components/spi_flash/test/test_esp_flash.c +++ b/components/spi_flash/test/test_esp_flash.c @@ -36,6 +36,9 @@ #include "esp8684/rom/cache.h" #endif +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) +// TODO: SPI_FLASH IDF-4025 + #define FUNC_SPI 1 static uint8_t sector_buf[4096]; @@ -1237,3 +1240,5 @@ FLASH_TEST_CASE("esp_flash_read large PSRAM buffer low memory", test_flash_read_ #endif + +#endif //#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) diff --git a/components/spi_flash/test/test_read_write.c b/components/spi_flash/test/test_read_write.c index fff4495b63..9608c7b56b 100644 --- a/components/spi_flash/test/test_read_write.c +++ b/components/spi_flash/test/test_read_write.c @@ -31,6 +31,9 @@ #include "esp32h2/rom/spi_flash.h" #endif +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) +// TODO: SPI_FLASH IDF-4025 + #define MIN_BLOCK_SIZE 12 /* Base offset in flash for tests. */ @@ -386,3 +389,5 @@ 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) diff --git a/components/spi_flash/test/test_spi_flash.c b/components/spi_flash/test/test_spi_flash.c index a3672eee3b..e9bf6c859b 100644 --- a/components/spi_flash/test/test_spi_flash.c +++ b/components/spi_flash/test/test_spi_flash.c @@ -28,6 +28,9 @@ #include "esp32c3/rom/spi_flash.h" #endif + +#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) +// TODO: SPI_FLASH IDF-4025 struct flash_test_ctx { uint32_t offset; bool fail; @@ -447,3 +450,5 @@ TEST_CASE("bootloader_flash_xmc_startup can be called when cache disabled", "[sp { test_xmc_startup(); } + +#endif //#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP8684) diff --git a/examples/cxx/experimental/experimental_cpp_component/gpio_cxx.cpp b/examples/cxx/experimental/experimental_cpp_component/gpio_cxx.cpp index 3f67cb7102..73b895d04d 100644 --- a/examples/cxx/experimental/experimental_cpp_component/gpio_cxx.cpp +++ b/examples/cxx/experimental/experimental_cpp_component/gpio_cxx.cpp @@ -25,6 +25,8 @@ 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 +constexpr std::array INVALID_GPIOS = {}; #else #error "No GPIOs defined for the current target" #endif 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 63346941b4..18e1d54a05 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 +#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP8684 #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 bf578d28d5..b47ffc3f65 100644 --- a/examples/cxx/experimental/experimental_cpp_component/test/test_i2c.cpp +++ b/examples/cxx/experimental/experimental_cpp_component/test/test_i2c.cpp @@ -32,7 +32,7 @@ using namespace idf; #define I2C_SLAVE_SDA_IO 18 /*!