diff --git a/cpu/esp32/startup.c b/cpu/esp32/startup.c
index 52f851f379..091ddc45be 100644
--- a/cpu/esp32/startup.c
+++ b/cpu/esp32/startup.c
@@ -177,7 +177,7 @@ NORETURN void IRAM call_start_cpu0 (void)
     #ifdef MODULE_ESP_IDF_HEAP
     /* init heap */
     heap_caps_init();
-    #ifdef ENABLE_DEBUG
+    #if ENABLE_DEBUG
     ets_printf("Heap free: %u byte\n", get_free_heap_size());
     #endif /* ENABLE_DEBUG */
     #endif /* MODULE_ESP_IDF_HEAP */
diff --git a/cpu/esp32/vendor/esp-idf/esp32/event_default_handlers.c b/cpu/esp32/vendor/esp-idf/esp32/event_default_handlers.c
index b2b0e35d73..517ff1fd70 100644
--- a/cpu/esp32/vendor/esp-idf/esp32/event_default_handlers.c
+++ b/cpu/esp32/vendor/esp-idf/esp32/event_default_handlers.c
@@ -79,33 +79,33 @@ static system_event_handler_t default_event_handlers[SYSTEM_EVENT_MAX] = { 0 };
 
 esp_err_t system_event_eth_start_handle_default(system_event_t *event)
 {
-    #if 0 /* TODO IMPLEMENT */
+#ifndef RIOT_VERSION /* TODO implement */
     tcpip_adapter_ip_info_t eth_ip;
     uint8_t eth_mac[6];
 
     esp_eth_get_mac(eth_mac);
     tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_ETH, &eth_ip);
     tcpip_adapter_eth_start(eth_mac, &eth_ip);
-    #else
-    ESP_LOGI(TAG, "%s", __func__);
-    #endif
+#else
+    ESP_LOGD(TAG, "%s", __func__);
+#endif
 
     return ESP_OK;
 }
 
 esp_err_t system_event_eth_stop_handle_default(system_event_t *event)
 {
-    #if 0 /* TODO IMPLEMENT */
+#ifndef RIOT_VERSION /* TODO implement */
     tcpip_adapter_stop(TCPIP_ADAPTER_IF_ETH);
-    #else
-    ESP_LOGI(TAG, "%s", __func__);
-    #endif
+#else
+    ESP_LOGD(TAG, "%s", __func__);
+#endif
     return ESP_OK;
 }
 
 esp_err_t system_event_eth_connected_handle_default(system_event_t *event)
 {
-    #if 0 /* TODO IMPLEMENT */
+#ifndef RIOT_VERSION /* TODO implement */
     tcpip_adapter_dhcp_status_t status;
 
     tcpip_adapter_up(TCPIP_ADAPTER_IF_ETH);
@@ -131,62 +131,66 @@ esp_err_t system_event_eth_connected_handle_default(system_event_t *event)
             ESP_LOGE(TAG, "invalid static ip");
         }
     }
