Commit eb78b719 authored by Andrzej Głąbek's avatar Andrzej Głąbek Committed by David Leach
Browse files

soc: arm: nordic_nrf: Clean up and unify a bit cmake code 



Consistently use `zephyr_library*` cmake functions for all nRF Series
and set the Cortex-M linker script in a common place for all of them.
Remove no longer needed include directories.

Signed-off-by: default avatarAndrzej Głąbek <andrzej.glabek@nordicsemi.no>
parent d30265b2

soc/arm/nordic_nrf/CMakeLists.txt

+3 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: Apache-2.0



zephyr_library()



add_subdirectory(${SOC_SERIES})

add_subdirectory(common)



zephyr_sources(

zephyr_library_sources(

  validate_base_addresses.c

  validate_enabled_instances.c

  )

soc/arm/nordic_nrf/common/CMakeLists.txt

+4 −1
Original line number Diff line number Diff line
@@ -3,10 +3,13 @@ 


zephyr_library_sources_ifdef(CONFIG_SOC_FAMILY_NRF soc_nrf_common.S)

zephyr_library_sources_ifdef(CONFIG_POWEROFF poweroff.c)



zephyr_include_directories(.)



set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")



if (CONFIG_TFM_PARTITION_PLATFORM)

  zephyr_sources(soc_secure.c)

  zephyr_library_sources(soc_secure.c)

  zephyr_library_include_directories(

    $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include

  )

soc/arm/nordic_nrf/nrf51/CMakeLists.txt

+1 −12
Original line number Diff line number Diff line 
# SPDX-License-Identifier: Apache-2.0



zephyr_library()



zephyr_library_sources(

  soc.c

  )



zephyr_library_include_directories(

  ${ZEPHYR_BASE}/kernel/include

  ${ZEPHYR_BASE}/arch/arm/include

  )



set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")
 
zephyr_library_sources(soc.c)

soc/arm/nordic_nrf/nrf52/CMakeLists.txt

+1 −12
Original line number Diff line number Diff line 
# SPDX-License-Identifier: Apache-2.0



zephyr_library()



zephyr_library_sources(

  soc.c

  )



zephyr_library_include_directories(

  ${ZEPHYR_BASE}/kernel/include

  ${ZEPHYR_BASE}/arch/arm/include

  )

zephyr_library_sources(soc.c)



if(CONFIG_SOC_NRF52832_ALLOW_SPIM_DESPITE_PAN_58 AND CONFIG_SPI_NRFX_SPIM)

  message(WARNING "Both SOC_NRF52832_ALLOW_SPIM_DESPITE_PAN_58 and an NRF SPIM driver are enabled, therefore PAN 58 will apply if RXD.MAXCNT == 1 and TXD.MAXCNT <= 1")
@@ -22,5 +13,3 @@ if(CONFIG_SOC_NRF52832) 
    endif()

  endif()

endif()
 


set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")

soc/arm/nordic_nrf/nrf53/CMakeLists.txt

+2 −8
Original line number Diff line number Diff line 
# SPDX-License-Identifier: Apache-2.0



zephyr_sources(

  soc.c

  )

zephyr_library_sources(soc.c)



zephyr_library_sources_ifdef(CONFIG_NRF53_SYNC_RTC

  sync_rtc.c

  )

zephyr_library_sources_ifdef(CONFIG_NRF53_SYNC_RTC sync_rtc.c)



if (CONFIG_SOC_NRF53_ANOMALY_160_WORKAROUND_NEEDED AND

    NOT CONFIG_SYS_CLOCK_EXISTS)
@@ -19,5 +15,3 @@ if (CONFIG_SOC_NRF53_ANOMALY_160_WORKAROUND_NEEDED AND 
    At your own risk, you can suppress this warning by setting

    CONFIG_SOC_NRF53_ANOMALY_160_WORKAROUND_NEEDED=n.")

endif()
 


set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")

CRA Git | Maintained and supported by SUSTech CRA and CCSE