From e5fd37f719c22aae9e127dad10947bfbb7e5ca25 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Fri, 26 Oct 2012 12:48:00 +0200
Subject: [PATCH] Build fix after cleanup

---
 apps/position_estimator/position_estimator_main.c | 2 --
 nuttx/configs/px4fmu/nsh/defconfig                | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/position_estimator/position_estimator_main.c b/apps/position_estimator/position_estimator_main.c
index f8390f1002..e849452993 100644
--- a/apps/position_estimator/position_estimator_main.c
+++ b/apps/position_estimator/position_estimator_main.c
@@ -61,8 +61,6 @@
 #include <uORB/topics/vehicle_local_position.h>
 #include <poll.h>
 
-#include "codegen/position_estimator.h"
-
 #define N_STATES 6
 #define ERROR_COVARIANCE_INIT 3
 #define R_EARTH 6371000.0
diff --git a/nuttx/configs/px4fmu/nsh/defconfig b/nuttx/configs/px4fmu/nsh/defconfig
index c2656217d4..45934e800b 100755
--- a/nuttx/configs/px4fmu/nsh/defconfig
+++ b/nuttx/configs/px4fmu/nsh/defconfig
@@ -236,11 +236,11 @@ CONFIG_AT24XX_MTD_BLOCKSIZE=256
 CONFIG_SERIAL_TERMIOS=y
 CONFIG_SERIAL_CONSOLE_REINIT=y
 
-CONFIG_USART1_SERIAL_CONSOLE=y
+CONFIG_USART1_SERIAL_CONSOLE=n
 CONFIG_USART2_SERIAL_CONSOLE=n
 CONFIG_USART3_SERIAL_CONSOLE=n
 CONFIG_UART4_SERIAL_CONSOLE=n
-CONFIG_UART5_SERIAL_CONSOLE=n
+CONFIG_UART5_SERIAL_CONSOLE=y
 CONFIG_USART6_SERIAL_CONSOLE=n
 
 #Mavlink messages can be bigger than 128