From ff133660c0096ce3cfc2852aea5c828e224396e2 Mon Sep 17 00:00:00 2001
From: Eric Katzfey <eric.katzfey@modalai.com>
Date: Thu, 15 Feb 2024 18:32:21 -0800
Subject: [PATCH] Fixed the fmu_v5_protected build failure

---
 platforms/common/CMakeLists.txt                           | 3 +--
 platforms/nuttx/src/px4/common/px4_layer.cmake            | 1 +
 platforms/nuttx/src/px4/common/px4_protected_layers.cmake | 2 ++
 platforms/posix/src/px4/common/CMakeLists.txt             | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/platforms/common/CMakeLists.txt b/platforms/common/CMakeLists.txt
index fdd5567de2..c6109decf6 100644
--- a/platforms/common/CMakeLists.txt
+++ b/platforms/common/CMakeLists.txt
@@ -51,10 +51,9 @@ add_library(px4_platform STATIC
 	px4_cli.cpp
 	shutdown.cpp
 	spi.cpp
-	Serial.cpp
 	${SRCS}
 )
-target_link_libraries(px4_platform prebuild_targets px4_work_queue px4_layer)
+target_link_libraries(px4_platform prebuild_targets px4_work_queue)
 
 if(NOT "${PX4_BOARD}" MATCHES "io-v2")
 	add_subdirectory(uORB)
diff --git a/platforms/nuttx/src/px4/common/px4_layer.cmake b/platforms/nuttx/src/px4/common/px4_layer.cmake
index d1747d4935..9199a95289 100644
--- a/platforms/nuttx/src/px4/common/px4_layer.cmake
+++ b/platforms/nuttx/src/px4/common/px4_layer.cmake
@@ -3,6 +3,7 @@
 add_library(px4_layer
 		${KERNEL_SRCS}
 		cdc_acm_check.cpp
+		${PX4_SOURCE_DIR}/platforms/common/Serial.cpp
 		SerialImpl.cpp
 	)
 
diff --git a/platforms/nuttx/src/px4/common/px4_protected_layers.cmake b/platforms/nuttx/src/px4/common/px4_protected_layers.cmake
index 9c57b488b6..a1c6ebc391 100644
--- a/platforms/nuttx/src/px4/common/px4_protected_layers.cmake
+++ b/platforms/nuttx/src/px4/common/px4_protected_layers.cmake
@@ -15,6 +15,8 @@ add_library(px4_layer
 	usr_board_ctrl.c
 	usr_hrt.cpp
 	usr_mcu_version.cpp
+	${PX4_SOURCE_DIR}/platforms/common/Serial.cpp
+	SerialImpl.cpp
 )
 
 target_link_libraries(px4_layer
diff --git a/platforms/posix/src/px4/common/CMakeLists.txt b/platforms/posix/src/px4/common/CMakeLists.txt
index b96705eae3..90d4a77992 100644
--- a/platforms/posix/src/px4/common/CMakeLists.txt
+++ b/platforms/posix/src/px4/common/CMakeLists.txt
@@ -46,6 +46,7 @@ add_library(px4_layer
 	drv_hrt.cpp
 	cpuload.cpp
 	print_load.cpp
+	${PX4_SOURCE_DIR}/platforms/common/Serial.cpp
 	SerialImpl.cpp
 )
 target_compile_definitions(px4_layer PRIVATE MODULE_NAME="px4")