move src/firmware/ to platforms

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

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}

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}

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}

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}

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

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()

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

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

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
 	)