From 04025de32df307dc03387633243702ceeccd94c0 Mon Sep 17 00:00:00 2001
From: kevindehecker <kevindehecker@hotmail.com>
Date: Thu, 2 Feb 2017 18:51:16 +0100
Subject: [PATCH] Disable default uart6 intermcu port for none intermcu px4
 boards (#1997)

---
 conf/modules/px4_flash.xml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/conf/modules/px4_flash.xml b/conf/modules/px4_flash.xml
index e48bedb4e3..6052fc050b 100644
--- a/conf/modules/px4_flash.xml
+++ b/conf/modules/px4_flash.xml
@@ -1,10 +1,9 @@
 <!DOCTYPE module SYSTEM "module.dtd">
-
 <module name="px4_flash">
   <doc>
     <description>
-      Flash pixhawk via PX4 bootloader.
-      Flashes the PX4IO (STM32F1) through the PX4 bootloader, or resets the PX4FMU (STM32F4) to be flashed directly by the F4' PX4 bootloader.
+      Flash Pixhawk via PX4 bootloader.
+      Flashes the PX4IO (STM32F1) through the PX4 bootloader, or resets the PX4FMU (STM32F4) to be flashed directly by the F4's PX4 bootloader.
     </description>
     <configure name="PX4IO_UART" value="uart6" description="Uart on PX4FMU connected to PX4IO"/>
     <configure name="PX4IO_BAUD" value="B1500000" description="Baud rate for PX4IO flashing"/>
@@ -18,12 +17,12 @@
   <event fun="px4flash_event()"/>
   <makefile target="ap">
     <file name="px4_flash.c"/>
-    <file name="usb_ser_hw.c"  dir="arch/stm32"/>
-    <configure name="PX4IO_UART" default="uart6" case="upper|lower"/>
+    <file name="usb_ser_hw.c"  dir="arch/stm32"/>        
+    <configure name="PX4IO_UART" default="uart6" case="upper|lower" />
     <configure name="PX4IO_BAUD" default="B1500000"/>
-    <define name="USE_$(PX4IO_UART_UPPER)"/>
-    <define name="PX4IO_UART" value="$(PX4IO_UART_LOWER)"/>
-    <define name="$(PX4IO_UART_UPPER)_BAUD" value="$(PX4IO_BAUD)"/>
+    <define name="USE_$(PX4IO_UART_UPPER)" cond="ifdef INTERMCU_PORT"/>
+    <define name="PX4IO_UART" value="$(PX4IO_UART_LOWER)" cond="ifdef INTERMCU_PORT"/>
+    <define name="$(PX4IO_UART_UPPER)_BAUD" value="$(PX4IO_BAUD)" cond="ifdef INTERMCU_PORT"/>
 
     <configure name="FLASH_PORT" default="usb_serial" case="upper|lower"/>
     <configure name="FLASH_BAUD" default="B115200"/>