Revert "Merge CSA V1.4 branch in our release_2.6-1.4 (#449)"

This reverts commit d21730b.

Author: jmartinez-silabs

.github/.wordlist.txt

@@ -326,7 +326,6 @@ CurrentHue
 CurrentLevel
 CurrentSaturation
 customAcl
-customizable
 customizations
 cvfJ
 cxx
@@ -1040,7 +1039,6 @@ otatesting
 otaURL
 OTBR
 otcli
-OU
 outform
 outgoingCommands
 overridable
@@ -1152,7 +1150,6 @@ PyObject
 pypi
 PyRun
 pytest
-PYTHONPATH
 QEMU
 Qorvo
 QPG
@@ -1329,7 +1326,6 @@ SRP
 SRV
 SSBL
 SSID
-SSL
 startoffset
 StartScan
 startsWith
@@ -1494,7 +1490,6 @@ unfocus
 Unicast
 UniFlash
 UnitLocalization
-unittest
 unpair
 unprovisioned
 Unsecure

.github/workflows/tests.yaml

@@ -497,7 +497,6 @@ jobs:
                       --target linux-x64-fabric-admin-rpc-ipv6only-clang \
                       --target linux-x64-fabric-bridge-rpc-ipv6only-no-ble-no-wifi-clang \
                       --target linux-x64-light-data-model-no-unique-id-ipv6only-no-ble-no-wifi-clang \
-                      --target linux-x64-terms-and-conditions \
                       --target linux-x64-python-bindings \
                       build \
                       --copy-artifacts-to objdir-clone \
@@ -515,7 +514,6 @@ jobs:
                   echo "FABRIC_ADMIN_APP: out/linux-x64-fabric-admin-rpc-ipv6only-clang/fabric-admin" >> /tmp/test_env.yaml
                   echo "FABRIC_BRIDGE_APP: out/linux-x64-fabric-bridge-rpc-ipv6only-no-ble-no-wifi-clang/fabric-bridge-app" >> /tmp/test_env.yaml
                   echo "LIGHTING_APP_NO_UNIQUE_ID: out/linux-x64-light-data-model-no-unique-id-ipv6only-no-ble-no-wifi-clang/chip-lighting-app" >> /tmp/test_env.yaml
-                  echo "TERMS_AND_CONDITIONS_APP: out/linux-x64-terms-and-conditions/chip-terms-and-conditions-app" >> /tmp/test_env.yaml
                   echo "TRACE_APP: out/trace_data/app-{SCRIPT_BASE_NAME}" >> /tmp/test_env.yaml
                   echo "TRACE_TEST_JSON: out/trace_data/test-{SCRIPT_BASE_NAME}" >> /tmp/test_env.yaml
                   echo "TRACE_TEST_PERFETTO: out/trace_data/test-{SCRIPT_BASE_NAME}" >> /tmp/test_env.yaml
@@ -532,7 +530,6 @@ jobs:
                   scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestConformanceTest.py'
                   scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestChoiceConformanceSupport.py'
                   scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestMatterTestingSupport.py'
-                  scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestSpecParsingSelection.py'
                   scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestSpecParsingSupport.py'
                   scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/test_testing/test_TC_ICDM_2_1.py'
                   scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/test_testing/test_IDM_10_4.py'

.vscode/launch.json

