diff --git a/CMakeLists.txt b/CMakeLists.txt index c358ff4972..b4b3c5e34d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,7 +110,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PX4_BINARY_DIR}) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${PX4_BINARY_DIR}) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${PX4_BINARY_DIR}) -list(APPEND CMAKE_MODULE_PATH "${PX4_SOURCE_DIR}/cmake") +list(APPEND CMAKE_MODULE_PATH ${PX4_SOURCE_DIR}/cmake) #============================================================================= # git @@ -155,6 +155,8 @@ if (NOT EXTERNAL_MODULES_LOCATION STREQUAL "") get_filename_component(EXTERNAL_MODULES_LOCATION "${EXTERNAL_MODULES_LOCATION}" ABSOLUTE) endif() +list(APPEND CMAKE_MODULE_PATH ${PX4_SOURCE_DIR}/platforms/${OS}/cmake) + include(platforms/${OS}/cmake/px4_impl_os.cmake) set(config_module "configs/${CONFIG}") include(${config_module}) @@ -399,7 +401,7 @@ foreach(module ${config_module_list}) add_subdirectory(src/${module}) endforeach() -add_subdirectory(src/firmware/${OS}) +add_subdirectory(platforms/${OS}) #============================================================================= # generate custom target to print for all executable and module cmake targets diff --git a/cmake/configs/nuttx_esc35-v1_default.cmake b/cmake/configs/nuttx_esc35-v1_default.cmake index c4c52588e8..de768001cb 100644 --- a/cmake/configs/nuttx_esc35-v1_default.cmake +++ b/cmake/configs/nuttx_esc35-v1_default.cmake @@ -27,7 +27,7 @@ add_definitions( ) px4_nuttx_make_uavcan_bootloadable(BOARD ${BOARD} - BIN ${CMAKE_CURRENT_BINARY_DIR}/src/firmware/nuttx/esc35-v1.bin + BIN ${PX4_BINARY_DIR}/platforms/nuttx/esc35-v1.bin HWNAME ${uavcanblid_name} HW_MAJOR ${uavcanblid_hw_version_major} HW_MINOR ${uavcanblid_hw_version_minor} diff --git a/cmake/configs/nuttx_px4cannode-v1_default.cmake b/cmake/configs/nuttx_px4cannode-v1_default.cmake index 6f80dd0f0a..1eb386b105 100644 --- a/cmake/configs/nuttx_px4cannode-v1_default.cmake +++ b/cmake/configs/nuttx_px4cannode-v1_default.cmake @@ -25,7 +25,7 @@ add_definitions( ) px4_nuttx_make_uavcan_bootloadable(BOARD ${BOARD} - BIN ${PX4_BINARY_DIR}/src/firmware/nuttx/px4cannode-v1.bin + BIN ${PX4_BINARY_DIR}/platforms/nuttx/px4cannode-v1.bin HWNAME ${uavcanblid_name} HW_MAJOR ${uavcanblid_hw_version_major} HW_MINOR ${uavcanblid_hw_version_minor} diff --git a/cmake/configs/nuttx_px4esc-v1_default.cmake b/cmake/configs/nuttx_px4esc-v1_default.cmake index 31714c36b7..0d7dd356f3 100644 --- a/cmake/configs/nuttx_px4esc-v1_default.cmake +++ b/cmake/configs/nuttx_px4esc-v1_default.cmake @@ -27,7 +27,7 @@ add_definitions( ) px4_nuttx_make_uavcan_bootloadable(BOARD ${BOARD} - BIN ${PX4_BINARY_DIR}/src/firmware/nuttx/px4esc-v1.bin + BIN ${PX4_BINARY_DIR}/platforms/nuttx/px4esc-v1.bin HWNAME ${uavcanblid_name} HW_MAJOR ${uavcanblid_hw_version_major} HW_MINOR ${uavcanblid_hw_version_minor} diff --git a/cmake/configs/nuttx_s2740vc-v1_default.cmake b/cmake/configs/nuttx_s2740vc-v1_default.cmake index a7d2fe19e6..5176924673 100644 --- a/cmake/configs/nuttx_s2740vc-v1_default.cmake +++ b/cmake/configs/nuttx_s2740vc-v1_default.cmake @@ -25,7 +25,7 @@ include(configs/uavcan_board_ident/s2740vc-v1) # N.B. this would be uncommented when there is an APP #px4_nuttx_make_uavcan_bootloadable(BOARD ${BOARD} -# BIN ${CMAKE_CURRENT_BINARY_DIR}/src/firmware/nuttx/s2740vc-v1.bin +# BIN ${PX4_BINARY_DIR}/platforms/nuttx/s2740vc-v1.bin # HWNAME ${uavcanblid_name} # HW_MAJOR ${uavcanblid_hw_version_major} # HW_MINOR ${uavcanblid_hw_version_minor} diff --git a/src/firmware/nuttx/CMakeLists.txt b/platforms/nuttx/CMakeLists.txt similarity index 97% rename from src/firmware/nuttx/CMakeLists.txt rename to platforms/nuttx/CMakeLists.txt index 4ae4f0aa0e..9ea4ae1ec0 100644 --- a/src/firmware/nuttx/CMakeLists.txt +++ b/platforms/nuttx/CMakeLists.txt @@ -10,7 +10,7 @@ add_dependencies(${FW_NAME} git_nuttx nuttx_build) get_property(module_libraries GLOBAL PROPERTY PX4_LIBRARIES) # build NuttX -add_subdirectory(${PX4_SOURCE_DIR}/platforms/nuttx/NuttX ${PX4_BINARY_DIR}/NuttX) +add_subdirectory(NuttX ${PX4_BINARY_DIR}/NuttX) set(nuttx_libs) list(APPEND nuttx_libs diff --git a/src/firmware/nuttx/gdbinit.in b/platforms/nuttx/gdbinit.in similarity index 100% rename from src/firmware/nuttx/gdbinit.in rename to platforms/nuttx/gdbinit.in diff --git a/src/firmware/posix/CMakeLists.txt b/platforms/posix/CMakeLists.txt similarity index 98% rename from src/firmware/posix/CMakeLists.txt rename to platforms/posix/CMakeLists.txt index 781947d34e..3d2b365365 100644 --- a/src/firmware/posix/CMakeLists.txt +++ b/platforms/posix/CMakeLists.txt @@ -106,9 +106,9 @@ elseif ("${BOARD}" STREQUAL "bebop") elseif ("${BOARD}" STREQUAL "sitl") - include(./sitl_target.cmake) + include(sitl_target) if(BUILD_TESTING) - include(./sitl_tests.cmake) + include(sitl_tests) endif() else() diff --git a/src/firmware/posix/sitl_target.cmake b/platforms/posix/cmake/sitl_target.cmake similarity index 100% rename from src/firmware/posix/sitl_target.cmake rename to platforms/posix/cmake/sitl_target.cmake diff --git a/src/firmware/posix/sitl_tests.cmake b/platforms/posix/cmake/sitl_tests.cmake similarity index 100% rename from src/firmware/posix/sitl_tests.cmake rename to platforms/posix/cmake/sitl_tests.cmake diff --git a/src/firmware/qurt/CMakeLists.txt b/platforms/qurt/CMakeLists.txt similarity index 100% rename from src/firmware/qurt/CMakeLists.txt rename to platforms/qurt/CMakeLists.txt diff --git a/src/firmware/qurt/px4muorb.idl b/platforms/qurt/px4muorb.idl similarity index 100% rename from src/firmware/qurt/px4muorb.idl rename to platforms/qurt/px4muorb.idl diff --git a/src/modules/muorb/adsp/CMakeLists.txt b/src/modules/muorb/adsp/CMakeLists.txt index c31140884b..08a191b864 100644 --- a/src/modules/muorb/adsp/CMakeLists.txt +++ b/src/modules/muorb/adsp/CMakeLists.txt @@ -30,11 +30,11 @@ # POSSIBILITY OF SUCH DAMAGE. # ############################################################################ -include_directories("../../uORB") px4_add_module( MODULE modules__muorb__adsp - COMPILE_FLAGS + INCLUDES + ${PX4_SOURCE_DIR}/src/modules/uORB SRCS px4muorb.cpp uORBFastRpcChannel.cpp diff --git a/src/modules/muorb/krait/CMakeLists.txt b/src/modules/muorb/krait/CMakeLists.txt index aad1424007..ee2281d283 100644 --- a/src/modules/muorb/krait/CMakeLists.txt +++ b/src/modules/muorb/krait/CMakeLists.txt @@ -38,7 +38,7 @@ px4_add_module( MAIN muorb INCLUDES ${HEXAGON_SDK_INCLUDES} - ${PX4_BINARY_DIR}/src/firmware/posix + ${PX4_BINARY_DIR}/platforms/posix SRCS uORBKraitFastRpcChannel.cpp px4muorb_KraitRpcWrapper.cpp diff --git a/src/platforms/posix/px4_layer/CMakeLists.txt b/src/platforms/posix/px4_layer/CMakeLists.txt index 65eaf52fcb..b0eaad3b4e 100644 --- a/src/platforms/posix/px4_layer/CMakeLists.txt +++ b/src/platforms/posix/px4_layer/CMakeLists.txt @@ -35,9 +35,8 @@ set(EXTRA_DEPENDS) if("${CONFIG_SHMEM}" STREQUAL "1") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PX4_SOURCE_DIR}/cmake/cmake_hexagon") include(hexagon_sdk) - - include_directories(${PX4_BINARY_DIR}/src/firmware/posix) include_directories(${HEXAGON_SDK_INCLUDES}) + include_directories(${PX4_BINARY_DIR}/platforms/posix) list(APPEND SHMEM_SRCS shmem_posix.c )