From 2385e1091df0b3aadb4e306d354247f155ef2a69 Mon Sep 17 00:00:00 2001
From: David Sidrane <David.Sidrane@NscDg.com>
Date: Fri, 13 Dec 2019 14:10:01 -0800
Subject: [PATCH] fmurt1062-v1:Correct ttyS usage

---
 boards/nxp/fmurt1062-v1/default.cmake         |  8 +++-----
 boards/nxp/fmurt1062-v1/init/rc.board_sensors | 10 +++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/boards/nxp/fmurt1062-v1/default.cmake b/boards/nxp/fmurt1062-v1/default.cmake
index e3e77e02dd..4641540a87 100644
--- a/boards/nxp/fmurt1062-v1/default.cmake
+++ b/boards/nxp/fmurt1062-v1/default.cmake
@@ -11,13 +11,10 @@ px4_add_board(
 #	UAVCAN_INTERFACES 2
 
 	SERIAL_PORTS
-#		GPS1:/dev/ttyS0
-#		TEL1:/dev/ttyS1
-#		TEL2:/dev/ttyS2
-#		GPS2:/dev/ttyS3
-#       ON EVK
 		GPS1:/dev/ttyS1
+		TEL1:/dev/ttyS3
 		TEL2:/dev/ttyS2
+		GPS2:/dev/ttyS4
 
 	DRIVERS
 		adc
@@ -114,6 +111,7 @@ px4_add_board(
 		usb_connected
 		ver
 		work_queue
+		serial_test
 	EXAMPLES
 		bottle_drop # OBC challenge
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
diff --git a/boards/nxp/fmurt1062-v1/init/rc.board_sensors b/boards/nxp/fmurt1062-v1/init/rc.board_sensors
index ff4cedf645..fe8f367019 100644
--- a/boards/nxp/fmurt1062-v1/init/rc.board_sensors
+++ b/boards/nxp/fmurt1062-v1/init/rc.board_sensors
@@ -5,12 +5,12 @@
 #
 # UART mapping on NXP FMURT1062:
 #
-# LPUART2       /dev/ttyS0      GPS
+# LPUART7       /dev/ttyS0      CONSOLE
+# LPUART2       /dev/ttyS1      GPS
 # LPUART3       /dev/ttyS2      TELEM2 (GPIO flow control)
-# LPUART4       /dev/ttyS1      TELEM1 (UART flow control)
-# LPUART5       /dev/ttyS3      TELEM4 GPS2
-# LPUART6       /dev/ttyS4      TELEM3 (RC_INPUT)
-# LPUART7       /dev/ttyS5      CONSOLE
+# LPUART4       /dev/ttyS3      TELEM1 (UART flow control)
+# LPUART5       /dev/ttyS4      TELEM4 GPS2
+# LPUART6       /dev/ttyS5      TELEM3 (RC_INPUT)
 # LPUART8       /dev/ttyS6      PX4IO
 #
 #------------------------------------------------------------------------------