-    #else
-    ESP_LOGI(TAG, "%s", __func__);
-    #endif
+#else
+    ESP_LOGD(TAG, "%s", __func__);
+#endif
 
     return ESP_OK;
 }
 
 esp_err_t system_event_eth_disconnected_handle_default(system_event_t *event)
 {
-    #if 0 /* TODO IMPLEMENT */
+#ifndef RIOT_VERSION /* TODO implement */
     tcpip_adapter_down(TCPIP_ADAPTER_IF_ETH);
-    #else
-    ESP_LOGI(TAG, "%s", __func__);
-    #endif
+#else
+    ESP_LOGD(TAG, "%s", __func__);
+#endif
     return ESP_OK;
 }
 
 static esp_err_t system_event_eth_got_ip_default(system_event_t *event)
 {
-    #if 0 /* TODO IMPLEMENT */
+#ifndef RIOT_VERSION /* TODO implement */
     ESP_LOGI(TAG, "eth ip: " IPSTR ", mask: " IPSTR ", gw: " IPSTR,
            IP2STR(&event->event_info.got_ip.ip_info.ip),
            IP2STR(&event->event_info.got_ip.ip_info.netmask),
            IP2STR(&event->event_info.got_ip.ip_info.gw));
-    #else
-    ESP_LOGI(TAG, "%s", __func__);
-    #endif
+#else
+    ESP_LOGD(TAG, "%s", __func__);
+#endif
 
     return ESP_OK;
 }
 
 static esp_err_t system_event_sta_got_ip_default(system_event_t *event)
 {
-    #if 0 /* TODO IMPLEMENT */
+#ifndef RIOT_VERSION /* TODO implement */
     WIFI_API_CALL_CHECK("esp_wifi_internal_set_sta_ip", esp_wifi_internal_set_sta_ip(), ESP_OK);
 
     ESP_LOGI(TAG, "sta ip: " IPSTR ", mask: " IPSTR ", gw: " IPSTR,
            IP2STR(&event->event_info.got_ip.ip_info.ip),
            IP2STR(&event->event_info.got_ip.ip_info.netmask),
            IP2STR(&event->event_info.got_ip.ip_info.gw));
-    #else
-    ESP_LOGI(TAG, "%s", __func__);
-    #endif
+#else
+    ESP_LOGD(TAG, "%s", __func__);
+#endif
 
     return ESP_OK;
 }
 
 static esp_err_t system_event_sta_lost_ip_default(system_event_t *event)
 {
+#ifndef RIOT_VERSION
     ESP_LOGI(TAG, "station ip lost");
+#else
+    ESP_LOGD(TAG, "%s", __func__);
+#endif
     return ESP_OK;
 }
 
 esp_err_t system_event_ap_start_handle_default(system_event_t *event)
 {
-    #if 0 /* TODO IMPLEMENT */
+#ifndef RIOT_VERSION /* TODO implement */
     tcpip_adapter_ip_info_t ap_ip;
     uint8_t ap_mac[6];
 
@@ -195,56 +199,56 @@ esp_err_t system_event_ap_start_handle_default(system_event_t *event)
 
     tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_AP, &ap_ip);
     tcpip_adapter_ap_start(ap_mac, &ap_ip);
-    #else
-    ESP_LOGI(TAG, "%s", __func__);
-    #endif
+#else
+    ESP_LOGD(TAG, "%s", __func__);
+#endif
 
     return ESP_OK;
 }
 
 esp_err_t system_event_ap_stop_handle_default(system_event_t *event)
 {
-    #if 0 /* TODO IMPLEMENT */
+#ifndef RIOT_VERSION /* TODO implement */
     WIFI_API_CALL_CHECK("esp_wifi_internal_reg_rxcb", esp_wifi_internal_reg_rxcb(ESP_IF_WIFI_AP, NULL), ESP_OK);
 
     tcpip_adapter_stop(TCPIP_ADAPTER_IF_AP);
-    #else
-    ESP_LOGI(TAG, "%s", __func__);
-    #endif
+#else
+    ESP_LOGD(TAG, "%s", __func__);
+#endif
 
     return ESP_OK;
 }
 
 esp_err_t system_event_sta_start_handle_default(system_event_t *event)
 {
-    #if 0 /* TODO IMPLEMENT */
+#ifndef RIOT_VERSION /* TODO implement */
     tcpip_adapter_ip_info_t sta_ip;
     uint8_t sta_mac[6];
 
     WIFI_API_CALL_CHECK("esp_wifi_mac_get",  esp_wifi_get_mac(ESP_IF_WIFI_STA, sta_mac), ESP_OK);
     tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_STA, &sta_ip);
     tcpip_adapter_sta_start(sta_mac, &sta_ip);
-    #else
-    ESP_LOGI(TAG, "%s", __func__);
-    #endif
+#else
+    ESP_LOGD(TAG, "%s", __func__);
+#endif
 
     return ESP_OK;
 }
 
 esp_err_t system_event_sta_stop_handle_default(system_event_t *event)
 {
-    #if 0 /* TODO IMPLEMENT */
+#ifndef RIOT_VERSION /* TODO implement */
     tcpip_adapter_stop(TCPIP_ADAPTER_IF_STA);
-    #else
-    ESP_LOGI(TAG, "%s", __func__);
-    #endif
+#else
+    ESP_LOGD(TAG, "%s", __func__);
+#endif
 
     return ESP_OK;
 }
 
 esp_err_t system_event_sta_connected_handle_default(system_event_t *event)
 {
-    #if 0 /* TODO IMPLEMENT */
+#ifndef RIOT_VERSION /* TODO implement */
     tcpip_adapter_dhcp_status_t status;
 
     WIFI_API_CALL_CHECK("esp_wifi_internal_reg_rxcb", esp_wifi_internal_reg_rxcb(ESP_IF_WIFI_STA, (wifi_rxcb_t)tcpip_adapter_sta_input), ESP_OK);
@@ -281,21 +285,21 @@ esp_err_t system_event_sta_connected_handle_default(system_event_t *event)
             ESP_LOGE(TAG, "invalid static ip");
         }
     }
