Merge branch 'bugfix/system_restore_duplicate' into 'master'

esp32: remove duplicate definition of system_restore

See merge request idf/esp-idf!1864
This commit is contained in:
Angus Gratton 2018-01-29 14:02:02 +08:00
commit 1249659931

View file

@ -355,11 +355,6 @@ void IRAM_ATTR esp_restart_noos()
void system_restart(void) __attribute__((alias("esp_restart")));
void system_restore(void)
{
esp_wifi_restore();
}
uint32_t esp_get_free_heap_size( void )
{
return heap_caps_get_free_size( MALLOC_CAP_DEFAULT );