From a3c920db7d2dc1e675f1327851deb0eddf51b931 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beat=20K=C3=BCng?= <beat-kueng@gmx.net>
Date: Thu, 4 Jul 2019 21:46:00 +0200
Subject: [PATCH] board_defaults: remove unnecessary 'set MIXER_AUX none'

On all of these boards '$USE_IO = no' will hold.
---
 ROMFS/px4fmu_common/init.d/rc.interface          | 6 +-----
 boards/airmind/mindpx-v2/init/rc.board_defaults  | 1 -
 boards/av/x-v1/init/rc.board_defaults            | 1 -
 boards/bitcraze/crazyflie/init/rc.board_defaults | 1 -
 boards/intel/aerofc-v1/init/rc.board_defaults    | 1 -
 boards/nxp/fmuk66-v3/init/rc.board_defaults      | 1 -
 boards/omnibus/f4sd/init/rc.board_defaults       | 1 -
 boards/px4/fmu-v4/init/rc.board_defaults         | 1 -
 8 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/ROMFS/px4fmu_common/init.d/rc.interface b/ROMFS/px4fmu_common/init.d/rc.interface
index 67f42f275e..eaadea3e12 100644
--- a/ROMFS/px4fmu_common/init.d/rc.interface
+++ b/ROMFS/px4fmu_common/init.d/rc.interface
@@ -25,11 +25,7 @@ then
         fi
 fi
 
-if ver hwcmp INTEL_AEROFC_V1 AV_X_V1 BITCRAZE_CRAZYFLIE AIRMIND_MINDPX_V2 NXP_FMUK66_V3 PX4_FMU_V4 OMNIBUS_F4SD PX4_SITL
-then
-	set MIXER_AUX none
-fi
-
+# USE_IO is set to 'no' for all boards w/o px4io driver or SYS_USE_IO disabled
 if [ $USE_IO = no ]
 then
 	set MIXER_AUX none
diff --git a/boards/airmind/mindpx-v2/init/rc.board_defaults b/boards/airmind/mindpx-v2/init/rc.board_defaults
index 23fc87c113..77a1dfb795 100644
--- a/boards/airmind/mindpx-v2/init/rc.board_defaults
+++ b/boards/airmind/mindpx-v2/init/rc.board_defaults
@@ -11,4 +11,3 @@ then
 
 fi
 
-set MIXER_AUX none
diff --git a/boards/av/x-v1/init/rc.board_defaults b/boards/av/x-v1/init/rc.board_defaults
index e02a7273b5..cab36b7cfe 100644
--- a/boards/av/x-v1/init/rc.board_defaults
+++ b/boards/av/x-v1/init/rc.board_defaults
@@ -10,4 +10,3 @@ then
 fi
 
 set LOGGER_BUF 64
-set MIXER_AUX none
diff --git a/boards/bitcraze/crazyflie/init/rc.board_defaults b/boards/bitcraze/crazyflie/init/rc.board_defaults
index 92a71ce4fb..8b119fc42a 100644
--- a/boards/bitcraze/crazyflie/init/rc.board_defaults
+++ b/boards/bitcraze/crazyflie/init/rc.board_defaults
@@ -15,4 +15,3 @@ then
 
 fi
 
-set MIXER_AUX none
diff --git a/boards/intel/aerofc-v1/init/rc.board_defaults b/boards/intel/aerofc-v1/init/rc.board_defaults
index 6a63205fa5..7144df2d8b 100644
--- a/boards/intel/aerofc-v1/init/rc.board_defaults
+++ b/boards/intel/aerofc-v1/init/rc.board_defaults
@@ -15,4 +15,3 @@ param set SYS_AUTOSTART 4070
 
 set DATAMAN_OPT -i
 set LOGGER_ARGS "-m mavlink"
-set MIXER_AUX none
diff --git a/boards/nxp/fmuk66-v3/init/rc.board_defaults b/boards/nxp/fmuk66-v3/init/rc.board_defaults
index 78eca13a10..52739b0d63 100644
--- a/boards/nxp/fmuk66-v3/init/rc.board_defaults
+++ b/boards/nxp/fmuk66-v3/init/rc.board_defaults
@@ -9,4 +9,3 @@ then
 
 fi
 
-set MIXER_AUX none
diff --git a/boards/omnibus/f4sd/init/rc.board_defaults b/boards/omnibus/f4sd/init/rc.board_defaults
index e26bffe55f..08963709f0 100644
--- a/boards/omnibus/f4sd/init/rc.board_defaults
+++ b/boards/omnibus/f4sd/init/rc.board_defaults
@@ -25,4 +25,3 @@ then
 	param set SYS_HAS_MAG 0
 fi
 
-set MIXER_AUX none
diff --git a/boards/px4/fmu-v4/init/rc.board_defaults b/boards/px4/fmu-v4/init/rc.board_defaults
index 40d7e281e5..186da5ee37 100644
--- a/boards/px4/fmu-v4/init/rc.board_defaults
+++ b/boards/px4/fmu-v4/init/rc.board_defaults
@@ -11,4 +11,3 @@ then
 
 fi
 
-set MIXER_AUX none