-    #else
-    ESP_LOGI(TAG, "%s", __func__);
-    #endif
+#else
+    ESP_LOGD(TAG, "%s", __func__);
+#endif
 
     return ESP_OK;
 }
 
 esp_err_t system_event_sta_disconnected_handle_default(system_event_t *event)
 {
-    #if 0 /* TODO IMPLEMENT */
+#ifndef RIOT_VERSION /* TODO implement */
     tcpip_adapter_down(TCPIP_ADAPTER_IF_STA);
     WIFI_API_CALL_CHECK("esp_wifi_internal_reg_rxcb", esp_wifi_internal_reg_rxcb(ESP_IF_WIFI_STA, NULL), ESP_OK);
-    #else
-    ESP_LOGI(TAG, "%s", __func__);
-    #endif
+#else
+    ESP_LOGD(TAG, "%s", __func__);
+#endif
     return ESP_OK;
 }
 
@@ -349,14 +353,14 @@ static esp_err_t esp_system_event_debug(system_event_t *event)
     case SYSTEM_EVENT_STA_GOT_IP: {
         system_event_sta_got_ip_t *got_ip = &event->event_info.got_ip;
         (void)got_ip; /* to avoid compile error: unused variable */
-        #if 0 /* TODO IMPLEMENT */
+    #ifndef RIOT_VERSION /* TODO implement */
         ESP_LOGD(TAG, "SYSTEM_EVENT_STA_GOT_IP, ip:" IPSTR ", mask:" IPSTR ", gw:" IPSTR,
             IP2STR(&got_ip->ip_info.ip),
             IP2STR(&got_ip->ip_info.netmask),
             IP2STR(&got_ip->ip_info.gw));
-        #else
+    #else
         ESP_LOGD(TAG, "SYSTEM_EVENT_STA_GOT_IP");
-        #endif
+    #endif
         break;
     }
     case SYSTEM_EVENT_STA_LOST_IP: {
@@ -416,7 +420,7 @@ static esp_err_t esp_system_event_debug(system_event_t *event)
     case SYSTEM_EVENT_GOT_IP6: {
         ip6_addr_t *addr = &event->event_info.got_ip6.ip6_info.ip;
         (void)addr; /* to avoid compile error: unused variable */
-        #if 0 /* TODO IMPLEMENT */
+    #ifndef RIOT_VERSION /* TODO implement */
         ESP_LOGD(TAG, "SYSTEM_EVENT_AP_STA_GOT_IP6 address "
                  "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x",
                  IP6_ADDR_BLOCK1(addr),
@@ -427,9 +431,9 @@ static esp_err_t esp_system_event_debug(system_event_t *event)
                  IP6_ADDR_BLOCK6(addr),
                  IP6_ADDR_BLOCK7(addr),
                  IP6_ADDR_BLOCK8(addr));
-        #else
+    #else
         ESP_LOGD(TAG, "SYSTEM_EVENT_AP_STA_GOT_IP6 address ");
-        #endif
+    #endif
         break;
     }
     case SYSTEM_EVENT_ETH_START: {
diff --git a/cpu/esp32/vendor/esp-idf/heap/heap_caps_init.c b/cpu/esp32/vendor/esp-idf/heap/heap_caps_init.c
index d6c3c03405..b8324022b6 100644
--- a/cpu/esp32/vendor/esp-idf/heap/heap_caps_init.c
+++ b/cpu/esp32/vendor/esp-idf/heap/heap_caps_init.c
@@ -144,7 +144,7 @@ void heap_caps_init(void)
     heap_t temp_heaps[num_heaps];
     size_t heap_idx = 0;
 
-    ESP_EARLY_LOGI(TAG, "Initializing. RAM available for dynamic allocation:");
+    ESP_EARLY_LOGD(TAG, "Initializing. RAM available for dynamic allocation:");
     for (unsigned i = 0; i < soc_memory_region_count; i++) {
         soc_memory_region_t *region = &regions[i];
         const soc_memory_type_desc_t *type = &soc_memory_types[region->type];
@@ -167,7 +167,7 @@ void heap_caps_init(void)
         }
         SLIST_NEXT(heap, next) = NULL;
 
-        ESP_EARLY_LOGI(TAG, "At %08X len %08X (%d KiB): %s",
+        ESP_EARLY_LOGD(TAG, "At %08X len %08X (%d KiB): %s",
                        region->start, region->size, region->size / 1024, type->name);
     }
 
diff --git a/cpu/esp8266/vendor/esp-idf/esp8266/source/event_default_handlers.c b/cpu/esp8266/vendor/esp-idf/esp8266/source/event_default_handlers.c
index 18f877ac61..92a42d9912 100644
--- a/cpu/esp8266/vendor/esp-idf/esp8266/source/event_default_handlers.c
+++ b/cpu/esp8266/vendor/esp-idf/esp8266/source/event_default_handlers.c
@@ -70,27 +70,31 @@ static system_event_handler_t default_event_handlers[SYSTEM_EVENT_MAX] = { 0 };
 
 static esp_err_t system_event_sta_got_ip_default(system_event_t *event)
 {
-    #ifndef RIOT_VERSION /* TODO implement */
+#ifndef RIOT_VERSION /* TODO implement */
     ESP_LOGI(TAG, "sta ip: " IPSTR ", mask: " IPSTR ", gw: " IPSTR,
            IP2STR(&event->event_info.got_ip.ip_info.ip),
            IP2STR(&event->event_info.got_ip.ip_info.netmask),
            IP2STR(&event->event_info.got_ip.ip_info.gw));
-    #else
-    ESP_LOGI(TAG, "%s", __func__);
-    #endif
+#else
+    ESP_LOGD(TAG, "%s", __func__);
+#endif
 
     return ESP_OK;
 }
 
 static esp_err_t system_event_sta_lost_ip_default(system_event_t *event)
 {
+#ifndef RIOT_VERSION
     ESP_LOGI(TAG, "station ip lost");
+#else
+    ESP_LOGD(TAG, "%s", __func__);
+#endif
     return ESP_OK;
 }
 
 esp_err_t system_event_ap_start_handle_default(system_event_t *event)
 {
-    #ifndef RIOT_VERSION /* TODO implement */
+#ifndef RIOT_VERSION /* TODO implement */
     tcpip_adapter_ip_info_t ap_ip;
     uint8_t ap_mac[6];
 
@@ -98,54 +102,54 @@ esp_err_t system_event_ap_start_handle_default(system_event_t *event)
 
     tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_AP, &ap_ip);
     tcpip_adapter_start(TCPIP_ADAPTER_IF_AP, ap_mac,  &ap_ip);
-    #else
-    ESP_LOGI(TAG, "%s", __func__);
-    #endif
+#else
+    ESP_LOGD(TAG, "%s", __func__);
+#endif
 
     return ESP_OK;
 }
 
 esp_err_t system_event_ap_stop_handle_default(system_event_t *event)
 {
-    #ifndef RIOT_VERSION /* TODO implement */
+#ifndef RIOT_VERSION /* TODO implement */
     tcpip_adapter_stop(TCPIP_ADAPTER_IF_AP);
-    #else
-    ESP_LOGI(TAG, "%s", __func__);
-    #endif
+#else
+    ESP_LOGD(TAG, "%s", __func__);
+#endif
 
     return ESP_OK;
 }
 
 esp_err_t system_event_sta_start_handle_default(system_event_t *event)
 {
-    #ifndef RIOT_VERSION /* TODO implement */
+#ifndef RIOT_VERSION /* TODO implement */
     tcpip_adapter_ip_info_t sta_ip;
     uint8_t sta_mac[6];
 
     WIFI_API_CALL_CHECK("esp_wifi_mac_get",  esp_wifi_get_mac(ESP_IF_WIFI_STA, sta_mac), ESP_OK);
     tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_STA, &sta_ip);
     tcpip_adapter_start(TCPIP_ADAPTER_IF_STA, sta_mac, &sta_ip);
-    #else
-    ESP_LOGI(TAG, "%s", __func__);
-    #endif
+#else
+    ESP_LOGD(TAG, "%s", __func__);
+#endif
 
     return ESP_OK;
 }
 
 esp_err_t system_event_sta_stop_handle_default(system_event_t *event)
 {
-    #ifndef RIOT_VERSION /* TODO implement */
+#ifndef RIOT_VERSION /* TODO implement */
     tcpip_adapter_stop(TCPIP_ADAPTER_IF_STA);
-    #else
-    ESP_LOGI(TAG, "%s", __func__);
-    #endif
+#else
+    ESP_LOGD(TAG, "%s", __func__);
+#endif
 
     return ESP_OK;
 }
 
 esp_err_t system_event_sta_connected_handle_default(system_event_t *event)
 {
-    #ifndef RIOT_VERSION /* TODO implement */
+#ifndef RIOT_VERSION /* TODO implement */
     tcpip_adapter_dhcp_status_t status;
 
     tcpip_adapter_up(TCPIP_ADAPTER_IF_STA);
@@ -179,20 +183,20 @@ esp_err_t system_event_sta_connected_handle_default(system_event_t *event)
             ESP_LOGE(TAG, "invalid static ip");
         }
     }
-    #else
-    ESP_LOGI(TAG, "%s", __func__);
-    #endif
+#else
+    ESP_LOGD(TAG, "%s", __func__);
+#endif
 
     return ESP_OK;
 }
 
 esp_err_t system_event_sta_disconnected_handle_default(system_event_t *event)
 {
-    #ifndef RIOT_VERSION /* TODO implement */
+#ifndef RIOT_VERSION /* TODO implement */
     tcpip_adapter_down(TCPIP_ADAPTER_IF_STA);
-    #else
-    ESP_LOGI(TAG, "%s", __func__);
-    #endif
+#else
+    ESP_LOGD(TAG, "%s", __func__);
+#endif
     return ESP_OK;
 }
 
@@ -244,16 +248,16 @@ static esp_err_t esp_system_event_debug(system_event_t *event)
         break;
     }
     case SYSTEM_EVENT_STA_GOT_IP: {
-        #ifndef RIOT_VERSION /* TODO implement */
+    #ifndef RIOT_VERSION /* TODO implement */
         system_event_sta_got_ip_t *got_ip = &event->event_info.got_ip;
         (void)got_ip; /* to avoid compile error: unused variable */
         ESP_LOGD(TAG, "SYSTEM_EVENT_STA_GOT_IP, ip:" IPSTR ", mask:" IPSTR ", gw:" IPSTR,
             IP2STR(&got_ip->ip_info.ip),
             IP2STR(&got_ip->ip_info.netmask),
             IP2STR(&got_ip->ip_info.gw));
-        #else
+    #else
         ESP_LOGD(TAG, "SYSTEM_EVENT_STA_GOT_IP");
-        #endif
+    #endif
         break;
     }
     case SYSTEM_EVENT_STA_LOST_IP: {
@@ -312,7 +316,7 @@ static esp_err_t esp_system_event_debug(system_event_t *event)
     }
 #if ESP_EVENT_IPV6
     case SYSTEM_EVENT_GOT_IP6: {
-        #ifndef RIOT_VERSION /* TODO implement */
+    #ifndef RIOT_VERSION /* TODO implement */
         ip6_addr_t *addr = &event->event_info.got_ip6.ip6_info.ip;
         ESP_LOGD(TAG, "SYSTEM_EVENT_AP_STA_GOT_IP6 address %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x",
                  IP6_ADDR_BLOCK1(addr),
@@ -323,9 +327,9 @@ static esp_err_t esp_system_event_debug(system_event_t *event)
                  IP6_ADDR_BLOCK6(addr),
                  IP6_ADDR_BLOCK7(addr),
                  IP6_ADDR_BLOCK8(addr));
-        #else
+    #else
         ESP_LOGD(TAG, "SYSTEM_EVENT_AP_STA_GOT_IP6 address ");
-        #endif
+    #endif
         break;
     }
 #endif
diff --git a/cpu/esp_common/esp-now/esp_now_gnrc.c b/cpu/esp_common/esp-now/esp_now_gnrc.c
index 2b02b4e40c..859a99dfbd 100644
--- a/cpu/esp_common/esp-now/esp_now_gnrc.c
+++ b/cpu/esp_common/esp-now/esp_now_gnrc.c
@@ -206,7 +206,7 @@ static char _esp_now_stack[ESP_NOW_STACKSIZE];
 
 void auto_init_esp_now(void)
 {
-    LOG_TAG_INFO("esp_now", "initializing ESP-NOW device\n");
+    LOG_TAG_DEBUG("esp_now", "initializing ESP-NOW device\n");
 
     esp_now_netdev_t *esp_now_dev = netdev_esp_now_setup();
     if (!esp_now_dev) {