Cleanup of previous merge commit

components/bootloader_support/CMakeLists.txt

@@ -7,7 +7,7 @@ set(srcs
     "src/esp_image_format.c"
     "src/flash_partitions.c"
     "src/flash_qio_mode.c"
-    "src/${IDF_TARGET}/bootloader_flash_config_${IDF_TARGET}.c"
+    "src/bootloader_flash_config_${IDF_TARGET}.c"
     )
 
 if(CONFIG_IDF_TARGET_ESP32)

components/bootloader_support/component.mk

@@ -19,6 +19,8 @@ ifndef IS_BOOTLOADER_BUILD
 COMPONENT_OBJEXCLUDE := src/bootloader_init.o
 endif
 
+COMPONENT_OBJEXCLUDE += src/bootloader_flash_config_esp32s2beta.o
+
 #
 # Secure boot signing key support
 #

components/driver/include/driver/touch_pad.h

@@ -14,6 +14,7 @@
 
 #ifndef _DRIVER_TOUCH_PAD_H_
 #define _DRIVER_TOUCH_PAD_H_
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -309,6 +310,31 @@ esp_err_t touch_pad_isr_deregister(void(*fn)(void *), void *arg);
  */
 esp_err_t touch_pad_get_wakeup_status(touch_pad_t *pad_num);
 
+/**
+ * @brief Get the touch sensor status, usually used in ISR to decide which pads are 'touched'.
+ * @return
+ *      - touch status
+ */
+uint32_t touch_pad_get_status(void);
+
+/**
+ * @brief Set touch sensor FSM mode, the test action can be triggered by the timer,
+ *        as well as by the software.
+ * @param mode FSM mode
+ * @return
+ *      - ESP_OK on success
+ *      - ESP_ERR_INVALID_ARG if argument is wrong
+ */
+esp_err_t touch_pad_set_fsm_mode(touch_fsm_mode_t mode);
+
+/**
+ * @brief Get touch sensor FSM mode
+ * @param mode pointer to accept FSM mode
+ * @return
+ *      - ESP_OK on success
+ */
+esp_err_t touch_pad_get_fsm_mode(touch_fsm_mode_t *mode);
+
 #if CONFIG_IDF_TARGET_ESP32
 
 /**
@@ -342,7 +368,7 @@ esp_err_t touch_pad_config(touch_pad_t touch_num, uint16_t threshold);
  *     - ESP_OK Success
  *     - ESP_ERR_INVALID_ARG Touch pad parameter error
  *     - ESP_ERR_INVALID_STATE This touch pad hardware connection is error, the value of "touch_value" is 0.
- *     - ESP_FAIL Touch pad not initialized
+p *     - ESP_FAIL Touch pad not initialized
  */
 esp_err_t touch_pad_read(touch_pad_t touch_num, uint16_t * touch_value);
 
