From 9c897ef2808cb71968ef3722b1b63f700dee3720 Mon Sep 17 00:00:00 2001 From: ChenJianxing Date: Fri, 25 Jun 2021 16:14:44 +0800 Subject: [PATCH 1/3] esp_wifi: rm esp32s2beta --- components/esp_wifi/CMakeLists.txt | 17 ----------------- .../include/esp_private/wifi_os_adapter.h | 5 ----- components/esp_wifi/include/esp_wifi_types.h | 8 -------- components/esp_wifi/lib | 2 +- components/esp_wifi/test_md5/test_md5.sh | 4 ---- 5 files changed, 1 insertion(+), 35 deletions(-) diff --git a/components/esp_wifi/CMakeLists.txt b/components/esp_wifi/CMakeLists.txt index 18bd99ec89..752992c49f 100644 --- a/components/esp_wifi/CMakeLists.txt +++ b/components/esp_wifi/CMakeLists.txt @@ -36,15 +36,6 @@ target_link_libraries(${COMPONENT_LIB} PUBLIC "-L ${CMAKE_CURRENT_SOURCE_DIR}/li if(link_binary_libs) if(CONFIG_IDF_TARGET_ESP32) set(phy phy) - elseif(CONFIG_IDF_TARGET_ESP32S2BETA) - # TODO: remove once final S2 chip is supported - if(CONFIG_ESP32S2_BETA_VERSION_A) - set(phy phyA) - elseif(CONFIG_ESP32S2_BETA_VERSION_B) - set(phy phyB) - elseif(CONFIG_ESP32S2_BETA_VERSION_MARLIN3) - set(phy phy_marlin3) - endif() endif() set(blobs coexist core espnow mesh net80211 pp rtc smartconfig ${phy}) @@ -86,13 +77,5 @@ if(CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION) # ToDo: remove once MP chip is supported if(CONFIG_IDF_TARGET_ESP32) esptool_py_flash_project_args(phy ${phy_partition_offset} ${phy_init_data_bin} FLASH_IN_PROJECT) - elseif(CONFIG_IDF_TARGET_ESP32S2BETA) - if(CONFIG_ESP32S2BETA_VERSION_A) - esptool_py_flash_project_args(phyA ${phy_partition_offset} ${phy_init_data_bin} FLASH_IN_PROJECT) - elseif(CONFIG_ESP32S2BETA_VERSION_B) - esptool_py_flash_project_args(phyB ${phy_partition_offset} ${phy_init_data_bin} FLASH_IN_PROJECT) - elseif(CONFIG_ESP32S2BETA_VERSION_MARLIN3) - esptool_py_flash_project_args(phy_marlin3 ${phy_partition_offset} ${phy_init_data_bin} FLASH_IN_PROJECT) - endif() endif() endif() diff --git a/components/esp_wifi/include/esp_private/wifi_os_adapter.h b/components/esp_wifi/include/esp_private/wifi_os_adapter.h index 3d005c54aa..9cf6abfaed 100644 --- a/components/esp_wifi/include/esp_private/wifi_os_adapter.h +++ b/components/esp_wifi/include/esp_private/wifi_os_adapter.h @@ -79,10 +79,8 @@ typedef struct { void (* _dport_access_stall_other_cpu_end_wrap)(void); int32_t (* _phy_rf_deinit)(uint32_t module); void (* _phy_load_cal_and_init)(uint32_t module); -#if CONFIG_IDF_TARGET_ESP32 void (* _phy_common_clock_enable)(void); void (* _phy_common_clock_disable)(void); -#endif int32_t (* _read_mac)(uint8_t* mac, uint32_t type); void (* _timer_arm)(void *timer, uint32_t tmout, bool repeat); void (* _timer_disarm)(void *timer); @@ -107,9 +105,6 @@ typedef struct { int32_t (* _get_random)(uint8_t *buf, size_t len); int32_t (* _get_time)(void *t); unsigned long (* _random)(void); -#if CONFIG_IDF_TARGET_ESP32S2BETA - uint32_t (* _slowclk_cal_get)(void); -#endif void (* _log_write)(uint32_t level, const char* tag, const char* format, ...); void (* _log_writev)(uint32_t level, const char* tag, const char* format, va_list args); uint32_t (* _log_timestamp)(void); diff --git a/components/esp_wifi/include/esp_wifi_types.h b/components/esp_wifi/include/esp_wifi_types.h index 2fce8de8bc..ad21425d77 100644 --- a/components/esp_wifi/include/esp_wifi_types.h +++ b/components/esp_wifi/include/esp_wifi_types.h @@ -327,11 +327,7 @@ typedef struct { unsigned stbc:2; /**< Space Time Block Code(STBC). 0: non STBC packet; 1: STBC packet */ unsigned fec_coding:1; /**< Flag is set for 11n packets which are LDPC */ unsigned sgi:1; /**< Short Guide Interval(SGI). 0: Long GI; 1: Short GI */ -#if CONFIG_IDF_TARGET_ESP32 signed noise_floor:8; /**< noise floor of Radio Frequency Module(RF). unit: 0.25dBm*/ -#elif CONFIG_IDF_TARGET_ESP32S2BETA - unsigned :8; -#endif unsigned ampdu_cnt:8; /**< ampdu cnt */ unsigned channel:4; /**< primary channel on which this packet is received */ unsigned secondary_channel:4; /**< secondary channel on which this packet is received. 0: none; 1: above; 2: below */ @@ -340,10 +336,6 @@ typedef struct { unsigned :32; /**< reserve */ unsigned :31; /**< reserve */ unsigned ant:1; /**< antenna number from which this packet is received. 0: WiFi antenna 0; 1: WiFi antenna 1 */ -#if CONFIG_IDF_TARGET_ESP32S2BETA - signed noise_floor:8; /**< noise floor of Radio Frequency Module(RF). unit: 0.25dBm*/ - unsigned :24; -#endif unsigned sig_len:12; /**< length of packet including Frame Check Sequence(FCS) */ unsigned :12; /**< reserve */ unsigned rx_state:8; /**< state of the packet. 0: no error; others: error numbers which are not public */ diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index c82065efa1..9fd1ef517c 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit c82065efa12918f734eac2bb4ca88962bbef584b +Subproject commit 9fd1ef517cb7d94fc1b5c92be1a4368903134022 diff --git a/components/esp_wifi/test_md5/test_md5.sh b/components/esp_wifi/test_md5/test_md5.sh index 28a72beada..31c95585cc 100755 --- a/components/esp_wifi/test_md5/test_md5.sh +++ b/components/esp_wifi/test_md5/test_md5.sh @@ -17,10 +17,6 @@ case $IDF_TARGET in PREFIX=xtensa-esp32-elf- LIB_DIR=esp32 ;; - esp32s2beta) - PREFIX=xtensa-esp32s2-elf- - LIB_DIR=esp32s2beta - ;; *) echo "Invalid IDF_TARGET value: \"${IDF_TARGET}\"" exit 1 From ab830517bfe0c116ee8b401277928fe19c02139b Mon Sep 17 00:00:00 2001 From: He Yin Ling Date: Fri, 25 Jun 2021 19:48:24 +0800 Subject: [PATCH 2/3] CI: remove wifi lib md5 test on ESP32S2beta --- tools/ci/config/pre_check.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/ci/config/pre_check.yml b/tools/ci/config/pre_check.yml index c7fadf7ae5..f00c7bc7d8 100644 --- a/tools/ci/config/pre_check.yml +++ b/tools/ci/config/pre_check.yml @@ -94,7 +94,6 @@ check_wifi_lib_md5: dependencies: [] script: - IDF_TARGET=esp32 $IDF_PATH/components/esp_wifi/test_md5/test_md5.sh - - IDF_TARGET=esp32s2beta $IDF_PATH/components/esp_wifi/test_md5/test_md5.sh .build_with_make_and_cmake: &build_with_make_and_cmake | echo -e "section_end:"`date +%s`":build_script\r\e[0Ksection_start:"`date +%s`":build_make\r\e[0KBuild with Make" From 8f7f42948897784018b10f9d0688cc89a4a9f7cd Mon Sep 17 00:00:00 2001 From: He Yin Ling Date: Mon, 12 Jul 2021 19:59:33 +0800 Subject: [PATCH 3/3] CI: remove ESP32S2Beta related jobs --- tools/ci/config/build.yml | 11 ----------- tools/ci/config/host-test.yml | 16 ---------------- tools/ci/config/pre_check.yml | 4 ++-- 3 files changed, 2 insertions(+), 29 deletions(-) diff --git a/tools/ci/config/build.yml b/tools/ci/config/build.yml index ffed2167e7..6b0e85d9b6 100644 --- a/tools/ci/config/build.yml +++ b/tools/ci/config/build.yml @@ -48,12 +48,6 @@ build_ssc_esp32: variables: TARGET_NAME: "ESP32" -build_ssc_esp32s2beta: - extends: .build_ssc_template - parallel: 2 - variables: - TARGET_NAME: "ESP32S2" - build_esp_idf_tests_make: extends: .build_esp_idf_unit_test_template variables: @@ -185,11 +179,6 @@ build_examples_cmake_esp32: variables: IDF_TARGET: esp32 -build_examples_cmake_esp32s2: - extends: .build_examples_cmake - variables: - IDF_TARGET: esp32s2beta - # If you want to add new build example jobs, please add it into dependencies of `.example_test_template` .build_docs_template: &build_docs_template diff --git a/tools/ci/config/host-test.yml b/tools/ci/config/host-test.yml index b005dd24f3..164bb1e971 100644 --- a/tools/ci/config/host-test.yml +++ b/tools/ci/config/host-test.yml @@ -233,22 +233,6 @@ test_esp32_efuse_table_on_host: - cd ${IDF_PATH}/components/efuse/test_efuse_host - ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh ./efuse_tests.py -test_esp32s2beta_efuse_table_on_host: - extends: .host_test_template - artifacts: - when: on_failure - paths: - - components/efuse/esp32s2beta/esp_efuse_table.c - expire_in: 1 week - script: - - cd ${IDF_PATH}/components/efuse/ - - ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh -p 2.7.15 ./efuse_table_gen.py -t "esp32s2beta" ${IDF_PATH}/components/efuse/esp32s2beta/esp_efuse_table.csv - - git diff --exit-code -- esp32s2beta/esp_efuse_table.c || { echo 'Differences found for esp32s2beta target. Please run make efuse_common_table or idf.py efuse_common_table and commit the changes.'; exit 1; } - - ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh -p 3.4.8 ./efuse_table_gen.py -t "esp32s2beta" ${IDF_PATH}/components/efuse/esp32s2beta/esp_efuse_table.csv - - git diff --exit-code -- esp32s2beta/esp_efuse_table.c || { echo 'Differences found between running under Python 2 and 3.'; exit 1; } - - cd ${IDF_PATH}/components/efuse/test_efuse_host - - ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh ./efuse_tests.py - test_espcoredump: extends: .host_test_template artifacts: diff --git a/tools/ci/config/pre_check.yml b/tools/ci/config/pre_check.yml index f00c7bc7d8..da0c3aebbf 100644 --- a/tools/ci/config/pre_check.yml +++ b/tools/ci/config/pre_check.yml @@ -160,8 +160,8 @@ build_template_app: # Check if there are any stray printf/ets_printf references in WiFi libs - pushd ../components/esp_wifi/lib - - for dir in esp32 esp32s2beta; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w printf | wc -l) -eq 0; done; - - for dir in esp32 esp32s2beta; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w ets_printf | wc -l) -eq 0; done; + - for dir in esp32; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w printf | wc -l) -eq 0; done; + - for dir in esp32; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w ets_printf | wc -l) -eq 0; done; - popd # For release tag pipelines only, make sure the tag was created with 'git tag -a' so it will update