From f32abe85345e0f6d7aaa298f00381f71da78ad65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beat=20K=C3=BCng?= <beat-kueng@gmx.net>
Date: Tue, 27 Aug 2019 11:17:13 +0200
Subject: [PATCH] src/platforms: move remaining source files to
 platforms/common

---
 {src/platforms => platforms/common}/apps.cpp.in | 0
 {src/platforms => platforms/common}/apps.h.in   | 0
 {src/platforms => platforms/common}/empty.c     | 0
 platforms/nuttx/CMakeLists.txt                  | 2 +-
 platforms/nuttx/src/px4/common/CMakeLists.txt   | 2 +-
 platforms/posix/cmake/px4_impl_os.cmake         | 4 ++--
 platforms/qurt/cmake/px4_impl_os.cmake          | 4 ++--
 src/lib/parameters/CMakeLists.txt               | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename {src/platforms => platforms/common}/apps.cpp.in (100%)
 rename {src/platforms => platforms/common}/apps.h.in (100%)
 rename {src/platforms => platforms/common}/empty.c (100%)

diff --git a/src/platforms/apps.cpp.in b/platforms/common/apps.cpp.in
similarity index 100%
rename from src/platforms/apps.cpp.in
rename to platforms/common/apps.cpp.in
diff --git a/src/platforms/apps.h.in b/platforms/common/apps.h.in
similarity index 100%
rename from src/platforms/apps.h.in
rename to platforms/common/apps.h.in
diff --git a/src/platforms/empty.c b/platforms/common/empty.c
similarity index 100%
rename from src/platforms/empty.c
rename to platforms/common/empty.c
diff --git a/platforms/nuttx/CMakeLists.txt b/platforms/nuttx/CMakeLists.txt
index 0177b3953f..afc3c6c8b2 100644
--- a/platforms/nuttx/CMakeLists.txt
+++ b/platforms/nuttx/CMakeLists.txt
@@ -36,7 +36,7 @@ include(cygwin_cygpath)
 set(NUTTX_DIR ${PX4_BINARY_DIR}/NuttX/nuttx)
 set(NUTTX_APPS_DIR ${PX4_BINARY_DIR}/NuttX/apps)
 
-add_executable(px4 ${PX4_SOURCE_DIR}/src/platforms/empty.c)
+add_executable(px4 ${PX4_SOURCE_DIR}/platforms/common/empty.c)
 set(FW_NAME ${PX4_BOARD_VENDOR}_${PX4_BOARD_MODEL}_${PX4_BOARD_LABEL}.elf)
 set_target_properties(px4 PROPERTIES OUTPUT_NAME ${FW_NAME})
 add_dependencies(px4 git_nuttx nuttx_build)
diff --git a/platforms/nuttx/src/px4/common/CMakeLists.txt b/platforms/nuttx/src/px4/common/CMakeLists.txt
index 8d5e50dbae..967dd6e467 100644
--- a/platforms/nuttx/src/px4/common/CMakeLists.txt
+++ b/platforms/nuttx/src/px4/common/CMakeLists.txt
@@ -48,6 +48,6 @@ if (NOT ${PX4_BOARD} MATCHES "px4_io")
 			px4_work_queue
 		)
 else()
-	add_library(px4_layer ${PX4_SOURCE_DIR}/src/platforms/empty.c)
+	add_library(px4_layer ${PX4_SOURCE_DIR}/platforms/common/empty.c)
 endif()
 add_dependencies(px4_layer prebuild_targets)
diff --git a/platforms/posix/cmake/px4_impl_os.cmake b/platforms/posix/cmake/px4_impl_os.cmake
index 08437bda77..cbee631e3b 100644
--- a/platforms/posix/cmake/px4_impl_os.cmake
+++ b/platforms/posix/cmake/px4_impl_os.cmake
@@ -99,8 +99,8 @@ function(px4_posix_generate_builtin_commands)
 			math(EXPR command_count "${command_count}+1")
 		endif()
 	endforeach()
-	configure_file(${PX4_SOURCE_DIR}/src/platforms/apps.cpp.in ${OUT}.cpp)
-	configure_file(${PX4_SOURCE_DIR}/src/platforms/apps.h.in ${OUT}.h)
+	configure_file(${PX4_SOURCE_DIR}/platforms/common/apps.cpp.in ${OUT}.cpp)
+	configure_file(${PX4_SOURCE_DIR}/platforms/common/apps.h.in ${OUT}.h)
 endfunction()
 
 
diff --git a/platforms/qurt/cmake/px4_impl_os.cmake b/platforms/qurt/cmake/px4_impl_os.cmake
index 5f0640059b..94cdb61c23 100644
--- a/platforms/qurt/cmake/px4_impl_os.cmake
+++ b/platforms/qurt/cmake/px4_impl_os.cmake
@@ -95,8 +95,8 @@ function(px4_qurt_generate_builtin_commands)
 			math(EXPR command_count "${command_count}+1")
 		endif()
 	endforeach()
-	configure_file(${PX4_SOURCE_DIR}/src/platforms/apps.cpp.in ${OUT}.cpp)
-	configure_file(${PX4_SOURCE_DIR}/src/platforms/apps.h.in ${OUT}.h)
+	configure_file(${PX4_SOURCE_DIR}/platforms/common/apps.cpp.in ${OUT}.cpp)
+	configure_file(${PX4_SOURCE_DIR}/platforms/common/apps.h.in ${OUT}.h)
 endfunction()
 
 #=============================================================================
diff --git a/src/lib/parameters/CMakeLists.txt b/src/lib/parameters/CMakeLists.txt
index 5293f723bb..6ee0255856 100644
--- a/src/lib/parameters/CMakeLists.txt
+++ b/src/lib/parameters/CMakeLists.txt
@@ -155,7 +155,7 @@ if (NOT "${PX4_BOARD}" MATCHES "px4_io")
 			-Wno-sign-compare	# TODO: fix and enable
 	)
 else()
-	add_library(parameters ${PX4_SOURCE_DIR}/src/platforms/empty.c)
+	add_library(parameters ${PX4_SOURCE_DIR}/platforms/common/empty.c)
 endif()
 add_dependencies(parameters prebuild_targets)