michaelh/zephyr
1
0
Fork 0
Code Releases Activity

nrf52_bsim: Support full include paths of nrfx hal files

Browse source 
In #10543 some include directives are modified to include some
folders in the path to the nrfx hal headers.
This would break things with the previous nRF52 HW models as the
replacement hal files were not placed in a folder matching that
path, and the include path was not pointing directly at the folder
containing the files.
Therefore, require the latest HW models version (which replicates
that folder structure), and add a new -I for the compiler 2 folders
higher.

Signed-off-by: Alberto Escolar Piedras <alpi@oticon.com>
This commit is contained in:
Alberto Escolar Piedras 2018-11-09 13:27:15 +01:00 • committed by Anas Nashif
commit 5b5bd09d5b
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
boards/posix/nrf52_bsim/CMakeLists.txt
View file

@ -58,7 +58,8 @@ zephyr_library_compile_definitions(NO_POSIX_CHEATS)
zephyr_include_directories( zephyr_include_directories(
fake fake
$ENV{BSIM_COMPONENTS_PATH}/ext_NRF52_hw_models/src/nrfx_hal/ $ENV{BSIM_COMPONENTS_PATH}/ext_NRF52_hw_models/src/
$ENV{BSIM_COMPONENTS_PATH}/ext_NRF52_hw_models/src/nrfx/hal/
$ENV{BSIM_COMPONENTS_PATH}/ext_NRF52_hw_models/src/HW_models/ $ENV{BSIM_COMPONENTS_PATH}/ext_NRF52_hw_models/src/HW_models/
) )

2
boards/posix/nrf52_bsim/hw_models_version
View file

@ -1 +1 @@
v1.0 v1.1