nrfconnect: bypass support for IPv4

This change allows to build nrfconnect SDK samples with Matter over IPv6 but IPv4 still available for third party development within the same application. Signed-off-by: Marcin Kajor <[email protected]>
project-chip · Jul 10, 2023 · b54920b · b54920b
1 parent 488aabf
commit b54920b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/config/nrfconnect/chip-module/CMakeLists.txt b/config/nrfconnect/chip-module/CMakeLists.txt
@@ -122,7 +122,11 @@ matter_add_gn_arg_bool  ("chip_logging"                           CONFIG_LOG)
 matter_add_gn_arg_bool  ("chip_enable_openthread"                 CONFIG_NET_L2_OPENTHREAD)
 matter_add_gn_arg_bool  ("chip_openthread_ftd"                    CONFIG_OPENTHREAD_FTD)
 matter_add_gn_arg_bool  ("chip_config_network_layer_ble"          CONFIG_BT)
+if (CONFIG_CHIP_BYPASS_IPV4)
+matter_add_gn_arg_bool  ("chip_inet_config_enable_ipv4"           FALSE)
+else()
 matter_add_gn_arg_bool  ("chip_inet_config_enable_ipv4"           CONFIG_NET_IPV4)
+endif()
 matter_add_gn_arg_bool  ("chip_enable_nfc"                        CONFIG_CHIP_NFC_COMMISSIONING)
 matter_add_gn_arg_bool  ("chip_enable_ota_requestor"              CONFIG_CHIP_OTA_REQUESTOR)
 matter_add_gn_arg_bool  ("chip_persist_subscriptions"             CONFIG_CHIP_PERSISTENT_SUBSCRIPTIONS)

diff --git a/config/nrfconnect/chip-module/Kconfig b/config/nrfconnect/chip-module/Kconfig
@@ -251,3 +251,11 @@ config CHIP_LOG_SIZE_OPTIMIZATION
 	  information that is too detailed to be used in most cases. You can find
 	  full configuration enabled by this option in the
 	  platform/nrfconnect/CHIPPlatformConfig.h file.
+
+config CHIP_BYPASS_IPV4
+	bool "Disable forwaring of the NET_IPV4 to the Matter stack"
+	default y
+	help
+	  Allows to build nrfconnec SDK application using both Matter stack
+	  and Zephyr's NET_IPV4 module without compiling Matter SDK code which
+	  implements IPv4 support in Matter.