diff --git a/platforms/nuttx/src/px4/common/CMakeLists.txt b/platforms/nuttx/src/px4/common/CMakeLists.txt index efa2fd6082..19089402e3 100644 --- a/platforms/nuttx/src/px4/common/CMakeLists.txt +++ b/platforms/nuttx/src/px4/common/CMakeLists.txt @@ -51,7 +51,7 @@ if(NOT PX4_BOARD MATCHES "px4_io") arch_board_reset arch_board_critmon arch_version - nuttx_apps # up_cxxinitialize + nuttx_apps nuttx_sched px4_work_queue ) diff --git a/platforms/nuttx/src/px4/common/px4_init.cpp b/platforms/nuttx/src/px4/common/px4_init.cpp index 3f61885a88..1f8c7cc807 100644 --- a/platforms/nuttx/src/px4/common/px4_init.cpp +++ b/platforms/nuttx/src/px4/common/px4_init.cpp @@ -42,25 +42,8 @@ #include - -#include "platform/cxxinitialize.h" - int px4_platform_init(void) { - -#if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE) - /* run C++ ctors before we go any further */ - up_cxxinitialize(); - -# if defined(CONFIG_SYSTEM_NSH_CXXINITIALIZE) -# error CONFIG_SYSTEM_NSH_CXXINITIALIZE Must not be defined! Use CONFIG_HAVE_CXX and CONFIG_HAVE_CXXINITIALIZE. -# endif - -#else -# error platform is dependent on c++ both CONFIG_HAVE_CXX and CONFIG_HAVE_CXXINITIALIZE must be defined. -#endif - - #if !defined(CONFIG_DEV_CONSOLE) && defined(CONFIG_DEV_NULL) /* Support running nsh on a board with out a console diff --git a/src/modules/px4iofirmware/px4io.c b/src/modules/px4iofirmware/px4io.c index 3207e518c0..520a4621fe 100644 --- a/src/modules/px4iofirmware/px4io.c +++ b/src/modules/px4iofirmware/px4io.c @@ -39,7 +39,6 @@ */ #include -#include "platform/cxxinitialize.h" #include // required for task_create #include @@ -285,20 +284,6 @@ user_start(int argc, char *argv[]) /* configure the first 8 PWM outputs (i.e. all of them) */ up_pwm_servo_init(0xff); -#if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE) - - /* run C++ ctors before we go any further */ - - up_cxxinitialize(); - -# if defined(CONFIG_SYSTEM_NSH_CXXINITIALIZE) -# error CONFIG_SYSTEM_NSH_CXXINITIALIZE Must not be defined! Use CONFIG_HAVE_CXX and CONFIG_HAVE_CXXINITIALIZE. -# endif - -#else -# error platform is dependent on c++ both CONFIG_HAVE_CXX and CONFIG_HAVE_CXXINITIALIZE must be defined. -#endif - /* reset all to zero */ memset(&system_state, 0, sizeof(system_state));