samples: benchmark: coremark: Fix upmerge issues

Signed-off-by: Aleksander Strzebonski <aleksander.strzebonski@nordicsemi.no>
gmarull · Apr 25, 2024 · d2a9c07 · d2a9c07
1 parent 627259e
commit d2a9c07
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/samples/benchmarks/coremark/README.rst b/samples/benchmarks/coremark/README.rst
@@ -157,7 +157,7 @@ After programming the sample to your development kit, complete the following ste
  .. code-block:: console
 
  *** Booting Zephyr OS build bf606fc00ec1 ***
- [00:00:00.502,166] <inf> app: Coremark sample for nrf52dk_nrf52832. Call address: 00007fa1
+ [00:00:00.502,166] <inf> app: Coremark sample for nrf52dk/nrf52832. Call address: 00007fa1
  [00:00:00.502,197] <inf> app: Press Push button switch 0 to start the test ...
  [00:00:14.483,764] <inf> app: Push button switch 0 pressed!
  [00:00:14.511,627] <inf> app: Coremark started!

diff --git a/samples/benchmarks/coremark/boards/Kconfig.sysbuild_boards b/samples/benchmarks/coremark/boards/Kconfig.sysbuild_boards
@@ -4,13 +4,13 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-if $(BOARD) = "nrf5340dk_nrf5340_cpuapp"
+if BOARD_NRF5340DK_NRF5340_CPUAPP
 
 config APP_CPUNET_RUN
  bool "Run the CoreMark benchmark on the nRF5340 Network Core"
  default y
 
 config IMAGE_2_BOARD
- default "nrf5340dk_nrf5340_cpunet" if APP_CPUNET_RUN
+ default "nrf5340dk/nrf5340/cpunet" if APP_CPUNET_RUN
 
 endif
diff --git a/samples/benchmarks/coremark/sample.yaml b/samples/benchmarks/coremark/sample.yaml
@@ -38,7 +38,7 @@ tests:
  - nrf5340dk/nrf5340/cpuapp
  tags: ci_build
  extra_args: EXTRA_CONF_FILE="prj_heap_memory.conf"
- coremark_nrf5340dk_nrf5340_cpunet_EXTRA_CONF_FILE="prj_heap_memory.conf"
+ coremark_image_2_board_EXTRA_CONF_FILE="prj_heap_memory.conf"
  sample.benchmark.coremark_static:
  sysbuild: true
  build_only: true

diff --git a/samples/benchmarks/coremark/src/main.c b/samples/benchmarks/coremark/src/main.c
@@ -125,7 +125,7 @@ static int button_init(void)
 
 int main(void)
 {
- LOG_INF("CoreMark sample for %s", CONFIG_BOARD);
+ LOG_INF("CoreMark sample for %s", CONFIG_BOARD_TARGET);
 
  if (IS_ENABLED(CONFIG_APP_MODE_FLASH_AND_RUN)) {
  (void)atomic_set(&coremark_in_progress, true);

diff --git a/samples/benchmarks/coremark/sysbuild.cmake b/samples/benchmarks/coremark/sysbuild.cmake
@@ -8,7 +8,7 @@ include_guard(GLOBAL)
 if(NOT SB_CONFIG_IMAGE_2_BOARD STREQUAL "")
 
  ExternalZephyrProject_Add(
- APPLICATION coremark_${SB_CONFIG_IMAGE_2_BOARD}
+ APPLICATION coremark_image_2_board
  SOURCE_DIR ${APP_DIR}
  BOARD ${SB_CONFIG_IMAGE_2_BOARD}
  BOARD_REVISION ${BOARD_REVISION}
@@ -19,7 +19,7 @@ endif()
 if(NOT SB_CONFIG_IMAGE_3_BOARD STREQUAL "")
 
  ExternalZephyrProject_Add(
- APPLICATION coremark_${SB_CONFIG_IMAGE_3_BOARD}
+ APPLICATION coremark_image_3_board
  SOURCE_DIR ${APP_DIR}
  BOARD ${SB_CONFIG_IMAGE_3_BOARD}
  BOARD_REVISION ${BOARD_REVISION}