ESP32-P4: built variants for revisions and wifi daughterboard

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

Author: petermm

.github/workflows/esp32-mkimage.yaml

@@ -50,7 +50,7 @@ jobs:
         elixir_version: ["1.17"]
         rebar3_version: ["3.24.0"]
         compiler_pkgs: ["clang-14"]
-        soc: ["esp32", "esp32c2", "esp32c3", "esp32s2", "esp32s3", "esp32c5", "esp32c6", "esp32c61", "esp32h2", "esp32p4"]
+        soc: ["esp32", "esp32c2", "esp32c3", "esp32s2", "esp32s3", "esp32c5", "esp32c6", "esp32c61", "esp32h2", "esp32p4", "esp32p4_pre", "esp32p4_c6", "esp32p4_pre_c6"]
         flavor: ["", "-elixir"]
 
     env:
@@ -120,13 +120,30 @@ jobs:
       run: |
         make
 
+    - name: "Set SOC target"
+      run: echo "SOC_TARGET=${{ startsWith(matrix.soc, 'esp32p4') && 'esp32p4' || matrix.soc }}" >> $GITHUB_ENV
+
     - name: "Use release defaults"
       if: startsWith(github.ref, 'refs/tags/')
       shell: bash
       working-directory: ./src/platforms/esp32/
       run: |
         cp sdkconfig.release-defaults sdkconfig.defaults
 
+    - name: "Handle esp32p4 variants sdkconfig"
+      if: startsWith(matrix.soc, 'esp32p4')
+      shell: bash
+      working-directory: ./src/platforms/esp32/
+      run: |
+        cp sdkconfig.defaults.${{ matrix.soc }} sdkconfig.defaults.esp32p4
+
+    - name: "Handle esp32p4 c6 variants - add wifi_remote component"
+      if: matrix.soc == 'esp32p4_c6' || matrix.soc == 'esp32p4_pre_c6'
+      shell: bash
+      working-directory: ./src/platforms/esp32/components/avm_builtins
+      run: |
+        cp idf_component.yml.esp32p4_wifi_remote idf_component.yml
+
     - name: "Build ${{ matrix.soc }}${{ matrix.flavor }} with idf.py"
       shell: bash
       working-directory: ./src/platforms/esp32/
@@ -137,7 +154,7 @@ jobs:
         then
           mv partitions${{ matrix.flavor }}.csv partitions.csv
         fi
-        idf.py set-target ${{ matrix.soc }}
+        idf.py set-target ${{ env.SOC_TARGET }}
         idf.py reconfigure
         idf.py build
 
@@ -147,11 +164,14 @@ jobs:
         if [ -z "${{ matrix.flavor }}" ]
         then
           ./mkimage.sh
+          if [ "${{ matrix.soc }}" != "${{ env.SOC_TARGET }}" ]; then
+            mv atomvm-${{ env.SOC_TARGET }}.img atomvm-${{ matrix.soc }}.img
+          fi
         else
           FLAVOR_SUFFIX=$(echo "${{ matrix.flavor }}" | sed 's/-//g')
           BOOT_FILE="../../../../build/libs/esp32boot/${FLAVOR_SUFFIX}_esp32boot.avm"
           ./mkimage.sh --boot "$BOOT_FILE"
-          mv atomvm-${{ matrix.soc }}.img atomvm-${{ matrix.soc }}${{ matrix.flavor }}.img
+          mv atomvm-${{ env.SOC_TARGET }}.img atomvm-${{ matrix.soc }}${{ matrix.flavor }}.img
         fi
         ls -l *.img
 

CHANGELOG.md

@@ -74,7 +74,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Removed `externalterm_to_term_copy` added in [0.6.5] and introduced flags to `externalterm_to_term` to perform copy.
 - Release images for ESP32 chips are built with ESP-IDF v5.5
-- Only support ESP32P4 on ESP-IDF v5.5.2, v5.4.4 and later, release images are for the mass market rev3 version.
+- Only support ESP32P4 on ESP-IDF v5.5.2, v5.4.4 and later.
 - ESP32: SPI peripheral defaults to `"spi2"` instead of deprecated `hspi`
 - Added `zlib:compress/1`
 - Entry point now is `init:boot/1` if it exists. It starts the kernel application and calls `start/0` from the

…omponents/avm_builtins/idf_component.yml …ns/idf_component.yml.esp32p4_wifi_remotesrc/platforms/esp32/components/avm_builtins/idf_component.yml renamed to src/platforms/esp32/components/avm_builtins/idf_component.yml.esp32p4_wifi_remote src/platforms/esp32/components/avm_builtins/idf_component.yml renamed to src/platforms/esp32/components/avm_builtins/idf_component.yml.esp32p4_wifi_remote

@@ -7,10 +7,4 @@ CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_SPIRAM=y
 
-# esp-wifi-external config for ESP32-C6 esp_wifi_hosted via SDIO
-# (default options for esp32-p4-function-ev-board)
-CONFIG_LWIP_PPP_VJ_HEADER_COMPRESSION=n
-CONFIG_SLAVE_IDF_TARGET_ESP32C6=y
-CONFIG_LWIP_IPV6=y
-CONFIG_WIFI_RMT_EXTRA_IRAM_OPT=n
-CONFIG_WIFI_RMT_SLP_IRAM_OPT=n
+# no external chip/wifi

src/platforms/esp32/sdkconfig.defaults.esp32p4

@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-FileCopyrightText: AtomVM Contributors
+#
+# ESP32-P4 Flash and PSRAM
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_SPIRAM=y
+
+# esp-wifi-external config for ESP32-C6 esp_wifi_hosted via SDIO
+# (default options for esp32-p4-function-ev-board)
+CONFIG_LWIP_PPP_VJ_HEADER_COMPRESSION=n
+CONFIG_SLAVE_IDF_TARGET_ESP32C6=y
+CONFIG_LWIP_IPV6=y
+CONFIG_WIFI_RMT_EXTRA_IRAM_OPT=n
+CONFIG_WIFI_RMT_SLP_IRAM_OPT=n

src/platforms/esp32/sdkconfig.defaults.esp32p4_c6

@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-FileCopyrightText: AtomVM Contributors
+#
+# ESP32-P4 Flash and PSRAM
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_SPIRAM=y
+
+# no esp-wifi-external
+
+# Support esp32p4 pre-release
+CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y

src/platforms/esp32/sdkconfig.defaults.esp32p4_pre

@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-FileCopyrightText: AtomVM Contributors
+#
+# ESP32-P4 Flash and PSRAM
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_SPIRAM=y
+
+# esp-wifi-external config for ESP32-C6 esp_wifi_hosted via SDIO
+# (default options for esp32-p4-function-ev-board)
+CONFIG_LWIP_PPP_VJ_HEADER_COMPRESSION=n
+CONFIG_SLAVE_IDF_TARGET_ESP32C6=y
+CONFIG_LWIP_IPV6=y
+CONFIG_WIFI_RMT_EXTRA_IRAM_OPT=n
+CONFIG_WIFI_RMT_SLP_IRAM_OPT=n
+
+# Support esp32p4 pre-release
+CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y

src/platforms/esp32/sdkconfig.defaults.esp32p4_pre_c6

@@ -7,4 +7,3 @@ CONFIG_COMPILER_OPTIMIZATION_PERF=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
 CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y
 CONFIG_LWIP_IPV6=n
-CONFIG_ESP32P4_SELECTS_REV_LESS_V3=n