From 62dee7d0965fc506588f06614d2d84c0062e430d Mon Sep 17 00:00:00 2001
From: David Sidrane <david_s5@nscdg.com>
Date: Wed, 18 Jan 2017 10:47:02 -1000
Subject: [PATCH] PX4FMUV2: moved GPIO defines to px4fmu-v2/board_config.h

---
 src/drivers/boards/px4fmu-v2/board_config.h | 19 ++++++++++++++
 src/drivers/drv_gpio.h                      | 28 ---------------------
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/src/drivers/boards/px4fmu-v2/board_config.h b/src/drivers/boards/px4fmu-v2/board_config.h
index 294cb3f80b..45f52688a5 100644
--- a/src/drivers/boards/px4fmu-v2/board_config.h
+++ b/src/drivers/boards/px4fmu-v2/board_config.h
@@ -262,6 +262,25 @@
 		{GPIO_VDD_5V_HIPOWER_OC, 0,                       0}, \
 		{GPIO_VDD_5V_PERIPH_OC,  0,                       0}, }
 
+/*
+ * GPIO numbers.
+ *
+ * There are no alternate functions on this board.
+ */
+#define GPIO_SERVO_1          (1<<0)  /**< servo 1 output */
+#define GPIO_SERVO_2          (1<<1)  /**< servo 2 output */
+#define GPIO_SERVO_3          (1<<2)  /**< servo 3 output */
+#define GPIO_SERVO_4          (1<<3)  /**< servo 4 output */
+#define GPIO_SERVO_5          (1<<4)  /**< servo 5 output */
+#define GPIO_SERVO_6          (1<<5)  /**< servo 6 output */
+
+#define GPIO_5V_PERIPH_EN     (1<<6)  /**< PA8 - !VDD_5V_PERIPH_EN */
+#define GPIO_3V3_SENSORS_EN   (1<<7)  /**< PE3 - VDD_3V3_SENSORS_EN */
+#define GPIO_BRICK_VALID      (1<<8)  /**< PB5 - !VDD_BRICK_VALID */
+#define GPIO_SERVO_VALID      (1<<9)  /**< PB7 - !VDD_SERVO_VALID */
+#define GPIO_5V_HIPOWER_OC    (1<<10) /**< PE10 - !VDD_5V_HIPOWER_OC */
+#define GPIO_5V_PERIPH_OC     (1<<11) /**< PE10 - !VDD_5V_PERIPH_OC */
+
 /* This board provides a DMA pool and APIs */
 #define BOARD_DMA_ALLOC_POOL_SIZE 5120
 
diff --git a/src/drivers/drv_gpio.h b/src/drivers/drv_gpio.h
index 56cb9d0579..905b8844f6 100644
--- a/src/drivers/drv_gpio.h
+++ b/src/drivers/drv_gpio.h
@@ -74,33 +74,6 @@
 
 #endif
 
-#ifdef CONFIG_ARCH_BOARD_PX4FMU_V2
-/*
- * PX4FMUv2 GPIO numbers.
- *
- * There are no alternate functions on this board.
- */
-# define GPIO_SERVO_1		(1<<0)		/**< servo 1 output */
-# define GPIO_SERVO_2		(1<<1)		/**< servo 2 output */
-# define GPIO_SERVO_3		(1<<2)		/**< servo 3 output */
-# define GPIO_SERVO_4		(1<<3)		/**< servo 4 output */
-# define GPIO_SERVO_5		(1<<4)		/**< servo 5 output */
-# define GPIO_SERVO_6		(1<<5)		/**< servo 6 output */
-
-# define GPIO_5V_PERIPH_EN	(1<<6)		/**< PA8 - !VDD_5V_PERIPH_EN */
-# define GPIO_3V3_SENSORS_EN	(1<<7)		/**< PE3 - VDD_3V3_SENSORS_EN */
-# define GPIO_BRICK_VALID	(1<<8)		/**< PB5 - !VDD_BRICK_VALID */
-# define GPIO_SERVO_VALID	(1<<9)		/**< PB7 - !VDD_SERVO_VALID */
-# define GPIO_5V_HIPOWER_OC	(1<<10)		/**< PE10 - !VDD_5V_HIPOWER_OC */
-# define GPIO_5V_PERIPH_OC	(1<<11)		/**< PE10 - !VDD_5V_PERIPH_OC */
-
-/**
- * Device paths for things that support the GPIO ioctl protocol.
- */
-# define PX4FMU_DEVICE_PATH	"/dev/px4fmu"
-# define PX4IO_DEVICE_PATH	"/dev/px4io"
-
-#endif
 
 #ifdef CONFIG_ARCH_BOARD_PX4FMU_V5
 /*
@@ -289,7 +262,6 @@
 	!defined(CONFIG_ARCH_BOARD_MINDPX_V2)            && \
 	!defined(CONFIG_ARCH_BOARD_PX4_STM32F4DISCOVERY) && \
 	!defined(CONFIG_ARCH_BOARD_PX4FMU_V1)            && \
-	!defined(CONFIG_ARCH_BOARD_PX4FMU_V2)            && \
 	!defined(CONFIG_ARCH_BOARD_PX4FMU_V4)            && \
 	!defined(CONFIG_ARCH_BOARD_PX4FMU_V4PRO)         && \
 	!defined(CONFIG_ARCH_BOARD_PX4FMU_V5)            && \