@@ -513,24 +539,6 @@ esp_err_t touch_pad_get_cnt_mode(touch_pad_t touch_num, touch_cnt_slope_t *slope
  */
 esp_err_t touch_pad_io_init(touch_pad_t touch_num);
 
-/**
- * @brief Set touch sensor FSM mode, the test action can be triggered by the timer,
- *        as well as by the software.
- * @param mode FSM mode
- * @return
- *      - ESP_OK on success
- *      - ESP_ERR_INVALID_ARG if argument is wrong
- */
-esp_err_t touch_pad_set_fsm_mode(touch_fsm_mode_t mode);
-
-/**
- * @brief Get touch sensor FSM mode
- * @param mode pointer to accept FSM mode
- * @return
- *      - ESP_OK on success
- */
-esp_err_t touch_pad_get_fsm_mode(touch_fsm_mode_t *mode);
-
 /**
  * @brief Trigger a touch sensor measurement, only support in SW mode of FSM
  * @return
@@ -642,13 +650,6 @@ esp_err_t touch_pad_clear_group_mask(uint16_t set1_mask, uint16_t set2_mask, uin
  */
 esp_err_t touch_pad_clear_status(void);
 
-/**
- * @brief Get the touch sensor status, usually used in ISR to decide which pads are 'touched'.
- * @return
- *      - touch status
- */
-uint32_t touch_pad_get_status(void);
-
 /**
  * @brief To enable touch pad interrupt
  * @return

components/esp_wifi/src/fast_crypto_ops.c

@@ -1,158 +0,0 @@
-// Copyright 2015-2017 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "crypto/common.h"
-#include "crypto/aes_wrap.h"
-#include "crypto/sha256.h"
-#include "crypto/crypto.h"
-#include "crypto/md5.h"
-#include "crypto/sha1.h"
-#include "crypto/aes.h"
-#include "crypto/dh_group5.h"
-#include "wps/wps.h"
-#include "wps/wps_i.h"
-#include "wpa2/eap_peer/eap.h"
-#include "wpa2/tls/tls.h"
-#include "wpa2/eap_peer/eap_methods.h"
-#include "wpa2/eap_peer/eap_i.h"
-#include "wpa2/eap_peer/eap_common.h"
-#include "esp_wifi_crypto_types.h"
-
-// TODO: fix hardware crypto support for esp32s2beta - IDF-757
-
-/*
- * The parameters is used to set the cyrpto callback function for station connect when in security mode,
- * every callback function can register as fast_xxx or normal one, i.e, fast_aes_wrap or aes_wrap, the
- * difference between them is the normal API is calculate by software, the fast one use the hardware
- * crypto in it, can be faster than the normal one, so the callback function register in default is which
- * we recommend, so as the API in WPS default and WPA2 default.
- */
-const wpa_crypto_funcs_t g_wifi_default_wpa_crypto_funcs = {
-    .size = sizeof(wpa_crypto_funcs_t),
-    .version = ESP_WIFI_CRYPTO_VERSION,
-#if CONFIG_IDF_TARGET_ESP32
-    .aes_wrap = (esp_aes_wrap_t)fast_aes_wrap,
-    .aes_unwrap = (esp_aes_unwrap_t)fast_aes_unwrap,
-    .hmac_sha256_vector = (esp_hmac_sha256_vector_t)fast_hmac_sha256_vector,
-    .sha256_prf = (esp_sha256_prf_t)fast_sha256_prf,
-#elif CONFIG_IDF_TARGET_ESP32S2BETA
-    .aes_wrap = (esp_aes_wrap_t)aes_wrap,
-    .aes_unwrap = (esp_aes_unwrap_t)aes_unwrap,
-    .hmac_sha256_vector = (esp_hmac_sha256_vector_t)hmac_sha256_vector,
-    .sha256_prf = (esp_sha256_prf_t)sha256_prf,
-#endif
-    .hmac_md5 = (esp_hmac_md5_t)hmac_md5,
-    .hamc_md5_vector = (esp_hmac_md5_vector_t)hmac_md5_vector,
-    .hmac_sha1 = (esp_hmac_sha1_t)hmac_sha1,
-    .hmac_sha1_vector = (esp_hmac_sha1_vector_t)hmac_sha1_vector,
-    .sha1_prf = (esp_sha1_prf_t)sha1_prf,
-    .sha1_vector = (esp_sha1_vector_t)sha1_vector,
-    .pbkdf2_sha1 = (esp_pbkdf2_sha1_t)pbkdf2_sha1,
-    .rc4_skip = (esp_rc4_skip_t)rc4_skip,
-    .md5_vector = (esp_md5_vector_t)md5_vector,
-    .aes_encrypt = (esp_aes_encrypt_t)aes_encrypt,
-    .aes_encrypt_init = (esp_aes_encrypt_init_t)aes_encrypt_init,
-    .aes_encrypt_deinit = (esp_aes_encrypt_deinit_t)aes_encrypt_deinit,
-    .aes_decrypt = (esp_aes_decrypt_t)aes_decrypt,
-    .aes_decrypt_init = (esp_aes_decrypt_init_t)aes_decrypt_init,
-    .aes_decrypt_deinit = (esp_aes_decrypt_deinit_t)aes_decrypt_deinit
-};
-
-const wps_crypto_funcs_t g_wifi_default_wps_crypto_funcs = {
-    .size = sizeof(wps_crypto_funcs_t),
-    .version = ESP_WIFI_CRYPTO_VERSION,
-#if CONFIG_IDF_TARGET_ESP32
-    .aes_128_encrypt = (esp_aes_128_encrypt_t)fast_aes_128_cbc_encrypt,
-    .aes_128_decrypt = (esp_aes_128_decrypt_t)fast_aes_128_cbc_decrypt,
-    .crypto_mod_exp = (esp_crypto_mod_exp_t)fast_crypto_mod_exp,
-    .hmac_sha256 = (esp_hmac_sha256_t)fast_hmac_sha256,
-    .hmac_sha256_vector = (esp_hmac_sha256_vector_t)fast_hmac_sha256_vector,
-    .sha256_vector = (esp_sha256_vector_t)fast_sha256_vector,
-#elif CONFIG_IDF_TARGET_ESP32S2BETA
-    .aes_128_encrypt = (esp_aes_128_encrypt_t)aes_128_cbc_encrypt,
-    .aes_128_decrypt = (esp_aes_128_decrypt_t)aes_128_cbc_decrypt,
-    .crypto_mod_exp = (esp_crypto_mod_exp_t)crypto_mod_exp,
-    .hmac_sha256 = (esp_hmac_sha256_t)hmac_sha256,
-    .hmac_sha256_vector = (esp_hmac_sha256_vector_t)hmac_sha256_vector,
-    .sha256_vector = (esp_sha256_vector_t)fast_sha256_vector,
-#endif
-    .uuid_gen_mac_addr = (esp_uuid_gen_mac_addr_t)uuid_gen_mac_addr,
-    .dh5_free = (esp_dh5_free_t)dh5_free,
-    .wps_build_assoc_req_ie = (esp_wps_build_assoc_req_ie_t)wps_build_assoc_req_ie,
-    .wps_build_assoc_resp_ie = (esp_wps_build_assoc_resp_ie_t)wps_build_assoc_resp_ie,
-    .wps_build_probe_req_ie = (esp_wps_build_probe_req_ie_t)wps_build_probe_req_ie,
-    .wps_build_public_key = (esp_wps_build_public_key_t)wps_build_public_key,
-    .wps_enrollee_get_msg = (esp_wps_enrollee_get_msg_t)wps_enrollee_get_msg,
-    .wps_enrollee_process_msg = (esp_wps_enrollee_process_msg_t)wps_enrollee_process_msg,
-    .wps_generate_pin = (esp_wps_generate_pin_t)wps_generate_pin,
-    .wps_is_selected_pin_registrar = (esp_wps_is_selected_pin_registrar_t)wps_is_selected_pin_registrar,
-    .wps_is_selected_pbc_registrar = (esp_wps_is_selected_pbc_registrar_t)wps_is_selected_pbc_registrar,
-    .eap_msg_alloc = (esp_eap_msg_alloc_t)eap_msg_alloc
-};
-
-/*
- * What should notice is that the cyrpto hash type function and crypto cipher type function can not register
- * as different, i.e, if you use fast_crypto_hash_init, you should use fast_crypto_hash_update and
- * fast_crypto_hash_finish for finish hash calculate, rather than call crypto_hash_update and
- * crypto_hash_finish, so do crypto_cipher.
- */
-const wpa2_crypto_funcs_t g_wifi_default_wpa2_crypto_funcs = {
-    .size = sizeof(wpa2_crypto_funcs_t),
-    .version = ESP_WIFI_CRYPTO_VERSION,
-#if CONFIG_IDF_TARGET_ESP32
-    .crypto_hash_init = (esp_crypto_hash_init_t)fast_crypto_hash_init,
-    .crypto_hash_update = (esp_crypto_hash_update_t)fast_crypto_hash_update,
-    .crypto_hash_finish = (esp_crypto_hash_finish_t)fast_crypto_hash_finish,
-    .crypto_cipher_init = (esp_crypto_cipher_init_t)fast_crypto_cipher_init,
-    .crypto_cipher_encrypt = (esp_crypto_cipher_encrypt_t)fast_crypto_cipher_encrypt,
-    .crypto_cipher_decrypt = (esp_crypto_cipher_decrypt_t)fast_crypto_cipher_decrypt,
-    .crypto_cipher_deinit = (esp_crypto_cipher_deinit_t)fast_crypto_cipher_deinit,
-    .crypto_mod_exp = (esp_crypto_mod_exp_t)crypto_mod_exp,
-    .sha256_vector = (esp_sha256_vector_t)fast_sha256_vector,
-#elif CONFIG_IDF_TARGET_ESP32S2BETA
-    .crypto_hash_init = (esp_crypto_hash_init_t)crypto_hash_init,
-    .crypto_hash_update = (esp_crypto_hash_update_t)crypto_hash_update,
-    .crypto_hash_finish = (esp_crypto_hash_finish_t)crypto_hash_finish,
-    .crypto_cipher_init = (esp_crypto_cipher_init_t)crypto_cipher_init,
-    .crypto_cipher_encrypt = (esp_crypto_cipher_encrypt_t)crypto_cipher_encrypt,
-    .crypto_cipher_decrypt = (esp_crypto_cipher_decrypt_t)crypto_cipher_decrypt,
-    .crypto_cipher_deinit = (esp_crypto_cipher_deinit_t)crypto_cipher_deinit,
-    .crypto_mod_exp = (esp_crypto_mod_exp_t)crypto_mod_exp,
-    .sha256_vector = (esp_sha256_vector_t)sha256_vector,
-#endif
-    .tls_init = (esp_tls_init_t)tls_init,
-    .tls_deinit = (esp_tls_deinit_t)tls_deinit,
-    .eap_peer_blob_init = (esp_eap_peer_blob_init_t)eap_peer_blob_init,
-    .eap_peer_blob_deinit = (esp_eap_peer_blob_deinit_t)eap_peer_blob_deinit,
-    .eap_peer_config_init = (esp_eap_peer_config_init_t)eap_peer_config_init,
-    .eap_peer_config_deinit = (esp_eap_peer_config_deinit_t)eap_peer_config_deinit,
-    .eap_peer_register_methods = (esp_eap_peer_register_methods_t)eap_peer_register_methods,
-    .eap_peer_unregister_methods = (esp_eap_peer_unregister_methods_t)eap_peer_unregister_methods,
-    .eap_deinit_prev_method = (esp_eap_deinit_prev_method_t)eap_deinit_prev_method,
-    .eap_peer_get_eap_method = (esp_eap_peer_get_eap_method_t)eap_peer_get_eap_method,
-    .eap_sm_abort = (esp_eap_sm_abort_t)eap_sm_abort,
-    .eap_sm_build_nak = (esp_eap_sm_build_nak_t)eap_sm_build_nak,
-    .eap_sm_build_identity_resp = (esp_eap_sm_build_identity_resp_t)eap_sm_build_identity_resp,
-    .eap_msg_alloc = (esp_eap_msg_alloc_t)eap_msg_alloc
-};
-
-const mesh_crypto_funcs_t g_wifi_default_mesh_crypto_funcs = {
-#if CONFIG_IDF_TARGET_ESP32
-    .aes_128_encrypt = (esp_aes_128_encrypt_t)fast_aes_128_cbc_encrypt,
-    .aes_128_decrypt = (esp_aes_128_decrypt_t)fast_aes_128_cbc_decrypt,
-#elif CONFIG_IDF_TARGET_ESP32S2BETA
-    .aes_128_encrypt = (esp_aes_128_encrypt_t)aes_128_cbc_encrypt,
-    .aes_128_decrypt = (esp_aes_128_decrypt_t)aes_128_cbc_decrypt,
-#endif
-};

components/spi_flash/spi_flash_os_func_app.c

@@ -18,6 +18,12 @@
 #include "esp_spi_flash.h"   //for ``g_flash_guard_default_ops``
 #include "esp_flash.h"
 
+#ifdef CONFIG_IDF_TARGET_ESP32
+#include "esp32/rom/ets_sys.h"
+#else
+#include "esp32s2beta/rom/ets_sys.h"
+#endif
+
 /*
  * OS functions providing delay service and arbitration among chips, and with the cache.
  *

components/ulp/ulp_private.h

@@ -0,0 +1,21 @@
+// Copyright 2019 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#ifdef CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
+#define ULP_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
+#else
+#define ULP_RESERVE_MEM CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM
+#endif

components/xtensa/CMakeLists.txt

@@ -5,7 +5,8 @@ else()
     set(priv_requires soc freertos)
     set(srcs "debug_helpers.c"
              "debug_helpers_asm.S"
-             "eri.c")
+             "eri.c"
+             "stdatomic.c")
 
     if(CONFIG_IDF_TARGET_ESP32)
         list(APPEND srcs "trax.c")