Skip to content

Commit e8dd200

Browse files
committed
move cmake folder to tools/
1 parent 6ecd480 commit e8dd200

File tree

9 files changed

+12
-73
lines changed

9 files changed

+12
-73
lines changed

.idea/vcs.xml

Lines changed: 0 additions & 61 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

hw/bsp/imxrt/family.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ if (NOT BOARD)
88
message(FATAL_ERROR "BOARD not specified")
99
endif ()
1010

11+
# TOP is path to root directory
12+
set(TOP "${CMAKE_CURRENT_LIST_DIR}/../../..")
13+
1114
# toolchain set up
1215
set(CMAKE_SYSTEM_PROCESSOR cortex-m7 CACHE INTERNAL "System Processor")
13-
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/../../../examples/cmake/toolchain/arm_${TOOLCHAIN}.cmake)
16+
set(CMAKE_TOOLCHAIN_FILE ${TOP}/tools/cmake/toolchain/arm_${TOOLCHAIN}.cmake)
1417

1518
set(FAMILY_MCUS MIMXRT CACHE INTERNAL "")
1619

@@ -24,9 +27,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}/board.cmake)
2427
# only need to be built ONCE for all examples
2528
set(BOARD_TARGET board_${BOARD})
2629
if (NOT TARGET ${BOARD_TARGET})
27-
# TOP is path to root directory
28-
set(TOP "${CMAKE_CURRENT_LIST_DIR}/../../..")
29-
3030
set(SDK_DIR ${TOP}/hw/mcu/nxp/mcux-sdk)
3131
set(CMSIS_DIR ${TOP}/lib/CMSIS_5)
3232

hw/bsp/lpc55/family.cmake

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,14 @@ if (NOT BOARD)
88
message(FATAL_ERROR "BOARD not specified")
99
endif ()
1010

11+
# TOP is path to root directory
12+
set(TOP "${CMAKE_CURRENT_LIST_DIR}/../../..")
13+
set(SDK_DIR ${TOP}/hw/mcu/nxp/mcux-sdk)
14+
set(CMSIS_DIR ${TOP}/lib/CMSIS_5)
15+
1116
# toolchain set up
1217
set(CMAKE_SYSTEM_PROCESSOR cortex-m33 CACHE INTERNAL "System Processor")
13-
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/../../../examples/cmake/toolchain/arm_${TOOLCHAIN}.cmake)
18+
set(CMAKE_TOOLCHAIN_FILE ${TOP}/tools/cmake/toolchain/arm_${TOOLCHAIN}.cmake)
1419

1520
set(FAMILY_MCUS LPC55XX CACHE INTERNAL "")
1621

@@ -24,12 +29,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}/board.cmake)
2429
# only need to be built ONCE for all examples
2530
set(BOARD_TARGET board_${BOARD})
2631
if (NOT TARGET ${BOARD_TARGET})
27-
# TOP is path to root directory
28-
set(TOP "${CMAKE_CURRENT_LIST_DIR}/../../..")
29-
30-
set(SDK_DIR ${TOP}/hw/mcu/nxp/mcux-sdk)
31-
set(CMSIS_DIR ${TOP}/lib/CMSIS_5)
32-
3332
add_library(${BOARD_TARGET} STATIC
3433
# external driver
3534
#lib/sct_neopixel/sct_neopixel.c

hw/bsp/nrf/family.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@ else ()
2525
set(JLINK_DEVICE ${MCU_VARIANT}_xxaa)
2626
endif ()
2727

28-
set(CMAKE_TOOLCHAIN_FILE ${TOP}/examples/cmake/toolchain/arm_${TOOLCHAIN}.cmake)
28+
set(CMAKE_TOOLCHAIN_FILE ${TOP}/tools/cmake/toolchain/arm_${TOOLCHAIN}.cmake)
2929

3030
set(FAMILY_MCUS NRF5X CACHE INTERNAL "")
3131

32+
3233
#------------------------------------
3334
# BOARD_TARGET
3435
#------------------------------------
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)