From 779987c9eddfe219d0775a03141be54f6822c89e Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Tue, 13 Sep 2016 07:49:25 +0200 Subject: o Renaming everything from nRF51 to nRF5x to better match the SDK. o Using the correct startup code based on chip family. o Adding -flash and -softdevice-flash goals if nrfjprog is available. --- mcu.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mcu.cmake') diff --git a/mcu.cmake b/mcu.cmake index 1c482f1..df06a26 100644 --- a/mcu.cmake +++ b/mcu.cmake @@ -1,7 +1,10 @@ if (NOT MCU_CHIP) message(FATAL_ERROR "Missing required argument CHIP.") elseif (MCU_CHIP MATCHES "nrf5.*") - set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/nrf51.cmake") + set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/nrf5x.cmake") + + include(${CMAKE_CURRENT_LIST_DIR}/nrf5x/nrfjprog.cmake) + include(${CMAKE_CURRENT_LIST_DIR}/nrf5x/utils.cmake) elseif (MCU_CHIP MATCHES D2000) set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/intel-quark-d2000.toolchain.cmake") else () @@ -9,4 +12,3 @@ else () endif () include(${CMAKE_CURRENT_LIST_DIR}/mcu_include_directories_from_sources.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/nrf51/nrfjprog.cmake) -- cgit v1.2.3