From daba952ba9a5759e4e433b76e639ba4e16dcfc07 Mon Sep 17 00:00:00 2001
From: David Sidrane <david_s5@nscdg.com>
Date: Fri, 20 Jan 2017 07:16:33 -1000
Subject: [PATCH] Use the BOARD_USES_PX4IO_VERSION to set an overridable FW
 search path

   1) Key the exsitance of the PX4IO HW based on BOARD_USES_PX4IO_VERSION
   2) Set default PX4IO_FW_SEARCH_PATHS based on verions of the PXPIO HW
   3) allow PX4IO_FW_SEARCH_PATHS to be overwritten if a board provides
      BOARD_PX4IO_FW_SEARCH_PATHS
---
 src/drivers/boards/common/board_common.h | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/drivers/boards/common/board_common.h b/src/drivers/boards/common/board_common.h
index d2faba5983..df8ab9f9e4 100644
--- a/src/drivers/boards/common/board_common.h
+++ b/src/drivers/boards/common/board_common.h
@@ -165,11 +165,23 @@
 #endif
 
 /* Conditional use of PX4 PIO is Used to determine if the board
- * has a PX4PIO processor.
- * We then publish the logical BOARD_USES_PX4PIO
+ * has a PX4IO processor.
+ * We then publish the logical BOARD_USES_PX4IO
  */
-#if defined(PX4IO_SERIAL_DEVICE)
-#  define BOARD_USES_PX4PIO	1
+#if defined(BOARD_USES_PX4IO_VERSION)
+#  define BOARD_USES_PX4IO	1
+/*  Allow a board_config to override the PX4IO FW search paths */
+#  if defined(BOARD_PX4IO_FW_SEARCH_PATHS)
+#    define PX4IO_FW_SEARCH_PATHS BOARD_PX4IO_FW_SEARCH_PATHS
+#  else
+/*  Use PX4IO FW search paths defaults based on version */
+#    if BOARD_USES_PX4IO_VERSION == 1
+#      define PX4IO_FW_SEARCH_PATHS {"/etc/extras/px4io-v1.bin", "/fs/microsd/px4io1.bin", "/fs/microsd/px4io.bin", nullptr }
+#    endif
+#    if BOARD_USES_PX4IO_VERSION == 2
+#      define PX4IO_FW_SEARCH_PATHS {"/etc/extras/px4io-v2.bin", "/fs/microsd/px4io2.bin", "/fs/microsd/px4io.bin", nullptr }
+#    endif
+#  endif
 #endif
 
 /************************************************************************************