Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PX4 on nuttx 7.27+ #11013

Closed
wants to merge 54 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
bbd36c8
Update Nuttx to 7.27+
Nov 27, 2018
0e28414
Changes to suport Nuttx c++ lib rename
Nov 29, 2018
e215e93
Build copies the boards nuttx-config to build at Nuttx level
Nov 29, 2018
c8512d6
stm32/drv_io_timer:GTIM_CCER_CC1NP not on all STM32 HW
Nov 29, 2018
0e4d677
flashfs:Upstream renamed up_progmem_erasepage to up_progmem_eraseblock
Nov 29, 2018
418aa24
Add STM32 critical section monitor time resources
Nov 29, 2018
4518fe4
Add callout for CONFIG_BOARDCTL_FINALINIT
Nov 29, 2018
ce38be6
Add support from cromfs generation
Nov 29, 2018
6a611bf
Custom board naming, removed need for tools/nuttx_defconf_tool.sh
Dec 6, 2018
598fbbe
aerofc-v1:Scope CRASHDUMP_RESET_ONLY to BOARD_CRASHDUMP_RESET_ONLY
Dec 7, 2018
21c35cc
common:board_crashdump must end in reset!
Dec 7, 2018
31c4d16
px4_nuttx_tasks:Support future removal of env.
Dec 7, 2018
67fe30b
ROMFS/CMakeLists build gencromfs
Dec 10, 2018
f72856c
mc_pos_control_main:Use discret init of poll struct
Dec 10, 2018
71cc804
Add Support for savedefconfig
Dec 11, 2018
4f66063
board_button_irq: API change in upstream
Dec 11, 2018
f898c7d
upstram NuttX CONFIG_EXAMPLES_NSH_CXXINITIALIZE->CONFIG_SYSTEM_NSH_CX…
Dec 12, 2018
74963c9
flashfs:Track upstream nuttx CONFIG_ARCH_HAVE_PROGMEM
Dec 14, 2018
477b321
uavcanesc:Add cdev
Dec 15, 2018
72d36e5
auav_esc31-v1:Fix build
Dec 14, 2018
ae6214f
px4_micro_hal:Fix typo
Dec 26, 2018
e49bdec
px4_micro_hal:Upstream nuttx GPIO_OUTPUT_ZER0->GPIO_OUTPUT_ZERO
Dec 26, 2018
3f9c16a
NuttX/CMakeLists:Support Board Kconfig
Dec 20, 2018
9ff728a
Nuttx Cmake Expand optional defconfig
Dec 21, 2018
947cd90
px4_io-v2: Inital commit NuttX 7.27+
Nov 29, 2018
fc837e8
airmind_mindpx-v2: Inital commit NuttX 7.27+
Dec 17, 2018
f0ab683
atmel_same70xplained: Inital commit NuttX 7.27+
Dec 17, 2018
4a01b1e
auav_esc35-v1: Inital commit NuttX 7.27+
Dec 17, 2018
4706dd2
auav_x21: Inital commit NuttX 7.27+
Dec 17, 2018
106876d
av_x-v1: Inital commit NuttX 7.27+
Dec 17, 2018
ede0968
bitcraze_crazyflie: Inital commit NuttX 7.27+
Dec 17, 2018
fa72db7
gumstix_aerocore2: Inital commit NuttX 7.27+
Dec 17, 2018
23d7a38
intel_aerofc-v1: Inital commit NuttX 7.27+
Dec 17, 2018
0703a6d
nxp_fmuk66-v3: Inital commit NuttX 7.27+
Dec 17, 2018
75a0819
px4_cannode-v1:Inital commit NuttX 7.27+
Dec 11, 2018
794a867
omnibus_f4sd: Inital commit NuttX 7.27+
Dec 17, 2018
40dfc30
px4_esc-v1: Inital commit NuttX 7.27+
Dec 17, 2018
039c32d
px4_fmu-v2: Inital commit NuttX 7.27+
Dec 17, 2018
4c4e86a
px4_fmu-v3: Inital commit NuttX 7.27+
Dec 17, 2018
78daea3
px4_fmu-v4: Inital commit NuttX 7.27+
Dec 12, 2018
536dd6e
px4_fmu-v4pro: Inital commit NuttX 7.27+
Dec 17, 2018
7c43fe9
px4_fmu-v5: Inital commit NuttX 7.27+
Nov 27, 2018
f6ffd88
stm_32f4discovery: Inital commit NuttX 7.27+
Dec 17, 2018
a670475
stm_nucleo-F767ZI: Inital commit NuttX 7.27+
Dec 17, 2018
e390666
thiemar_s2740vc-v1: Inital commit NuttX 7.27+
Dec 17, 2018
d2da083
Update Nuttx to 7.27+
Nov 27, 2018
d5d4e6f
NuttX carry arm math.h PX4 side
dagar Jan 6, 2019
1fcdeec
Update Nuttx to 7.27+
Nov 27, 2018
8a019e8
Update Nuttx apps to 7.27+
Nov 27, 2018
91c0748
mavlink increase STACK_MAIN and STACK_MAX
dagar Jan 14, 2019
18017d3
omnibus_f4sd:Fix Boot
Jan 19, 2019
442c07d
Updated platforms/nuttx/NuttX/nuttx
Jan 19, 2019
2d694ca
Updated platforms/nuttx/NuttX/apps
Jan 19, 2019
3915d24
NuttX remove all toolchain c++ standard library usage (#11251)
dagar Jan 21, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ alt_firmware: \
check_stm_32f4discovery_default \
check_px4_cannode-v1_default \
check_px4_esc-v1_default \
check_auav_esc35-v1_default \
check_stm_nucleo-F767ZI_default \
check_thiemar_s2740vc-v1_default \
sizes
Expand Down
71 changes: 49 additions & 22 deletions ROMFS/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -176,30 +176,57 @@ add_custom_command(OUTPUT romfs_pruned.stamp
COMMENT "ROMFS: pruning"
)

# create romfs.img
find_program(GENROMFS genromfs)
if(NOT GENROMFS)
message(FATAL_ERROR "genromfs not found")
endif()
add_custom_command(OUTPUT romfs.img romfs.txt
COMMAND ${CMAKE_COMMAND} -E remove -f romfs.img romfs.txt
COMMAND ${GENROMFS} -f romfs.img -d ${romfs_gen_root_dir} -V "NSHInitVol" -v > romfs.txt 2>&1
DEPENDS
romfs_pruned.stamp
COMMENT "ROMFS: generating image"
)
if("${CONFIG_FS_CROMFS}" STREQUAL "y")
add_custom_command(
OUTPUT
${CMAKE_BINARY_DIR}/gencromfs
COMMAND
make --no-print-directory --silent -f Makefile.host gencromfs
COMMAND ${CMAKE_COMMAND} -E copy gencromfs ${CMAKE_BINARY_DIR}/gencromfs
DEPENDS ${PX4_SOURCE_DIR}/platforms/nuttx/NuttX/nuttx/tools/gencromfs.c
WORKING_DIRECTORY ${NUTTX_DIR}/tools
)

# create nsh_romfsimg.c
add_custom_command(OUTPUT nsh_romfsimg.c
COMMAND ${CMAKE_COMMAND} -E remove -f nsh_romfsimg.c
COMMAND ${CMAKE_BINARY_DIR}/gencromfs ${romfs_gen_root_dir} nsh_romfsimg.c
DEPENDS
${CMAKE_BINARY_DIR}/gencromfs
${romfs_gen_root_dir}/init.d/rcS
${romfs_gen_root_dir}/init.d/rc.autostart
romfs_extras.stamp
romfs_pruned.stamp
COMMENT "ROMFS: generating image"
)

# create nsh_romfsimg.c
find_program(XXD xxd)
if(NOT XXD)
message(FATAL_ERROR "xxd not found")
else()
# create romfs.img
find_program(GENROMFS genromfs)
if(NOT GENROMFS)
message(FATAL_ERROR "genromfs not found")
endif()
add_custom_command(OUTPUT romfs.img romfs.txt
COMMAND ${CMAKE_COMMAND} -E remove -f romfs.img romfs.txt
COMMAND ${GENROMFS} -f romfs.img -d ${romfs_gen_root_dir} -V "NSHInitVol" -v > romfs.txt 2>&1
DEPENDS
romfs_pruned.stamp
COMMENT "ROMFS: generating image"
)

# create nsh_romfsimg.c
find_program(XXD xxd)
if(NOT XXD)
message(FATAL_ERROR "xxd not found")
endif()
add_custom_command(OUTPUT nsh_romfsimg.c
COMMAND ${CMAKE_COMMAND} -E remove -f nsh_romfsimg.c
COMMAND ${XXD} -i romfs.img nsh_romfsimg.c
COMMAND sed 's/unsigned/const unsigned/g' nsh_romfsimg.c > nsh_romfsimg.c.tmp && ${CMAKE_COMMAND} -E rename nsh_romfsimg.c.tmp nsh_romfsimg.c
DEPENDS romfs.img
)
endif()
add_custom_command(OUTPUT nsh_romfsimg.c
COMMAND ${CMAKE_COMMAND} -E remove -f nsh_romfsimg.c
COMMAND ${XXD} -i romfs.img nsh_romfsimg.c
COMMAND sed 's/unsigned/const unsigned/g' nsh_romfsimg.c > nsh_romfsimg.c.tmp && ${CMAKE_COMMAND} -E rename nsh_romfsimg.c.tmp nsh_romfsimg.c
DEPENDS romfs.img
)


add_library(romfs STATIC nsh_romfsimg.c)
add_dependencies(romfs prebuild_targets)
Expand Down
Loading