ESP32: Prepare for esp-idf 6

Minimal changes. Running this on top of the mbedtls4 branch gives full green simtest CI on v6.0-beta1.

Signed-off-by: Peter M <petermm@gmail.com>

Author: petermm

src/platforms/esp32/components/avm_builtins/CMakeLists.txt

@@ -49,7 +49,7 @@ endif()
 
 # WHOLE_ARCHIVE option is supported only with esp-idf 5.x
 # A link option will be used with esp-idf 4.x
-if (IDF_VERSION_MAJOR EQUAL 5)
+if (IDF_VERSION_MAJOR GREATER_EQUAL 5)
     set(OPTIONAL_WHOLE_ARCHIVE WHOLE_ARCHIVE)
 else()
     set(OPTIONAL_WHOLE_ARCHIVE "")

src/platforms/esp32/components/avm_builtins/network_driver.c

@@ -747,7 +747,7 @@ static void start_network(Context *ctx, term pid, term ref, term config)
     // Set up STA mode, if configured
     //
     if (!IS_NULL_PTR(sta_wifi_config)) {
-        if ((err = esp_wifi_set_config(ESP_IF_WIFI_STA, sta_wifi_config)) != ESP_OK) {
+        if ((err = esp_wifi_set_config(WIFI_IF_STA, sta_wifi_config)) != ESP_OK) {
             ESP_LOGE(TAG, "Error setting STA mode config %d", err);
             free(sta_wifi_config);
             if (!IS_NULL_PTR(ap_wifi_config)) {
@@ -766,7 +766,7 @@ static void start_network(Context *ctx, term pid, term ref, term config)
     // Set up AP mode, if configured
     //
     if (!IS_NULL_PTR(ap_wifi_config)) {
-        if ((err = esp_wifi_set_config(ESP_IF_WIFI_AP, ap_wifi_config)) != ESP_OK) {
+        if ((err = esp_wifi_set_config(WIFI_IF_AP, ap_wifi_config)) != ESP_OK) {
             ESP_LOGE(TAG, "Error setting AP mode config %d", err);
             free(ap_wifi_config);
             term error = port_create_error_tuple(ctx, term_from_int(err));

src/platforms/esp32/components/avm_sys/CMakeLists.txt

@@ -33,10 +33,16 @@ set(AVM_SYS_COMPONENT_SRCS
     "../../../../libAtomVM/portnifloader.c"
 )
 
-if (IDF_VERSION_MAJOR GREATER_EQUAL 5)
+if (IDF_VERSION_MAJOR GREATER_EQUAL 6)
+    set(ADDITIONAL_COMPONENTS "esp_partition" "esp_driver_ledc" "esp_driver_uart")
+    set(ADDITIONAL_PRIV_REQUIRES "esp_hw_support")
+elseif (IDF_VERSION_MAJOR GREATER_EQUAL 5 AND IDF_VERSION_MAJOR LESS 6)
     set(ADDITIONAL_COMPONENTS "esp_partition")
-    # available starting from v4.4
     set(ADDITIONAL_PRIV_REQUIRES "esp_hw_support")
+elseif (IDF_VERSION_MAJOR LESS 6)
+    # newlib component has been renamed to esp_libc. 
+    # Any `REQUIRES newlib` can simply be deleted as esp_libc is REQUIRED by default.
+    set(ADDITIONAL_COMPONENTS "newlib")
 else()
     set(ADDITIONAL_COMPONENTS "")
     set(ADDITIONAL_PRIV_REQUIRES "")
@@ -45,7 +51,7 @@ endif()
 idf_component_register(
     SRCS ${AVM_SYS_COMPONENT_SRCS}
     INCLUDE_DIRS "include"
-    REQUIRES "spi_flash" "soc" "newlib" "pthread" "vfs" "mbedtls" ${ADDITIONAL_COMPONENTS}
+    REQUIRES "spi_flash" "soc" "pthread" "vfs" "mbedtls" ${ADDITIONAL_COMPONENTS}
     PRIV_REQUIRES "libatomvm" "esp_timer" ${ADDITIONAL_PRIV_REQUIRES}
 )
 
@@ -54,8 +60,15 @@ target_compile_features(${COMPONENT_LIB} INTERFACE c_std_11)
 idf_component_get_property(soc_dir soc COMPONENT_DIR)
 idf_component_get_property(soc_include_dirs soc INCLUDE_DIRS)
 idf_build_get_property(idf_target IDF_TARGET)
+
+if (IDF_VERSION_MAJOR LESS 6)
 idf_component_get_property(newlib_dir newlib COMPONENT_DIR)
 idf_component_get_property(newlib_include_dirs newlib INCLUDE_DIRS)
+else()
+idf_component_get_property(newlib_dir esp_libc COMPONENT_DIR)
+idf_component_get_property(newlib_include_dirs esp_libc INCLUDE_DIRS)
+endif()
+
 idf_component_get_property(pthread_dir pthread COMPONENT_DIR)
 idf_component_get_property(pthread_include_dirs pthread INCLUDE_DIRS)
 idf_component_get_property(pthread_srcs pthread SRCS)

src/platforms/esp32/test/main/idf_component.yml

@@ -0,0 +1,34 @@
+dependencies:
+  "espressif/dp83848":
+   version: "~1.0.0"
+   rules:
+    - if: "idf_version >=6.0"
+    - if: target in ["esp32", "esp32p4"]
+    - if: "$CONFIG{ETH_USE_OPENETH} == True"
+  # atomgl:
+  #   git: https://github.com/atomvm/atomgl
+  #   version: "main"
+  # atomvm_mqtt_client:
+  #   git: https://github.com/atomvm/atomvm_mqtt_client
+  #   version: "main"
+  # atomvm_esp32cam:
+  #   #NB requires certain sdkconfig options to be set, see the readme
+  #   git: https://github.com/atomvm/atomvm_esp32cam
+  #   version: "main"
+  # atomvm_gps:
+  #   git: https://github.com/atomvm/atomvm_gps
+  #   version: "main"
+  # atomvm_neopixel:
+  #   git: https://github.com/atomvm/atomvm_neopixel
+  #   version: "main"
+  # atomvm_m5:
+  #   git: https://github.com/pguyot/atomvm_m5
+  #   version: "main"
+  # my_nif:
+  #   # example for local development
+  #   # replace with your own nif in same top level directory as AtomVM
+  #   path: ../../../../../my_nif
+  # atomvm_mqtt_client:
+  #   # example for local development
+  #   # where a nif is git cloned in same top level directory as AtomVM
+  #   path: ../../../../../atomvm_mqtt_client

src/platforms/esp32/test/main/idf_component.yml.license

@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+SPDX-FileCopyrightText: AtomVM Contributors

src/platforms/esp32/test/main/test_main.c

@@ -34,6 +34,12 @@
 #include "sys.h"
 
 #include <driver/sdmmc_host.h>
+
+// Since IDF v6 it's a separate component
+#if ESP_IDF_VERSION_MAJOR >= 6 && CONFIG_ETH_USE_OPENETH
+#include "esp_eth_phy_dp83848.h"
+#endif
+
 #include <esp_eth.h>
 #include <esp_event.h>
 #include <esp_log.h>