diff --git a/config/nrfconnect/chip-module/CMakeLists.txt b/config/nrfconnect/chip-module/CMakeLists.txt index 2f87e4b01c..d0f84bcd69 100644 --- a/config/nrfconnect/chip-module/CMakeLists.txt +++ b/config/nrfconnect/chip-module/CMakeLists.txt @@ -196,7 +196,7 @@ endif() if (BOARD STREQUAL "native_posix") matter_add_gn_arg_string("target_cpu" "x86") -elseif (BOARD STREQUAL "native_posix_64") +elseif (BOARD STREQUAL "native_posix/native/64") matter_add_gn_arg_string("target_cpu" "x64") endif() diff --git a/config/nxp/chip-module/CMakeLists.txt b/config/nxp/chip-module/CMakeLists.txt index 5024672e14..12514adcc7 100644 --- a/config/nxp/chip-module/CMakeLists.txt +++ b/config/nxp/chip-module/CMakeLists.txt @@ -132,7 +132,7 @@ endif() # if (BOARD STREQUAL "native_posix") # matter_add_gn_arg_string("target_cpu" "x86") -# elseif (BOARD STREQUAL "native_posix_64") +# elseif (BOARD STREQUAL "native_posix/native/64") # matter_add_gn_arg_string("target_cpu" "x64") # endif() diff --git a/config/zephyr/chip-module/CMakeLists.txt b/config/zephyr/chip-module/CMakeLists.txt index fb94465b77..2bcf0de54f 100644 --- a/config/zephyr/chip-module/CMakeLists.txt +++ b/config/zephyr/chip-module/CMakeLists.txt @@ -110,7 +110,7 @@ if(CONFIG_CHIP) if(BOARD STREQUAL "native_posix") matter_add_gn_arg_string("target_cpu" "x86") - elseif(BOARD STREQUAL "native_posix_64") + elseif(BOARD STREQUAL "native_posix/native/64") matter_add_gn_arg_string("target_cpu" "x64") endif() diff --git a/scripts/build/builders/nrf.py b/scripts/build/builders/nrf.py index 5fbc417ffe..4e12e1e9ed 100644 --- a/scripts/build/builders/nrf.py +++ b/scripts/build/builders/nrf.py @@ -128,7 +128,7 @@ def GnArgName(self): elif self == NrfBoard.NRF5340DK: return 'nrf5340dk_nrf5340_cpuapp' elif self == NrfBoard.NATIVE_POSIX_64: - return 'native_posix_64' + return 'native_posix/native/64' else: raise Exception('Unknown board type: %r' % self) diff --git a/src/test_driver/nrfconnect/CMakeLists.txt b/src/test_driver/nrfconnect/CMakeLists.txt index 750853ea25..7e154ffc04 100644 --- a/src/test_driver/nrfconnect/CMakeLists.txt +++ b/src/test_driver/nrfconnect/CMakeLists.txt @@ -18,7 +18,7 @@ # @file # CMake project for building and running selected CHIP unit tests using # 'nrfconnect' platform integration layer in CHIP and Zephyr -# 'native_posix[_64]' platforms. Note that certain design decisions behind +# 'native_posix[/native/64]' platforms. Note that certain design decisions behind # the native_posix platforms make them inapplicable for some unit tests, # hence only a subset of CHIP unit tests is listed in the project. # See: https://docs.zephyrproject.org/1.12.0/boards/posix/native_posix/doc/board.html