From e2c3ea064e70e07c441e25f9924f39623ad4b2af Mon Sep 17 00:00:00 2001 From: Mark Charlebois Date: Thu, 5 May 2016 22:18:57 -0700 Subject: [PATCH] Remove release configs (#4454) * Removed release configs for eagle These configs are only built for internal testing Signed-off-by: Mark Charlebois * Removed release build for eagle from Makefile Signed-off-by: Mark Charlebois --- Makefile | 12 -- .../posix_eagle_legacy_driver_release.cmake | 48 -------- cmake/configs/posix_eagle_release.cmake | 42 ------- .../qurt_eagle_legacy_driver_release.cmake | 109 ------------------ cmake/configs/qurt_eagle_release.cmake | 101 ---------------- 5 files changed, 312 deletions(-) delete mode 100644 cmake/configs/posix_eagle_legacy_driver_release.cmake delete mode 100644 cmake/configs/posix_eagle_release.cmake delete mode 100644 cmake/configs/qurt_eagle_legacy_driver_release.cmake delete mode 100644 cmake/configs/qurt_eagle_release.cmake diff --git a/Makefile b/Makefile index 3e7649453f..b46f619f4a 100644 --- a/Makefile +++ b/Makefile @@ -170,18 +170,6 @@ ros_sitl_default: qurt_eagle_travis: $(call cmake-build,$@) -qurt_eagle_release: - $(call cmake-build,$@) - -qurt_eagle_legacy_driver_release: - $(call cmake-build,$@) - -posix_eagle_release: - $(call cmake-build,$@) - -posix_eagle_legacy_driver_release: - $(call cmake-build,$@) - qurt_eagle_default: $(call cmake-build,$@) diff --git a/cmake/configs/posix_eagle_legacy_driver_release.cmake b/cmake/configs/posix_eagle_legacy_driver_release.cmake deleted file mode 100644 index 7fb9793a5e..0000000000 --- a/cmake/configs/posix_eagle_legacy_driver_release.cmake +++ /dev/null @@ -1,48 +0,0 @@ -include(posix/px4_impl_posix) - -set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake) - -set(config_generate_parameters_scope ALL) - -set(CONFIG_SHMEM "1") - -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/cmake_hexagon") - -# A temporary build option to support the use of the legacy (non DriverFramework) drivers. -add_definitions( - -D__USING_SNAPDRAGON_LEGACY_DRIVER - ) - -set(config_module_list - drivers/device - drivers/boards/sitl - drivers/led - - systemcmds/param - systemcmds/ver - - modules/mavlink - - modules/param - modules/systemlib - modules/uORB - modules/dataman - modules/sdlog2 - modules/simulator - modules/commander - - lib/controllib - lib/mathlib - lib/mathlib/math/filter - lib/geo - lib/geo_lookup - lib/conversion - lib/DriverFramework/framework - - platforms/common - platforms/posix/px4_layer - platforms/posix/work_queue - - modules/muorb/krait - ) - diff --git a/cmake/configs/posix_eagle_release.cmake b/cmake/configs/posix_eagle_release.cmake deleted file mode 100644 index 10a6d1f8b1..0000000000 --- a/cmake/configs/posix_eagle_release.cmake +++ /dev/null @@ -1,42 +0,0 @@ -include(posix/px4_impl_posix) - -set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake) - -set(CONFIG_SHMEM "1") - -set(config_generate_parameters_scope ALL) - -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/cmake_hexagon") - -set(config_module_list - drivers/device - drivers/boards/sitl - drivers/led - - systemcmds/param - systemcmds/ver - - modules/mavlink - - modules/param - modules/systemlib - modules/uORB - modules/dataman - modules/sdlog2 - modules/simulator - modules/commander - - lib/mathlib - lib/mathlib/math/filter - lib/geo - lib/geo_lookup - lib/conversion - lib/DriverFramework/framework - - platforms/common - platforms/posix/px4_layer - platforms/posix/work_queue - - modules/muorb/krait - ) - diff --git a/cmake/configs/qurt_eagle_legacy_driver_release.cmake b/cmake/configs/qurt_eagle_legacy_driver_release.cmake deleted file mode 100644 index 793f31c1d4..0000000000 --- a/cmake/configs/qurt_eagle_legacy_driver_release.cmake +++ /dev/null @@ -1,109 +0,0 @@ -include(qurt/px4_impl_qurt) - -if ("$ENV{HEXAGON_SDK_ROOT}" STREQUAL "") - message(FATAL_ERROR "Enviroment variable HEXAGON_SDK_ROOT must be set") -else() - set(HEXAGON_SDK_ROOT $ENV{HEXAGON_SDK_ROOT}) -endif() - -if ("$ENV{EAGLE_DRIVERS_SRC}" STREQUAL "") - message(FATAL_ERROR "Environment variable EAGLE_DRIVERS_SRC must be set") -else() - set(EAGLE_DRIVERS_SRC $ENV{EAGLE_DRIVERS_SRC}) -endif() - -STRING(REGEX REPLACE "//" "/" EAGLE_DRIVERS_SRC ${EAGLE_DRIVERS_SRC}) -STRING(REGEX REPLACE "/" "__" EAGLE_DRIVERS_MODULE_PREFIX ${EAGLE_DRIVERS_SRC}) - -#include_directories(${EAGLE_ADDON_ROOT}/flight_controller/hexagon/inc) -include_directories( - ${HEXAGON_SDK_ROOT}/inc - ${HEXAGON_SDK_ROOT}/inc/stddef - ${HEXAGON_SDK_ROOT}/lib/common/qurt/ADSPv5MP/include - ) - -message("hexagon_sdk_root is ${HEXAGON_SDK_ROOT}") - -set(QURT_ENABLE_STUBS "0") - -set(CONFIG_SHMEM "1") - -set(config_generate_parameters_scope ALL) - -set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/cmake_hexagon/toolchain/Toolchain-qurt.cmake) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/cmake_hexagon") - -add_definitions( - -D__USING_SNAPDRAGON_LEGACY_DRIVER - ) - -set(config_module_list - # - # Board support modules - # - drivers/device - modules/sensors - platforms/posix/drivers/df_bmp280_wrapper - ${EAGLE_DRIVERS_SRC}/mpu_spi - ${EAGLE_DRIVERS_SRC}/uart_esc - ${EAGLE_DRIVERS_SRC}/rc_receiver - - # - # System commands - # - systemcmds/param - - # - # Estimation modules (EKF/ SO3 / other filters) - # - #modules/attitude_estimator_ekf - modules/ekf_att_pos_estimator - modules/attitude_estimator_q - modules/position_estimator_inav - - # - # Vehicle Control - # - modules/mc_att_control - modules/mc_pos_control - - # - # Library modules - # - modules/param - modules/systemlib - modules/systemlib/mixer - modules/uORB - modules/commander - - # - # Libraries - # - lib/controllib - lib/mathlib - lib/mathlib/math/filter - lib/geo - lib/ecl - lib/geo_lookup - lib/conversion - lib/terrain_estimation - lib/runway_takeoff - lib/tailsitter_recovery - lib/DriverFramework/framework - - # - # QuRT port - # - platforms/common - platforms/qurt/px4_layer - platforms/posix/work_queue - - # - # sources for muorb over fastrpc - # - modules/muorb/adsp - ) - -set(config_df_driver_list - bmp280 - ) diff --git a/cmake/configs/qurt_eagle_release.cmake b/cmake/configs/qurt_eagle_release.cmake deleted file mode 100644 index 79e5a5366c..0000000000 --- a/cmake/configs/qurt_eagle_release.cmake +++ /dev/null @@ -1,101 +0,0 @@ -include(qurt/px4_impl_qurt) - -if ("$ENV{HEXAGON_SDK_ROOT}" STREQUAL "") - message(FATAL_ERROR "Enviroment variable HEXAGON_SDK_ROOT must be set") -else() - set(HEXAGON_SDK_ROOT $ENV{HEXAGON_SDK_ROOT}) -endif() - -if ("$ENV{EAGLE_DRIVERS_SRC}" STREQUAL "") - message(FATAL_ERROR "Environment variable EAGLE_DRIVERS_SRC must be set") -else() - set(EAGLE_DRIVERS_SRC $ENV{EAGLE_DRIVERS_SRC}) -endif() - -STRING(REGEX REPLACE "//" "/" EAGLE_DRIVERS_SRC ${EAGLE_DRIVERS_SRC}) -STRING(REGEX REPLACE "/" "__" EAGLE_DRIVERS_MODULE_PREFIX ${EAGLE_DRIVERS_SRC}) - -#include_directories(${EAGLE_ADDON_ROOT}/flight_controller/hexagon/inc) -include_directories( - ${HEXAGON_SDK_ROOT}/inc - ${HEXAGON_SDK_ROOT}/inc/stddef - ${HEXAGON_SDK_ROOT}/lib/common/qurt/ADSPv5MP/include - ) - -message("hexagon_sdk_root is ${HEXAGON_SDK_ROOT}") - -set(QURT_ENABLE_STUBS "0") - -set(CONFIG_SHMEM "1") - -set(config_generate_parameters_scope ALL) - -set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/cmake_hexagon/toolchain/Toolchain-qurt.cmake) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/cmake_hexagon") - -set(config_module_list - # - # Board support modules - # - drivers/device - modules/sensors - ${EAGLE_DRIVERS_SRC}/mpu_spi - ${EAGLE_DRIVERS_SRC}/uart_esc - ${EAGLE_DRIVERS_SRC}/rc_receiver - ${EAGLE_DRIVERS_SRC}/csr_gps - - # - # System commands - # - systemcmds/param - - # - # Estimation modules (EKF/ SO3 / other filters) - # - #modules/attitude_estimator_ekf - modules/ekf_att_pos_estimator - modules/attitude_estimator_q - modules/position_estimator_inav - - # - # Vehicle Control - # - modules/mc_att_control - modules/mc_pos_control - - # - # Library modules - # - modules/param - modules/systemlib - modules/systemlib/mixer - modules/uORB - modules/commander - - # - # Libraries - # - lib/controllib - lib/mathlib - lib/mathlib/math/filter - lib/geo - lib/ecl - lib/geo_lookup - lib/conversion - lib/terrain_estimation - lib/runway_takeoff - lib/tailsitter_recovery - lib/DriverFramework/framework - - # - # QuRT port - # - platforms/common - platforms/qurt/px4_layer - platforms/posix/work_queue - - # - # sources for muorb over fastrpc - # - modules/muorb/adsp - )