@ -61,6 +61,7 @@ include(common/px4_base)
@@ -61,6 +61,7 @@ include(common/px4_base)
#
# I n p u t :
# E X E : t h e e x e c u t a b l e t o g e n e r a t e t h e f i r m w a r e f r o m
# B O A R D : t h e b o a r d
#
# O p t i o n s :
# P A R A M _ X M L : t o g g l e s g e n e r a t i o n o f p a r a m _ x m l
@ -74,9 +75,9 @@ include(common/px4_base)
@@ -74,9 +75,9 @@ include(common/px4_base)
function ( px4_nuttx_add_firmware )
px4_parse_function_args (
N A M E p x 4 _ n u t t x _ a d d _ f i r m w a r e
O N E _ V A L U E O U T E X E
O N E _ V A L U E B O A R D O U T E X E
O P T I O N S P A R A M _ X M L
R E Q U I R E D E X E
R E Q U I R E D O U T E X E B O A R D
A R G N $ { A R G N } )
set ( process_params ${ CMAKE_SOURCE_DIR } /Tools/px_process_params.py )
@ -111,7 +112,7 @@ function(px4_nuttx_add_firmware)
@@ -111,7 +112,7 @@ function(px4_nuttx_add_firmware)
D E P E N D S $ { E X E }
)
endif ( )
add_custom_target ( build_firmware ALL DEPENDS ${ OUT } )
add_custom_target ( build_firmware_ ${ BOARD } ALL DEPENDS ${ OUT } )
endfunction ( )
# = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
@ -246,14 +247,14 @@ function(px4_nuttx_add_export)
@@ -246,14 +247,14 @@ function(px4_nuttx_add_export)
D E P E N D S $ { D E P E N D S } _ _ n u t t x _ c o p y _ $ { C O N F I G } )
# e x t r a c t
add_custom_command ( OUTPUT nuttx_export_ ${ BOARD } .stamp
add_custom_command ( OUTPUT nuttx_export_ ${ CONFIG } .stamp
C O M M A N D $ { R M } - r f $ { n u t t x _ s r c } / n u t t x - e x p o r t
C O M M A N D $ { U N Z I P } $ { B O A R D } . e x p o r t - d $ { n u t t x _ s r c }
C O M M A N D $ { T O U C H } n u t t x _ e x p o r t _ $ { B O A R D } . s t a m p
D E P E N D S $ { D E P E N D S } $ { B O A R D } . e x p o r t )
C O M M A N D $ { U N Z I P } $ { C O N F I G } . e x p o r t - d $ { n u t t x _ s r c }
C O M M A N D $ { T O U C H } n u t t x _ e x p o r t _ $ { C O N F I G } . s t a m p
D E P E N D S $ { D E P E N D S } $ { C O N F I G } . e x p o r t )
add_custom_target ( ${ OUT }
D E P E N D S n u t t x _ e x p o r t _ $ { B O A R D } . s t a m p )
D E P E N D S n u t t x _ e x p o r t _ $ { C O N F I G } . s t a m p )
endfunction ( )
@ -406,17 +407,24 @@ function(px4_os_add_flags)
@@ -406,17 +407,24 @@ function(px4_os_add_flags)
set ( added_exe_linker_flags ) # n o n e c u r r e n t l y
if ( "${BOARD}" STREQUAL "px4fmu-v2" )
set ( arm_build_flags
set ( cpu_flags )
if ( ${ BOARD } STREQUAL "px4fmu-v2" )
set ( cpu_flags
- m c p u = c o r t e x - m 4
- m t h u m b
- m a r c h = a r m v 7 e - m
- m f p u = f p v 4 - s p - d 1 6
- m f l o a t - a b i = h a r d
)
list ( APPEND c_flags ${ arm_build_flags } )
list ( APPEND cxx_flags ${ arm_build_flags } )
elseif ( ${ BOARD } STREQUAL "px4io-v2" )
set ( cpu_flags
- m c p u = c o r t e x - m 3
- m t h u m b
- m a r c h = a r m v 7 - m
)
endif ( )
list ( APPEND c_flags ${ cpu_flags } )
list ( APPEND cxx_flags ${ cpu_flags } )
# o u t p u t
foreach ( var ${ inout_vars } )
@ -455,11 +463,11 @@ function(px4_os_prebuild_targets)
@@ -455,11 +463,11 @@ function(px4_os_prebuild_targets)
O N E _ V A L U E O U T B O A R D T H R E A D S
R E Q U I R E D O U T B O A R D
A R G N $ { A R G N } )
px4_nuttx_add_export ( OUT nuttx_export
px4_nuttx_add_export ( OUT nuttx_export_ ${ BOARD }
C O N F I G $ { B O A R D }
T H R E A D S $ { T H R E A D S }
D E P E N D S g i t _ n u t t x )
add_custom_target ( ${ OUT } DEPENDS nuttx_export )
add_custom_target ( ${ OUT } DEPENDS nuttx_export_ ${ BOARD } )
endfunction ( )
# v i m : s e t n o e t f e n c = u t f - 8 f f = u n i x n o w r a p :