diff options
| author | Trygve Laugstøl <trygvis@inamo.no> | 2016-09-13 07:49:25 +0200 |
|---|---|---|
| committer | Trygve Laugstøl <trygvis@inamo.no> | 2016-09-13 07:49:25 +0200 |
| commit | 779987c9eddfe219d0775a03141be54f6822c89e (patch) | |
| tree | db518d329d7ff718b03352af99cebfd6792b0f5a /mcu.cmake | |
| parent | 94797ba0604f52bfdbe6ade2cb29724a05c17c57 (diff) | |
| download | mcu.cmake-779987c9eddfe219d0775a03141be54f6822c89e.tar.gz mcu.cmake-779987c9eddfe219d0775a03141be54f6822c89e.tar.bz2 mcu.cmake-779987c9eddfe219d0775a03141be54f6822c89e.tar.xz mcu.cmake-779987c9eddfe219d0775a03141be54f6822c89e.zip | |
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.
Diffstat (limited to 'mcu.cmake')
| -rw-r--r-- | mcu.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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) |