andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use board alias for pca10056

Browse Source
This commit is contained in:
hathach
2025-01-25 15:12:57 +07:00
parent 1003aba690
commit dc514c6230
3 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
examples/build_system/cmake/toolchain/arm_gcc.cmake
View File

@@ -1,25 +1,25 @@
if (RTOS STREQUAL zephyr) if (RTOS STREQUAL zephyr)
return()
else () endif ()
if (NOT DEFINED CMAKE_C_COMPILER)
set(CMAKE_C_COMPILER "arm-none-eabi-gcc") if (NOT DEFINED CMAKE_C_COMPILER)
endif () set(CMAKE_C_COMPILER "arm-none-eabi-gcc")
endif ()
if (NOT DEFINED CMAKE_CXX_COMPILER)
set(CMAKE_CXX_COMPILER "arm-none-eabi-g++") if (NOT DEFINED CMAKE_CXX_COMPILER)
endif () set(CMAKE_CXX_COMPILER "arm-none-eabi-g++")
endif ()
set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
find_program(CMAKE_SIZE arm-none-eabi-size) set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
find_program(CMAKE_OBJCOPY arm-none-eabi-objcopy) find_program(CMAKE_SIZE arm-none-eabi-size)
find_program(CMAKE_OBJDUMP arm-none-eabi-objdump) find_program(CMAKE_OBJCOPY arm-none-eabi-objcopy)
find_program(CMAKE_OBJDUMP arm-none-eabi-objdump)
include(${CMAKE_CURRENT_LIST_DIR}/common.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/common.cmake)
get_property(IS_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE)
if (IS_IN_TRY_COMPILE) get_property(IS_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE)
set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -nostdlib") if (IS_IN_TRY_COMPILE)
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -nostdlib") set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -nostdlib")
cmake_print_variables(CMAKE_C_LINK_FLAGS) set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -nostdlib")
endif () cmake_print_variables(CMAKE_C_LINK_FLAGS)
endif () endif ()

19
hw/bsp/family_support.cmake
View File

@@ -59,6 +59,7 @@ if (NOT DEFINED FAMILY)
# replace / with ; so that we can get the first element as FAMILY # replace / with ; so that we can get the first element as FAMILY
string(REPLACE "/" ";" BOARD_PATH ${BOARD_PATH}) string(REPLACE "/" ";" BOARD_PATH ${BOARD_PATH})
list(GET BOARD_PATH 0 FAMILY) list(GET BOARD_PATH 0 FAMILY)
set(FAMILY ${FAMILY} CACHE STRING "Board family")
endif () endif ()
if (NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/${FAMILY}/family.cmake) if (NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/${FAMILY}/family.cmake)
@@ -79,6 +80,15 @@ if (NOT NO_WARN_RWX_SEGMENTS_SUPPORTED)
set(NO_WARN_RWX_SEGMENTS_SUPPORTED 1) set(NO_WARN_RWX_SEGMENTS_SUPPORTED 1)
endif() endif()
#----------------------------------
# Zephyr
#----------------------------------
if (RTOS STREQUAL zephyr)
set(BOARD_ROOT ${TOP}/hw/bsp/${FAMILY})
set(ZEPHYR_BOARD_ALIASES ${CMAKE_CURRENT_LIST_DIR}/zephyr_board_aliases.cmake)
find_package(Zephyr REQUIRED HINTS ${TOP}/zephyr)
endif ()
#------------------------------------------------------------- #-------------------------------------------------------------
# Functions # Functions
#------------------------------------------------------------- #-------------------------------------------------------------
@@ -630,12 +640,3 @@ endif ()
# save it in case of re-inclusion # save it in case of re-inclusion
set(FAMILY_MCUS ${FAMILY_MCUS} CACHE INTERNAL "") set(FAMILY_MCUS ${FAMILY_MCUS} CACHE INTERNAL "")
#----------------------------------
# Zephyr
#----------------------------------
if (RTOS STREQUAL zephyr)
set(BOARD_ROOT ${TOP}/hw/bsp/${FAMILY})
set(ZEPHYR_BOARD_ALIASES ${CMAKE_CURRENT_LIST_DIR}/zephyr_board_aliases.cmake)
find_package(Zephyr REQUIRED HINTS ${TOP}/zephyr)
endif ()

10
hw/bsp/nrf/family.cmake
View File

@@ -3,8 +3,12 @@ include_guard()
set(NRFX_PATH ${TOP}/hw/mcu/nordic/nrfx) set(NRFX_PATH ${TOP}/hw/mcu/nordic/nrfx)
set(CMSIS_DIR ${TOP}/lib/CMSIS_5) set(CMSIS_DIR ${TOP}/lib/CMSIS_5)
# include board specific # include board specific, for zephyr BOARD_ALIAS may be used instead
include(${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}/board.cmake) if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}/board.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}/board.cmake)
else ()
include(${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD_ALIAS}/board.cmake)
endif ()
# toolchain set up # toolchain set up
if (MCU_VARIANT STREQUAL "nrf5340_application") if (MCU_VARIANT STREQUAL "nrf5340_application")
@@ -19,7 +23,6 @@ set(CMAKE_TOOLCHAIN_FILE ${TOP}/examples/build_system/cmake/toolchain/arm_${TOOL
set(FAMILY_MCUS NRF5X CACHE INTERNAL "") set(FAMILY_MCUS NRF5X CACHE INTERNAL "")
#------------------------------------ #------------------------------------
# BOARD_TARGET # BOARD_TARGET
#------------------------------------ #------------------------------------
@@ -134,7 +137,6 @@ function(family_configure_example TARGET RTOS)
target_include_directories(${TARGET} PUBLIC ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/boards/${BOARD_ALIAS}) target_include_directories(${TARGET} PUBLIC ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/boards/${BOARD_ALIAS})
endif () endif ()
# Add TinyUSB target and port source # Add TinyUSB target and port source
family_add_tinyusb(${TARGET} OPT_MCU_NRF5X) family_add_tinyusb(${TARGET} OPT_MCU_NRF5X)
target_sources(${TARGET} PRIVATE target_sources(${TARGET} PRIVATE