@@ -4,39 +4,6 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
-        {
-            "name": "Python: Mock Server Tests",
-            "type": "debugpy",
-            "request": "launch",
-            "module": "unittest",
-            "args": [
-                "${workspaceFolder}/integrations/mock_server/tests/test_mock_server.py"
-            ],
-            "env": {
-                "PYTHONPATH": "${workspaceFolder}/integrations/mock_server/src:${PYTHONPATH}"
-            },
-            "console": "integratedTerminal",
-            "cwd": "${workspaceFolder}"
-        },
-        {
-            "name": "Python Debugger: test_dcl_server",
-            "type": "debugpy",
-            "request": "launch",
-            "program": "${workspaceFolder}/integrations/mock_server/src/main.py",
-            "args": [
-                "--port",
-                "8443",
-                "--config",
-                "${workspaceFolder}/integrations/mock_server/configurations/server_config.json",
-                "--routing-config-dir",
-                "${workspaceFolder}/integrations/mock_server/configurations/fake_distributed_compliance_ledger",
-                "--cert",
-                "${workspaceFolder}/server.crt",
-                "--key",
-                "${workspaceFolder}/server.key"
-            ],
-            "console": "integratedTerminal"
-        },
         {
             "name": "Attach to running process",
             "type": "lldb",

config/esp32/components/chip/CMakeLists.txt

@@ -41,9 +41,9 @@ endif()
 
 if (NOT CMAKE_BUILD_EARLY_EXPANSION)
     if (CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE)
-        set(is_debug FALSE)
-    else()
         set(is_debug TRUE)
+    else()
+        set(is_debug FALSE)
     endif()
 endif()
 
@@ -252,10 +252,6 @@ if (CONFIG_ENABLE_OTA_REQUESTOR)
     chip_gn_arg_append("chip_enable_ota_requestor"                 "true")
 endif()
 
-if (CONFIG_ENABLE_ACCESS_RESTRICTIONS)
-    chip_gn_arg_append("chip_enable_access_restrictions"                 "true")
-endif()
-
 if (CONFIG_ENABLE_ROTATING_DEVICE_ID)
     chip_gn_arg_append("chip_enable_additional_data_advertising"   "true")
     chip_gn_arg_append("chip_enable_rotating_device_id"            "true")
@@ -397,6 +393,7 @@ externalproject_add(
     BUILD_COMMAND           ninja "esp32"
     INSTALL_COMMAND         ""
     BUILD_BYPRODUCTS        ${chip_libraries}
+    WORKING_DIRECTORY       ${CMAKE_CURRENT_LIST_DIR}
     DEPENDS                 args_gn
     BUILD_ALWAYS            1
 )
@@ -438,15 +435,7 @@ if(CONFIG_BT_ENABLED)
     if((target_name STREQUAL "esp32h2") OR (target_name STREQUAL "esp32c2") OR (target_name STREQUAL "esp32c6"))
         idf_component_get_property(bt_dir bt COMPONENT_DIR)
         list(APPEND chip_libraries $<TARGET_FILE:${bt_lib}>)
-        if (EXISTS ${bt_dir}/controller/lib_${target_name}/${target_name}-bt-lib/libble_app.a)
-            list(APPEND chip_libraries "${bt_dir}/controller/lib_${target_name}/${target_name}-bt-lib/libble_app.a")
-        elseif(EXISTS ${bt_dir}/controller/lib_${target_name}/${target_name}-bt-lib/${target_name}/libble_app.a)
-            list(APPEND chip_libraries "${bt_dir}/controller/lib_${target_name}/${target_name}-bt-lib/${target_name}/libble_app.a")
-	else()
-            message(WARNING "There is no libble_app.a in the given path")
-        endif()
-    elseif(target_name STREQUAL "esp32p4")
-        list(APPEND chip_libraries $<TARGET_FILE:${bt_lib}>)
+        list(APPEND chip_libraries "${bt_dir}/controller/lib_${target_name}/${target_name}-bt-lib/libble_app.a")
     else()
         list(APPEND chip_libraries $<TARGET_FILE:${bt_lib}> -lbtdm_app)
     endif()
@@ -525,12 +514,11 @@ endif()
 idf_component_get_property(lwip_lib lwip COMPONENT_LIB)
 list(APPEND chip_libraries $<TARGET_FILE:${lwip_lib}>)
 
-if (CONFIG_ESP32_WIFI_ENABLED OR CONFIG_IDF_TARGET_ESP32P4)
-    idf_component_get_property(esp_wifi_lib esp_wifi COMPONENT_LIB)
-    list(APPEND chip_libraries $<TARGET_FILE:${esp_wifi_lib}>)
-endif()
+
 if (CONFIG_ESP32_WIFI_ENABLED)
+    idf_component_get_property(esp_wifi_lib esp_wifi COMPONENT_LIB)
     idf_component_get_property(esp_wifi_dir esp_wifi COMPONENT_DIR)
+    list(APPEND chip_libraries $<TARGET_FILE:${esp_wifi_lib}>)
     if (CONFIG_IDF_TARGET_ESP32C2)
         set(blobs core net80211 pp)
     else()
@@ -556,7 +544,6 @@ list(APPEND chip_libraries $<TARGET_FILE:${esp_netif_lib}>)
 idf_component_get_property(esp_hw_support_lib esp_hw_support COMPONENT_LIB)
 list(APPEND chip_libraries $<TARGET_FILE:${esp_hw_support_lib}>)
 
-if (NOT CONFIG_IDF_TARGET_ESP32P4)
 idf_component_get_property(esp_phy_lib esp_phy COMPONENT_LIB)
 idf_component_get_property(esp_phy_dir esp_phy COMPONENT_DIR)
 list(APPEND chip_libraries $<TARGET_FILE:${esp_phy_lib}>)
@@ -571,12 +558,8 @@ endif()
 foreach(phy_blob ${phy_blobs})
     list(APPEND chip_libraries "${esp_phy_dir}/lib/${target_name}/lib${phy_blob}.a")
 endforeach()
-endif()
 
-set(components_to_link esp_event hal esp_system soc efuse vfs driver freertos esp_timer)
-if (NOT CONFIG_IDF_TARGET_ESP32P4)
-list(APPEND components_to_link esp_coex)
-endif()
+set(components_to_link esp_event hal esp_system soc efuse vfs driver esp_coex freertos esp_timer)
 idf_build_get_property(build_components BUILD_COMPONENTS)
 foreach(component ${components_to_link})
     # Some of the components are not present in IDF v4.x

config/esp32/components/chip/Kconfig

@@ -1406,12 +1406,4 @@ menu "CHIP Device Layer"
 
     endmenu
 
-    menu "Cluster Configuration Options"
-        config ENABLE_ACCESS_RESTRICTIONS
-            bool "Enable Access Restrictions of Access Control Cluster"
-            default n
-            help
-                Enable this option to enable Access Restrictions on the device.
-
-    endmenu
 endmenu

config/esp32/components/chip/idf_component.yml

@@ -7,7 +7,7 @@ dependencies:
             - if: "target != esp32h2"
 
     espressif/esp_secure_cert_mgr:
-        version: "^2.5.0"
+        version: "^2.3.0"
         rules:
             - if: "idf_version >=4.3"
 
@@ -18,14 +18,22 @@ dependencies:
             - if: "idf_version >=4.4"
 
     espressif/esp_insights:
-        version: "1.2.2"
+        version: "1.0.1"
         require: public
         # There is an issue with IDF-Component-Manager when ESP Insights is included.
         # Issue: https://github.com/project-chip/connectedhomeip/issues/29125
         rules:
             - if: "idf_version >=5.0"
             - if: "target != esp32h2"
 
+    # This matches the dependency of esp_insights
+    espressif/esp_diag_data_store:
+        version: "1.0.1"
+        require: public
+        rules:
+            - if: "idf_version >=5.0"
+            - if: "target != esp32h2"
+
     espressif/esp_rcp_update:
         version: "1.2.0"
         rules:
@@ -36,8 +44,3 @@ dependencies:
         require: public
         rules:
             - if: "idf_version >=4.3"
-
-    espressif/esp_wifi_remote:
-        version: ">=0.1.12"
-        rules:
-            - if: "target in [esp32p4]"