From 98abb2d426197cdf787dbe195fe52b8f5b20d718 Mon Sep 17 00:00:00 2001 From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com> Date: Thu, 19 Sep 2024 13:50:28 -0300 Subject: [PATCH 1/6] feat(esp32p4): Build libs for ESP32-P4 --- main/idf_component.yml | 2 +- patches/mmu_map.diff | 24 ------------------------ tools/install-esp-idf.sh | 1 - 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 patches/mmu_map.diff diff --git a/main/idf_component.yml b/main/idf_component.yml index 011906d27..beed56ed9 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -1,6 +1,6 @@ dependencies: # Required IDF version - idf: ">=5.1" + idf: ">=5.3" espressif/esp32-camera: version: "master" git: https://github.com/espressif/esp32-camera.git diff --git a/patches/mmu_map.diff b/patches/mmu_map.diff deleted file mode 100644 index 3bf56005a..000000000 --- a/patches/mmu_map.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/components/esp_mm/esp_mmu_map.c b/components/esp_mm/esp_mmu_map.c -index b7d927f8fe..6a8c4635f0 100644 ---- a/components/esp_mm/esp_mmu_map.c -+++ b/components/esp_mm/esp_mmu_map.c -@@ -315,6 +315,19 @@ esp_err_t esp_mmu_map_reserve_block_with_caps(size_t size, mmu_mem_caps_t caps, - s_mmu_ctx.mem_regions[found_region_id].max_slot_size -= aligned_size; - ESP_EARLY_LOGV(TAG, "found laddr is 0x%x", laddr); - -+ mem_block_t *mem_block = NULL; -+ mem_region_t *region = &s_mmu_ctx.mem_regions[found_region_id]; -+ TAILQ_FOREACH(mem_block, ®ion->mem_block_head, entries) { -+ if (mem_block == TAILQ_FIRST(®ion->mem_block_head) || mem_block == TAILQ_LAST(®ion->mem_block_head, mem_block_head_)) { -+ TAILQ_REMOVE(®ion->mem_block_head, mem_block, entries); -+ } else { -+ // probably the reservation of MMU region should be disallowed for this case - already some MMU mappings exist? -+ // assert/abort -+ ESP_EARLY_LOGE(TAG, "already some MMU mappings exist?"); -+ abort(); -+ } -+ } -+ - uint32_t vaddr = 0; - if (caps & MMU_MEM_CAP_EXEC) { - vaddr = mmu_ll_laddr_to_vaddr(laddr, MMU_VADDR_INSTRUCTION); diff --git a/tools/install-esp-idf.sh b/tools/install-esp-idf.sh index bd3d07985..c7c23ca75 100755 --- a/tools/install-esp-idf.sh +++ b/tools/install-esp-idf.sh @@ -40,7 +40,6 @@ if [ ! -x $idf_was_installed ] || [ ! -x $commit_predefined ]; then # Temporarily patch the ESP32-S2 I2C LL driver to keep the clock source cd $IDF_PATH patch -p1 -N -i $AR_PATCHES/esp32s2_i2c_ll_master_init.diff - patch -p1 -N -i $AR_PATCHES/mmu_map.diff patch -p1 -N -i $AR_PATCHES/lwip_max_tcp_pcb.diff patch -p1 -N -i $AR_PATCHES/esp32c6_provisioning_bluedroid.diff cd - From 72310d952c98db3c9c8940a56ee76dcaf5c6970e Mon Sep 17 00:00:00 2001 From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com> Date: Thu, 19 Sep 2024 15:35:09 -0300 Subject: [PATCH 2/6] Add target to workflows --- .github/workflows/cron.yml | 2 +- .github/workflows/push.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index f2053b3ad..ed2522f54 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -36,4 +36,4 @@ jobs: targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2" - idf_branch: "release/v5.3" lib_builder_branch: "release/v5.3" - targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2" + targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4" diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 649c84c81..95610c403 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - target: [esp32, esp32s2, esp32s3, esp32c2, esp32c3, esp32c6, esp32h2] + target: [esp32, esp32s2, esp32s3, esp32c2, esp32c3, esp32c6, esp32h2, esp32p4] fail-fast: false steps: - uses: actions/checkout@v4 From 88eec9ad5a1deedd6e3dd7f4fb6dc25d5a7ea036 Mon Sep 17 00:00:00 2001 From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com> Date: Thu, 19 Sep 2024 15:36:29 -0300 Subject: [PATCH 3/6] Enable in builds --- configs/builds.json | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/builds.json b/configs/builds.json index bbdea49e0..dfea68de8 100644 --- a/configs/builds.json +++ b/configs/builds.json @@ -46,7 +46,6 @@ "targets":[ { "target": "esp32p4", - "skip": 1, "features":[], "idf_libs":["qio","80m"], "bootloaders":[ From 6b18b1e6ef42b202584b07fde2b20e3640b16298 Mon Sep 17 00:00:00 2001 From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com> Date: Thu, 19 Sep 2024 17:02:37 -0300 Subject: [PATCH 4/6] Remove bluedroid patch --- patches/esp32c6_provisioning_bluedroid.diff | 12 ------------ tools/install-esp-idf.sh | 1 - 2 files changed, 13 deletions(-) delete mode 100644 patches/esp32c6_provisioning_bluedroid.diff diff --git a/patches/esp32c6_provisioning_bluedroid.diff b/patches/esp32c6_provisioning_bluedroid.diff deleted file mode 100644 index 98371b8aa..000000000 --- a/patches/esp32c6_provisioning_bluedroid.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/components/protocomm/src/simple_ble/simple_ble.c b/components/protocomm/src/simple_ble/simple_ble.c -index 8a4ae0f3d9..cd6421c6e5 100644 ---- a/components/protocomm/src/simple_ble/simple_ble.c -+++ b/components/protocomm/src/simple_ble/simple_ble.c -@@ -225,7 +225,7 @@ esp_err_t simple_ble_start(simple_ble_cfg_t *cfg) - #ifdef CONFIG_BTDM_CTRL_MODE_BTDM - ret = esp_bt_controller_enable(ESP_BT_MODE_BTDM); --#elif defined CONFIG_BTDM_CTRL_MODE_BLE_ONLY || CONFIG_BT_CTRL_MODE_EFF -+#elif defined CONFIG_BTDM_CTRL_MODE_BLE_ONLY || CONFIG_BT_CTRL_MODE_EFF || CONFIG_IDF_TARGET_ESP32C6 - ret = esp_bt_controller_enable(ESP_BT_MODE_BLE); - #else - ESP_LOGE(TAG, "Configuration mismatch. Select BLE Only or BTDM mode from menuconfig"); diff --git a/tools/install-esp-idf.sh b/tools/install-esp-idf.sh index c7c23ca75..0519ae67a 100755 --- a/tools/install-esp-idf.sh +++ b/tools/install-esp-idf.sh @@ -41,7 +41,6 @@ if [ ! -x $idf_was_installed ] || [ ! -x $commit_predefined ]; then cd $IDF_PATH patch -p1 -N -i $AR_PATCHES/esp32s2_i2c_ll_master_init.diff patch -p1 -N -i $AR_PATCHES/lwip_max_tcp_pcb.diff - patch -p1 -N -i $AR_PATCHES/esp32c6_provisioning_bluedroid.diff cd - fi From 85fe140cfb51a7da2b026dcb35df8f224fc63382 Mon Sep 17 00:00:00 2001 From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com> Date: Fri, 20 Sep 2024 10:29:26 -0300 Subject: [PATCH 5/6] Add P4 to libspi --- configs/builds.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/builds.json b/configs/builds.json index dfea68de8..5cb7ffcc5 100644 --- a/configs/builds.json +++ b/configs/builds.json @@ -4,7 +4,7 @@ "file":"libspi_flash.a", "src":"build/esp-idf/spi_flash/libspi_flash.a", "out":"lib/libspi_flash.a", - "targets":["esp32","esp32c2","esp32c3","esp32s2","esp32s3","esp32c6","esp32h2"] + "targets":["esp32","esp32c2","esp32c3","esp32s2","esp32s3","esp32c6","esp32h2","esp32p4"] }, { "file":"libesp_psram.a", From ef4559f3e6d5ed92ff99bc0d282b41c517e9cd6a Mon Sep 17 00:00:00 2001 From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com> Date: Sun, 22 Sep 2024 19:07:34 -0300 Subject: [PATCH 6/6] Add P4 mem variants --- configs/builds.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/configs/builds.json b/configs/builds.json index 5cb7ffcc5..e4b3ec7c0 100644 --- a/configs/builds.json +++ b/configs/builds.json @@ -49,9 +49,14 @@ "features":[], "idf_libs":["qio","80m"], "bootloaders":[ - ["qio","80m"] + ["qio","80m"], + ["dio","80m"], + ["qio","40m"], + ["dio","40m"] ], - "mem_variants":[] + "mem_variants":[ + ["dio","80m"] + ] }, { "target": "esp32c2", pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy