Merge remote-tracking branch 'upstream/master' into bump_CI_images

Author: jlatusek

.github/workflows/examples-cc13xx_26xx.yaml

@@ -17,16 +17,19 @@ name: Build example - TI CC13XX_26XX
 on:
     push:
         branches-ignore:
-            - 'dependabot/**'
+            - "dependabot/**"
     pull_request:
     merge_group:
 
 concurrency:
-    group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
+    group:
+        ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name ==
+        'pull_request' && github.event.number) || (github.event_name ==
+        'workflow_dispatch' && github.run_number) || github.sha }}
     cancel-in-progress: true
 env:
     CHIP_NO_LOG_TIMESTAMPS: true
-    
+
 jobs:
     cc13xx_26xx:
         name: cc13xx_26xx
@@ -47,13 +50,14 @@ jobs:
             - name: Checkout submodules & Bootstrap
               uses: ./.github/actions/checkout-submodules-and-bootstrap
               with:
-                platform: cc13xx_26xx
+                  platform: cc13xx_26xx
+                  extra-submodule-parameters: " --recursive"
             - name: Set up environment for size reports
               uses: ./.github/actions/setup-size-reports
               if: ${{ !env.ACT }}
               with:
-                gh-context: ${{ toJson(github) }}
-        
+                  gh-context: ${{ toJson(github) }}
+
             - name: Build examples
               run: |
                   scripts/run_in_build_env.sh "\
@@ -103,4 +107,4 @@ jobs:
               uses: ./.github/actions/upload-size-reports
               if: ${{ !env.ACT }}
               with:
-                platform-name: cc13x4_26x4
+                  platform-name: cc13x4_26x4

config/esp32/components/chip/CMakeLists.txt

@@ -118,7 +118,11 @@ chip_gn_arg_append("chip_config_network_layer_ble"           "false")
 endif()
 
 if(CONFIG_DISABLE_IPV4)
-    chip_gn_arg_append("chip_inet_config_enable_ipv4"        "false")
+    if(NOT CONFIG_LWIP_IPV4)
+        chip_gn_arg_append("chip_inet_config_enable_ipv4"        "false")
+    else()
+	message(FATAL_ERROR "Please also disable config option CONFIG_LWIP_IPV4")
+    endif()
 endif()
 
 if(CONFIG_DISABLE_READ_CLIENT)