Browse Source

Fixed nuttx libs in qurt build

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
sbg
Mark Charlebois 10 years ago
parent
commit
29520dc5b1
  1. 16
      src/CMakeLists.txt
  2. 3
      src/platforms/qurt/px4_layer/qurt_stubs.c

16
src/CMakeLists.txt

@ -77,6 +77,11 @@ if (${OS} STREQUAL "nuttx")
BUNDLE ${CMAKE_CURRENT_BINARY_DIR}/fw_main.px4) BUNDLE ${CMAKE_CURRENT_BINARY_DIR}/fw_main.px4)
elseif(${OS} STREQUAL "qurt") elseif(${OS} STREQUAL "qurt")
set(V_ARCH v5)
set(HEXAGON_TOOLS_ROOT /opt/6.4.03)
set(TOOLSLIB
${HEXAGON_TOOLS_ROOT}/dinkumware/lib/${V_ARCH}/G0)
set(module_dir_list) set(module_dir_list)
set(module_list) set(module_list)
px4_qurt_add_modules(module_dir_list ${BOARD}) px4_qurt_add_modules(module_dir_list ${BOARD})
@ -98,12 +103,13 @@ elseif(${OS} STREQUAL "qurt")
set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "") set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
add_executable(main builtin_commands.cpp) add_executable(mainapp builtin_commands.cpp)
target_link_libraries(main target_link_libraries(mainapp
-Wl,--start-group -Wl,--whole-archive
${module_list} ${module_list}
apps nuttx nosys m gcc m
-Wl,--end-group) -Wl,--no-whole-archive
-Wl,${TOOLSLIB}/pic/libstdc++.a)
endif() endif()
# vim: set noet ft=cmake fenc=utf-8 ff=unix : # vim: set noet ft=cmake fenc=utf-8 ff=unix :

3
src/platforms/qurt/px4_layer/qurt_stubs.c

@ -60,6 +60,7 @@ void _Parse_csd( void )
block_indefinite(); block_indefinite();
} }
#if 0
void _Locksyslock( int x ) void _Locksyslock( int x )
{ {
PX4_WARN( "Error: Calling unresolved symbol stub[%s]", __FUNCTION__ ); PX4_WARN( "Error: Calling unresolved symbol stub[%s]", __FUNCTION__ );
@ -70,7 +71,7 @@ void _Unlocksyslock( int x )
{ {
PX4_WARN( "Error: Calling unresolved symbol stub[%s]", __FUNCTION__ ); PX4_WARN( "Error: Calling unresolved symbol stub[%s]", __FUNCTION__ );
block_indefinite(); block_indefinite();
} #endif}
void _Valbytes( void ) void _Valbytes( void )
{ {

Loading…
Cancel
Save