fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-27 06:23:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

px4fmu-v3_default name binary appropriately

Browse Source 
- fixes #8436
This commit is contained in:
Daniel Agar
2017-12-10 01:07:41 +00:00
committed by Lorenz Meier
parent 99920c84fe
commit df4ab8b59e
2 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/configs/nuttx_px4fmu-v3_default.cmake
+1
View File
@@ -1,6 +1,7 @@
# FMUv3 is FMUv2 with access to the full 2MB flash # FMUv3 is FMUv2 with access to the full 2MB flash
set(BOARD px4fmu-v2 CACHE string "" FORCE) set(BOARD px4fmu-v2 CACHE string "" FORCE)
set(FW_NAME nuttx_px4fmu-v3_default.elf CACHE string "" FORCE)
set(LD_SCRIPT ld_full.script CACHE string "" FORCE) set(LD_SCRIPT ld_full.script CACHE string "" FORCE)
include(nuttx/px4_impl_nuttx) include(nuttx/px4_impl_nuttx)
src/firmware/nuttx/CMakeLists.txt
+22 -20
View File
@@ -1,9 +1,11 @@
include(common/px4_upload) include(common/px4_upload)
# add executable if (NOT FW_NAME)
set(fw_name ${CONFIG}.elf) set(FW_NAME ${CONFIG}.elf)
add_executable(${fw_name} ${PX4_SOURCE_DIR}/src/platforms/empty.c) endif()
add_dependencies(${fw_name} git_nuttx nuttx_build)
add_executable(${FW_NAME} ${PX4_SOURCE_DIR}/src/platforms/empty.c)
add_dependencies(${FW_NAME} git_nuttx nuttx_build)
get_property(module_libraries GLOBAL PROPERTY PX4_LIBRARIES) get_property(module_libraries GLOBAL PROPERTY PX4_LIBRARIES)
@@ -33,7 +35,7 @@ if (NOT LD_SCRIPT)
set(LD_SCRIPT ld.script) set(LD_SCRIPT ld.script)
endif() endif()
target_link_libraries(${fw_name} target_link_libraries(${FW_NAME}
-T${PX4_BINARY_DIR}/NuttX/nuttx/configs/${BOARD}/scripts/${LD_SCRIPT} -T${PX4_BINARY_DIR}/NuttX/nuttx/configs/${BOARD}/scripts/${LD_SCRIPT}
-Wl,-Map=${PX4_BINARY_DIR}/${CONFIG}.map -Wl,-Map=${PX4_BINARY_DIR}/${CONFIG}.map
-Wl,--warn-common -Wl,--warn-common
@@ -48,7 +50,7 @@ target_link_libraries(${fw_name}
if (config_romfs_root) if (config_romfs_root)
add_subdirectory(${PX4_SOURCE_DIR}/ROMFS ${PX4_BINARY_DIR}/ROMFS) add_subdirectory(${PX4_SOURCE_DIR}/ROMFS ${PX4_BINARY_DIR}/ROMFS)
target_link_libraries(${fw_name} romfs) target_link_libraries(${FW_NAME} romfs)
if (config_io_board) if (config_io_board)
add_dependencies(romfs copy_px4io_bin) add_dependencies(romfs copy_px4io_bin)
endif() endif()
@@ -58,8 +60,8 @@ endif()
set(fw_file ${PX4_BINARY_DIR}/${BOARD}_${LABEL}.px4) set(fw_file ${PX4_BINARY_DIR}/${BOARD}_${LABEL}.px4)
add_custom_command(OUTPUT ${BOARD}.bin add_custom_command(OUTPUT ${BOARD}.bin
COMMAND ${OBJCOPY} -O binary ${PX4_BINARY_DIR}/${fw_name} ${BOARD}.bin COMMAND ${OBJCOPY} -O binary ${PX4_BINARY_DIR}/${FW_NAME} ${BOARD}.bin
DEPENDS ${fw_name} DEPENDS ${FW_NAME}
) )
if (TARGET parameters_xml AND TARGET airframes_xml) if (TARGET parameters_xml AND TARGET airframes_xml)
@@ -86,15 +88,15 @@ endif()
# print size # print size
add_custom_target(size add_custom_target(size
COMMAND size ${fw_name} COMMAND size ${FW_NAME}
DEPENDS ${fw_name} DEPENDS ${FW_NAME}
WORKING_DIRECTORY ${PX4_BINARY_DIR} WORKING_DIRECTORY ${PX4_BINARY_DIR}
) )
# print weak symbols # print weak symbols
add_custom_target(check_weak add_custom_target(check_weak
COMMAND ${NM} ${fw_name} | ${GREP} " w " | cat COMMAND ${NM} ${FW_NAME} | ${GREP} " w " | cat
DEPENDS ${fw_name} DEPENDS ${FW_NAME}
VERBATIM VERBATIM
) )
@@ -102,28 +104,28 @@ add_custom_target(check_weak
configure_file(gdbinit.in .gdbinit) configure_file(gdbinit.in .gdbinit)
add_custom_target(debug add_custom_target(debug
COMMAND ${GDB} $<TARGET_FILE:${fw_name}> COMMAND ${GDB} $<TARGET_FILE:${FW_NAME}>
DEPENDS ${fw_name} ${CMAKE_CURRENT_BINARY_DIR}/.gdbinit DEPENDS ${FW_NAME} ${CMAKE_CURRENT_BINARY_DIR}/.gdbinit
) )
add_custom_target(debug_tui add_custom_target(debug_tui
COMMAND ${GDBTUI} $<TARGET_FILE:${fw_name}> COMMAND ${GDBTUI} $<TARGET_FILE:${FW_NAME}>
DEPENDS ${fw_name} ${CMAKE_CURRENT_BINARY_DIR}/.gdbinit DEPENDS ${FW_NAME} ${CMAKE_CURRENT_BINARY_DIR}/.gdbinit
) )
add_custom_target(debug_ddd add_custom_target(debug_ddd
COMMAND ${DDD} --debugger ${GDB} $<TARGET_FILE:${fw_name}> COMMAND ${DDD} --debugger ${GDB} $<TARGET_FILE:${FW_NAME}>
DEPENDS ${fw_name} ${CMAKE_CURRENT_BINARY_DIR}/.gdbinit DEPENDS ${FW_NAME} ${CMAKE_CURRENT_BINARY_DIR}/.gdbinit
) )
add_custom_target(debug_io add_custom_target(debug_io
COMMAND ${GDB} ${fw_io_path} COMMAND ${GDB} ${fw_io_path}
DEPENDS ${fw_name} ${CMAKE_CURRENT_BINARY_DIR}/.gdbinit DEPENDS ${FW_NAME} ${CMAKE_CURRENT_BINARY_DIR}/.gdbinit
) )
add_custom_target(debug_io_tui add_custom_target(debug_io_tui
COMMAND ${GDBTUI} ${fw_io_path} COMMAND ${GDBTUI} ${fw_io_path}
DEPENDS ${fw_name} ${CMAKE_CURRENT_BINARY_DIR}/.gdbinit DEPENDS ${FW_NAME} ${CMAKE_CURRENT_BINARY_DIR}/.gdbinit
) )
add_custom_target(debug_io_ddd add_custom_target(debug_io_ddd