michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: Move MDK-defines from 'soc' to the MDK build script

Browse source 
The build script ext/hal/nordic/CMakeLists.txt manages the MDK
dependency. The MDK is not aware of Zephyr and uses it's own defines
to indicate what HW we are building for.

This commit moves these MDK-specific defines out of the 'soc' build
scripts and into the MDK build script where they belong.

This is expected to be a pure refactoring without side-effects.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
This commit is contained in:
Sebastian Bøe 2018-10-23 12:00:47 +02:00 • committed by Carles Cufí
commit c4266a8cd2
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/hal/nordic/CMakeLists.txt
View file

@ -11,6 +11,12 @@ if(CONFIG_HAS_NRFX)
zephyr_include_directories(nrfx/mdk)
zephyr_include_directories(.)
# Define MDK defines globally
zephyr_compile_definitions_ifdef(CONFIG_SOC_SERIES_NRF51X NRF51)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF52810 NRF52810_XXAA)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF52832 NRF52832_XXAA)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF52840 NRF52840_XXAA)
zephyr_sources_ifdef(CONFIG_SOC_SERIES_NRF51X nrfx/mdk/system_nrf51.c)
zephyr_sources_ifdef(CONFIG_SOC_NRF52810 nrfx/mdk/system_nrf52810.c)
zephyr_sources_ifdef(CONFIG_SOC_NRF52832 nrfx/mdk/system_nrf52.c)

3
soc/arm/nordic_nrf/nrf51/CMakeLists.txt
View file

@ -1,6 +1,7 @@
# NB: The define 'NRF51822' is deprecated. 'NRF51' should be used in
# it's place.
zephyr_compile_definitions_ifdef(
CONFIG_SOC_SERIES_NRF51X
NRF51
NRF51822
)

4
soc/arm/nordic_nrf/nrf52/CMakeLists.txt
View file

@ -1,7 +1,3 @@
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF52810 NRF52810_XXAA)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF52832 NRF52832_XXAA)
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF52840 NRF52840_XXAA)
zephyr_sources(
power.c
soc.c