OP-899: move board-specific pios_board.h files into board directories

flight/PiOS/Boards/pios_board.h

@@ -1,21 +0,0 @@
-/*
- * Generic pios_board.h header.
- * There is no #ifdef guard here since only one of headers should be included.
- * All they share the same guard define to prevent double inclusion.
- */
-
-#if USE_STM32103CB_CC_Rev1
-#include "STM32103CB_CC_Rev1.h"
-#elif USE_STM32103CB_OPLINKMINI
-#include "STM32103CB_OPLinkMini_Rev1.h"
-#elif USE_STM32F4xx_RM
-#include "STM32F4xx_Revolution.h"
-#elif USE_STM32F4xx_OSD
-#include "STM32F4xx_OSD.h"
-#elif USE_STM32F4xx_OP
-#include "STM32F4xx_SensorTest.h"
-#elif USE_SIM_POSIX
-#include "sim_posix.h"
-#else
-#error Board definition has not been provided.
-#endif

flight/targets/common/bootloader_updater/Makefile

@@ -32,7 +32,6 @@ OPSYSTEM	= $(TOPDIR)
 OPSYSTEMINC	= $(OPSYSTEM)/inc
 PIOSINC		= $(PIOS)/inc
 PIOSCOMMON	= $(PIOS)/Common
-PIOSBOARDS	= $(PIOS)/Boards
 FLIGHTLIBINC	= $(FLIGHTLIB)/inc
 HWDEFSINC	= ../../boards/$(BOARD_NAME)
 
@@ -59,7 +58,6 @@ EXTRAINCDIRS += $(PIOSINC)
 EXTRAINCDIRS += $(HWDEFSINC)
 EXTRAINCDIRS += $(FLIGHTLIBINC)
 EXTRAINCDIRS += $(PIOSCOMMON)
-EXTRAINCDIRS += $(PIOSBOARDS)
 EXTRAINCDIRS += $(OPSYSTEMINC)
 
 # Link: create ELF output file from object files.

make/apps-defs.mk

@@ -23,10 +23,10 @@ endif
 # Paths
 TOPDIR		= .
 OPSYSTEM	= $(TOPDIR)
+BOARDINC	= $(TOPDIR)/..
 OPSYSTEMINC	= $(OPSYSTEM)/inc
 PIOSINC		= $(PIOS)/inc
 PIOSCOMMON	= $(PIOS)/Common
-PIOSBOARDS	= $(PIOS)/Boards
 FLIGHTLIBINC	= $(FLIGHTLIB)/inc
 
 ## UAVTalk and UAVObject manager
@@ -138,9 +138,9 @@ ASRCARM +=
 #    Each directory must be seperated by a space.
 EXTRAINCDIRS += $(PIOS)
 EXTRAINCDIRS += $(PIOSINC)
+EXTRAINCDIRS += $(BOARDINC)
 EXTRAINCDIRS += $(FLIGHTLIBINC)
 EXTRAINCDIRS += $(PIOSCOMMON)
-EXTRAINCDIRS += $(PIOSBOARDS)
 EXTRAINCDIRS += $(OPSYSTEMINC)
 EXTRAINCDIRS += $(MATHLIBINC)
 EXTRAINCDIRS += $(OPUAVOBJINC)

make/boot-defs.mk

@@ -23,10 +23,10 @@ endif
 # Paths
 TOPDIR		= .
 OPSYSTEM	= $(TOPDIR)
+BOARDINC	= $(TOPDIR)/..
 OPSYSTEMINC	= $(OPSYSTEM)/inc
 PIOSINC		= $(PIOS)/inc
 PIOSCOMMON	= $(PIOS)/Common
-PIOSBOARDS	= $(PIOS)/Boards
 FLIGHTLIBINC	= $(FLIGHTLIB)/inc
 
 # ARM DSP library
@@ -87,9 +87,9 @@ ASRCARM +=
 #    Each directory must be seperated by a space.
 EXTRAINCDIRS += $(PIOS)
 EXTRAINCDIRS += $(PIOSINC)
+EXTRAINCDIRS += $(BOARDINC)
 EXTRAINCDIRS += $(FLIGHTLIBINC)
 EXTRAINCDIRS += $(PIOSCOMMON)
-EXTRAINCDIRS += $(PIOSBOARDS)
 EXTRAINCDIRS += $(OPSYSTEMINC)
 
 # List any extra directories to look for library files here.