Merge branch 'master' into feature/esp32s2beta_update

components/esp_common/include/esp_system.h

@@ -20,6 +20,7 @@
 #include "esp_err.h"
 #include "esp_attr.h"
 #include "esp_bit_defs.h"
+#include "esp_idf_version.h"
 
 #include "sdkconfig.h"
 
@@ -315,14 +316,6 @@ esp_err_t esp_derive_local_mac(uint8_t* local_mac, const uint8_t* universal_mac)
 const char* system_get_sdk_version(void)  __attribute__ ((deprecated));
 /** @endcond */
 
-/**
- * Get IDF version
- *
- * @return constant string from IDF_VER
- */
-const char* esp_get_idf_version(void);
-
-
 /**
  * @brief Chip models
  */