Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Firmware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alberto Ruiz Garcia
Firmware
Commits
df4ab8b5
Commit
df4ab8b5
authored
7 years ago
by
Daniel Agar
Committed by
Lorenz Meier
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
px4fmu-v3_default name binary appropriately
- fixes #8436
parent
99920c84
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake/configs/nuttx_px4fmu-v3_default.cmake
+1
-0
1 addition, 0 deletions
cmake/configs/nuttx_px4fmu-v3_default.cmake
src/firmware/nuttx/CMakeLists.txt
+22
-20
22 additions, 20 deletions
src/firmware/nuttx/CMakeLists.txt
with
23 additions
and
20 deletions
cmake/configs/nuttx_px4fmu-v3_default.cmake
+
1
−
0
View file @
df4ab8b5
# FMUv3 is FMUv2 with access to the full 2MB flash
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
)
include
(
nuttx/px4_impl_nuttx
)
...
...
This diff is collapsed.
Click to expand it.
src/firmware/nuttx/CMakeLists.txt
+
22
−
20
View file @
df4ab8b5
include
(
common/px4_upload
)
# add executable
set
(
fw_name
${
CONFIG
}
.elf
)
add_executable
(
${
fw_name
}
${
PX4_SOURCE_DIR
}
/src/platforms/empty.c
)
add_dependencies
(
${
fw_name
}
git_nuttx nuttx_build
)
if
(
NOT FW_NAME
)
set
(
FW_NAME
${
CONFIG
}
.elf
)
endif
()
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
)
...
...
@@ -33,7 +35,7 @@ if (NOT LD_SCRIPT)
set
(
LD_SCRIPT ld.script
)
endif
()
target_link_libraries
(
${
fw_name
}
target_link_libraries
(
${
FW_NAME
}
-T
${
PX4_BINARY_DIR
}
/NuttX/nuttx/configs/
${
BOARD
}
/scripts/
${
LD_SCRIPT
}
-Wl,-Map=
${
PX4_BINARY_DIR
}
/
${
CONFIG
}
.map
-Wl,--warn-common
...
...
@@ -48,7 +50,7 @@ target_link_libraries(${fw_name}
if
(
config_romfs_root
)
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
)
add_dependencies
(
romfs copy_px4io_bin
)
endif
()
...
...
@@ -58,8 +60,8 @@ endif()
set
(
fw_file
${
PX4_BINARY_DIR
}
/
${
BOARD
}
_
${
LABEL
}
.px4
)
add_custom_command
(
OUTPUT
${
BOARD
}
.bin
COMMAND
${
OBJCOPY
}
-O binary
${
PX4_BINARY_DIR
}
/
${
fw_name
}
${
BOARD
}
.bin
DEPENDS
${
fw_name
}
COMMAND
${
OBJCOPY
}
-O binary
${
PX4_BINARY_DIR
}
/
${
FW_NAME
}
${
BOARD
}
.bin
DEPENDS
${
FW_NAME
}
)
if
(
TARGET parameters_xml AND TARGET airframes_xml
)
...
...
@@ -86,15 +88,15 @@ endif()
# print size
add_custom_target
(
size
COMMAND size
${
fw_name
}
DEPENDS
${
fw_name
}
COMMAND size
${
FW_NAME
}
DEPENDS
${
FW_NAME
}
WORKING_DIRECTORY
${
PX4_BINARY_DIR
}
)
# print weak symbols
add_custom_target
(
check_weak
COMMAND
${
NM
}
${
fw_name
}
|
${
GREP
}
" w "
| cat
DEPENDS
${
fw_name
}
COMMAND
${
NM
}
${
FW_NAME
}
|
${
GREP
}
" w "
| cat
DEPENDS
${
FW_NAME
}
VERBATIM
)
...
...
@@ -102,28 +104,28 @@ add_custom_target(check_weak
configure_file
(
gdbinit.in .gdbinit
)
add_custom_target
(
debug
COMMAND
${
GDB
}
$<TARGET_FILE:
${
fw_name
}
>
DEPENDS
${
fw_name
}
${
CMAKE_CURRENT_BINARY_DIR
}
/.gdbinit
COMMAND
${
GDB
}
$<TARGET_FILE:
${
FW_NAME
}
>
DEPENDS
${
FW_NAME
}
${
CMAKE_CURRENT_BINARY_DIR
}
/.gdbinit
)
add_custom_target
(
debug_tui
COMMAND
${
GDBTUI
}
$<TARGET_FILE:
${
fw_name
}
>
DEPENDS
${
fw_name
}
${
CMAKE_CURRENT_BINARY_DIR
}
/.gdbinit
COMMAND
${
GDBTUI
}
$<TARGET_FILE:
${
FW_NAME
}
>
DEPENDS
${
FW_NAME
}
${
CMAKE_CURRENT_BINARY_DIR
}
/.gdbinit
)
add_custom_target
(
debug_ddd
COMMAND
${
DDD
}
--debugger
${
GDB
}
$<TARGET_FILE:
${
fw_name
}
>
DEPENDS
${
fw_name
}
${
CMAKE_CURRENT_BINARY_DIR
}
/.gdbinit
COMMAND
${
DDD
}
--debugger
${
GDB
}
$<TARGET_FILE:
${
FW_NAME
}
>
DEPENDS
${
FW_NAME
}
${
CMAKE_CURRENT_BINARY_DIR
}
/.gdbinit
)
add_custom_target
(
debug_io
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
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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment