From bc7ae857cb1cab98e4dd781657a4953ed854ee2e Mon Sep 17 00:00:00 2001 From: shripad621git Date: Wed, 30 Apr 2025 14:16:07 +0530 Subject: [PATCH] [v1.3]connectedhomeip : Update the esp-idf version to v5.2.3 and submodule to latest v1.3-branch. - connectedhomeip: update submodule to 6eaa54b478v for NDEBUG and cmake and IPV6 address fix. - .gitlab-ci.yml: update esp-idf version to v5.2.3 to address the memory mapping fix. --- .github/workflows/docker-image.yml | 2 +- .gitlab-ci.yml | 8 ++++---- README.md | 2 +- connectedhomeip/connectedhomeip | 2 +- docs/en/developing.rst | 2 +- docs/en/security.rst | 2 +- examples/controller/sdkconfig.defaults | 1 + examples/controller/sdkconfig.defaults.otbr | 4 ++-- tools/docker/chip_idf/Dockerfile | 2 +- 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 29a3c444f..bcf30f1f0 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -30,7 +30,7 @@ env: # Github runner is running out of space when we are building for multiple architectures in single runner BUILD_PLATFORMS: linux/amd64 DOCKERHUB_REPO: ${{ github.repository }} - REQUIRED_IDF_VERSION: v5.2.1 + REQUIRED_IDF_VERSION: v5.2.3 jobs: build: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7c58c767..0e891d480 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,10 +22,10 @@ variables: MATTER_CACHE_DIR: /cache/matter_build # This variable represents the latest idf version supported for the target branch. # Note: Do change this variable in case of idf version change MR. - IDF_CHECKOUT_REF: "v5.2.1" + IDF_CHECKOUT_REF: "v5.2.3" # This variable represents the short hash of the connectedhomeip submodule. # Note: Do change this short hash on submodule update MRs. - CHIP_SHORT_HASH: "bfc4bac20c" + CHIP_SHORT_HASH: "b8bb015a5a" DOCKER_IMAGE_NAME: "espressif/chip-idf" .add_gitlab_ssh_key: &add_gitlab_ssh_key | @@ -64,7 +64,7 @@ variables: - cd ${CI_PROJECT_DIR} - git clone ${ESP_THREAD_BR_REPO_URL} - cd ${BR_PATH}/examples/basic_thread_border_router - - git checkout v1.0 + - git checkout v1.1 - idf.py set-target esp32s3 - idf.py build @@ -169,7 +169,7 @@ build_image: # Change the idf version here in case of idf version change MR. - IDF_VERSION: - "v4.4.3" - - "v5.2.1" + - "v5.2.3" .build_examples_template: stage: build diff --git a/README.md b/README.md index 63658a02c..fc12b7471 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ section in the ESP-Matter Programming Guide. ## Supported ESP-IDF and connectedhomeip versions - This SDK currently works with [v1.3-branch](https://github.com/espressif/connectedhomeip/tree/v1.3-branch) of connectedhomeip. -- For Matter projects development with this SDK, it is recommended to utilize ESP-IDF [v5.2.1](https://github.com/espressif/esp-idf/tree/v5.2.1). +- For Matter projects development with this SDK, it is recommended to utilize ESP-IDF [v5.2.3](https://github.com/espressif/esp-idf/tree/v5.2.3). ## Documentation diff --git a/connectedhomeip/connectedhomeip b/connectedhomeip/connectedhomeip index bfc4bac20..b8bb015a5 160000 --- a/connectedhomeip/connectedhomeip +++ b/connectedhomeip/connectedhomeip @@ -1 +1 @@ -Subproject commit bfc4bac20ca1df12c7a404336d90900ebadb9fe3 +Subproject commit b8bb015a5ac95650d1b0624089fca77ba089344b diff --git a/docs/en/developing.rst b/docs/en/developing.rst index d84cab41d..6c96e3f45 100644 --- a/docs/en/developing.rst +++ b/docs/en/developing.rst @@ -62,7 +62,7 @@ Cloning esp-idf: :: git clone --recursive https://github.com/espressif/esp-idf.git - cd esp-idf; git checkout v5.2.1; git submodule update --init --recursive; + cd esp-idf; git checkout v5.2.3; git submodule update --init --recursive; ./install.sh cd .. diff --git a/docs/en/security.rst b/docs/en/security.rst index 31d3b9963..54ded72fb 100644 --- a/docs/en/security.rst +++ b/docs/en/security.rst @@ -1,7 +1,7 @@ 5. Security Considerations ========================== -{IDF_TARGET_RELEASE:default="v5.2.1"} +{IDF_TARGET_RELEASE:default="v5.2.3"} 5.1 Overview ------------ diff --git a/examples/controller/sdkconfig.defaults b/examples/controller/sdkconfig.defaults index 6f904548f..4f63fbac0 100644 --- a/examples/controller/sdkconfig.defaults +++ b/examples/controller/sdkconfig.defaults @@ -12,6 +12,7 @@ CONFIG_BT_NIMBLE_ENABLED=y #enable lwip ipv6 autoconfig CONFIG_LWIP_IPV6_AUTOCONFIG=y +CONFIG_LWIP_IPV6_NUM_ADDRESSES=12 # Use a custom partition table CONFIG_PARTITION_TABLE_CUSTOM=y diff --git a/examples/controller/sdkconfig.defaults.otbr b/examples/controller/sdkconfig.defaults.otbr index 25ed99205..55e5d9fda 100644 --- a/examples/controller/sdkconfig.defaults.otbr +++ b/examples/controller/sdkconfig.defaults.otbr @@ -15,7 +15,7 @@ CONFIG_BT_NIMBLE_ENABLED=y #LwIP config for OpenThread CONFIG_LWIP_IPV6_AUTOCONFIG=y -CONFIG_LWIP_IPV6_NUM_ADDRESSES=8 +CONFIG_LWIP_IPV6_NUM_ADDRESSES=12 CONFIG_LWIP_MULTICAST_PING=y CONFIG_LWIP_IPV6_FORWARD=y CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y @@ -84,7 +84,7 @@ CONFIG_SPIRAM=y CONFIG_SPIRAM_SPEED_80M=y CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=512 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=8192 -CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=n +CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y # Enable HKDF for mbedtls diff --git a/tools/docker/chip_idf/Dockerfile b/tools/docker/chip_idf/Dockerfile index 61d8b0d60..352c3a23f 100644 --- a/tools/docker/chip_idf/Dockerfile +++ b/tools/docker/chip_idf/Dockerfile @@ -4,7 +4,7 @@ FROM ghcr.io/project-chip/chip-build:${VERSION} as build # Use IDF_CHECKOUT_REF to specify a tag, a branch or a specific commit ID. ARG IDF_CLONE_URL=https://github.com/espressif/esp-idf.git -ARG IDF_CHECKOUT_REF=v5.2.1 +ARG IDF_CHECKOUT_REF=v5.2.3 RUN set -x \ && mkdir -p /tmp/esp-idf \