diff --git a/examples/light-switch-app/efr32/BUILD.gn b/examples/light-switch-app/efr32/BUILD.gn index cb390ccb3a7d7d..6e3d588c974ce7 100644 --- a/examples/light-switch-app/efr32/BUILD.gn +++ b/examples/light-switch-app/efr32/BUILD.gn @@ -62,7 +62,7 @@ declare_args() { disable_lcd = false # Argument to Disable IPv4 for wifi(rs911) - chip_disable_wifi_ipv4 = false + chip_enable_wifi_ipv4 = false } declare_args() { @@ -222,8 +222,8 @@ efr32_executable("light_switch_app") { sources += [ "${examples_plat_dir}/OTAConfig.cpp" ] } - if (chip_disable_wifi_ipv4) { - defines += [ "WIFI_IPV4_DISABLED" ] + if (chip_enable_wifi_ipv4) { + defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ] } # WiFi Settings diff --git a/examples/lighting-app/efr32/BUILD.gn b/examples/lighting-app/efr32/BUILD.gn index 56f0cf92688cf8..557e05b3b833af 100644 --- a/examples/lighting-app/efr32/BUILD.gn +++ b/examples/lighting-app/efr32/BUILD.gn @@ -62,7 +62,7 @@ declare_args() { disable_lcd = false # Argument to Disable IPv4 for wifi(rs911) - chip_disable_wifi_ipv4 = false + chip_enable_wifi_ipv4 = false } declare_args() { @@ -217,8 +217,8 @@ efr32_executable("lighting_app") { sources += [ "${examples_plat_dir}/OTAConfig.cpp" ] } - if (chip_disable_wifi_ipv4) { - defines += [ "WIFI_IPV4_DISABLED" ] + if (chip_enable_wifi_ipv4) { + defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ] } # WiFi Settings diff --git a/examples/lock-app/efr32/BUILD.gn b/examples/lock-app/efr32/BUILD.gn index 4add2a9528504b..2dec5b59cbba71 100644 --- a/examples/lock-app/efr32/BUILD.gn +++ b/examples/lock-app/efr32/BUILD.gn @@ -62,7 +62,7 @@ declare_args() { disable_lcd = false # Argument to Disable IPv4 for wifi(rs911) - chip_disable_wifi_ipv4 = false + chip_enable_wifi_ipv4 = false } declare_args() { @@ -219,8 +219,8 @@ efr32_executable("lock_app") { sources += [ "${examples_plat_dir}/OTAConfig.cpp" ] } - if (chip_disable_wifi_ipv4) { - defines += [ "WIFI_IPV4_DISABLED" ] + if (chip_enable_wifi_ipv4) { + defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ] } # WiFi Settings diff --git a/examples/window-app/efr32/BUILD.gn b/examples/window-app/efr32/BUILD.gn index c526f50cbf9204..d217a317271cf1 100644 --- a/examples/window-app/efr32/BUILD.gn +++ b/examples/window-app/efr32/BUILD.gn @@ -55,7 +55,7 @@ declare_args() { disable_lcd = false # Argument to Disable IPv4 for wifi(rs911) - chip_disable_wifi_ipv4 = false + chip_enable_wifi_ipv4 = false } declare_args() { @@ -206,8 +206,8 @@ efr32_executable("window_app") { sources += [ "${examples_plat_dir}/OTAConfig.cpp" ] } - if (chip_disable_wifi_ipv4) { - defines += [ "WIFI_IPV4_DISABLED" ] + if (chip_enable_wifi_ipv4) { + defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ] } # WiFi Settings diff --git a/scripts/examples/gn_efr32_example.sh b/scripts/examples/gn_efr32_example.sh index 1c5d3567f9d097..59185701c237db 100755 --- a/scripts/examples/gn_efr32_example.sh +++ b/scripts/examples/gn_efr32_example.sh @@ -137,8 +137,8 @@ else optArgs+="enable_sleepy_device=true chip_openthread_ftd=false " shift ;; - --chip_disable_wifi_ipv4) - optArgs+="chip_disable_wifi_ipv4=true " + --chip_enable_wifi_ipv4) + optArgs+="chip_enable_wifi_ipv4=true " shift ;; *) diff --git a/src/platform/EFR32/CHIPDevicePlatformConfig.h b/src/platform/EFR32/CHIPDevicePlatformConfig.h index 3ed54b28e03221..f11cd7a560429e 100644 --- a/src/platform/EFR32/CHIPDevicePlatformConfig.h +++ b/src/platform/EFR32/CHIPDevicePlatformConfig.h @@ -50,11 +50,9 @@ #if defined(SL_WIFI) -#if defined(WIFI_IPV4_DISABLED) +#ifndef CHIP_DEVICE_CONFIG_ENABLE_IPV4 #define CHIP_DEVICE_CONFIG_ENABLE_IPV4 0 -#else /* !WIFI_IPV4_DISABLED */ -#define CHIP_DEVICE_CONFIG_ENABLE_IPV4 1 -#endif /* WIFI_IPV4_DISABLED */ +#endif /* CHIP_DEVICE_CONFIG_ENABLE_IPV4 */ #endif /* SL_WIFI */ diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support index 30833b582a73f7..4a46b449dd207d 160000 --- a/third_party/silabs/matter_support +++ b/third_party/silabs/matter_support @@ -1 +1 @@ -Subproject commit 30833b582a73f73737cbf3df2556184c3728555e +Subproject commit 4a46b449dd207d5f72dc4da8e02ff7a2a4ca2a6e