michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples: drivers: mbox: Fix usage of board name checking

Browse source 
Fixes using outdated hwmv1 board name checking with proper board
defines

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This commit is contained in:
Jamie McCrae 2024-03-20 08:50:29 +00:00 • committed by Carles Cufí
commit 61eee06b54
3 changed files with 23 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

18
samples/drivers/mbox/CMakeLists.txt
View file

@ -11,18 +11,16 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
set(REMOTE_ZEPHYR_DIR ${CMAKE_CURRENT_BINARY_DIR}/../remote/zephyr) set(REMOTE_ZEPHYR_DIR ${CMAKE_CURRENT_BINARY_DIR}/../remote/zephyr)
if(("${BOARD}" STREQUAL "nrf5340dk") OR if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP OR
("${BOARD}${BOARD_QUALIFIERS}" STREQUAL "nrf5340bsim/nrf5340/cpuapp") OR CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUAPP OR
("${BOARD}" STREQUAL "nrf5340bsim_nrf5340_cpuapp") OR CONFIG_BOARD_ADP_XC7K_AE350 OR
("${BOARD}" STREQUAL "adp_xc7k") OR CONFIG_BOARD_MIMXRT1170_EVK_MIMXRT1176_CM7 OR
("${BOARD}" STREQUAL "mimxrt1170_evkb") OR CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM7 OR
("${BOARD}" STREQUAL "mimxrt1170_evk") OR CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU0 OR
("${BOARD}" STREQUAL "mimxrt1160_evk") OR CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP)
("${BOARD}" STREQUAL "lpcxpresso55s69") OR
("${BOARD}" STREQUAL "nrf54h20dk"))
message(STATUS "${BOARD}${BOARD_QUALIFIERS} compile as Main in this sample") message(STATUS "${BOARD}${BOARD_QUALIFIERS} compile as Main in this sample")
else() else()
message(FATAL_ERROR "${BOARD} is not supported for this sample") message(FATAL_ERROR "${BOARD}${BOARD_QUALIFIERS} is not supported for this sample")
endif() endif()
project(mbox_ipc) project(mbox_ipc)

18
samples/drivers/mbox/remote/CMakeLists.txt
View file

@ -9,18 +9,16 @@ cmake_minimum_required(VERSION 3.20.0)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
if(("${BOARD}" STREQUAL "nrf5340dk") OR if(CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET OR
("${BOARD}" STREQUAL "nrf5340bsim") OR CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUNET OR
("${BOARD}" STREQUAL "nrf5340bsim_nrf5340_cpunet") OR CONFIG_BOARD_ADP_XC7K_AE350 OR
("${BOARD}" STREQUAL "mimxrt1170_evkb") OR CONFIG_BOARD_MIMXRT1170_EVK_MIMXRT1176_CM4 OR
("${BOARD}" STREQUAL "mimxrt1170_evk") OR CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM4 OR
("${BOARD}" STREQUAL "mimxrt1160_evk") OR CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU1 OR
("${BOARD}" STREQUAL "lpcxpresso55s69") OR CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUPPR)
("${BOARD}" STREQUAL "adp_xc7k") OR
("${BOARD}" STREQUAL "nrf54h20dk"))
message(STATUS "${BOARD}${BOARD_QUALIFIERS} compile as remote in this sample") message(STATUS "${BOARD}${BOARD_QUALIFIERS} compile as remote in this sample")
else() else()
message(FATAL_ERROR "${BOARD} is not supported for this sample") message(FATAL_ERROR "${BOARD}${BOARD_QUALIFIERS} is not supported for this sample")
endif() endif()
project(mbox_ipc_remote) project(mbox_ipc_remote)

15
samples/drivers/mbox/sysbuild.cmake
View file

@ -20,13 +20,12 @@ native_simulator_set_child_images(${DEFAULT_IMAGE} ${REMOTE_APP})
native_simulator_set_final_executable(${DEFAULT_IMAGE}) native_simulator_set_final_executable(${DEFAULT_IMAGE})
if ("${BOARD}" STREQUAL "mimxrt1170_evk" OR if(SB_CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM7 OR
"${BOARD}" STREQUAL "mimxrt1160_evk" OR SB_CONFIG_BOARD_MIMXRT1170_EVK_MIMXRT1176_CM7 OR
"${BOARD}" STREQUAL "lpcxpresso55s69" SB_CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU0)
) # For these NXP boards the main core application is dependent on
# For these NXP boards the main core application is dependent on # 'zephyr_image_info.h' generated by remote application.
# 'zephyr_image_info.h' generated by remote application.
# Let's build the remote application first # Let's build the remote application first
add_dependencies(${DEFAULT_IMAGE} ${REMOTE_APP}) add_dependencies(${DEFAULT_IMAGE} ${REMOTE_APP})
endif() endif()