rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-29 14:52:12 +01:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Oleg Semyonov 2013-04-17 00:21:30 +03:00
parent f7332f6905
commit 3f2431c04f
10 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
flight/PiOS/Boards/pios_board.h
View File

@ -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

0
flight/PiOS/Boards/STM32103CB_CC_Rev1.h → flight/targets/boards/coptercontrol/pios_board.h
View File

0
flight/PiOS/Boards/STM32103CB_OPLinkMini_Rev1.h → flight/targets/boards/oplinkmini/pios_board.h
View File

0
flight/PiOS/Boards/STM32F4xx_OSD.h → flight/targets/boards/osd/pios_board.h
View File

0
flight/PiOS/Boards/STM32F4xx_Revolution.h → flight/targets/boards/revolution/pios_board.h
View File

0
flight/PiOS/Boards/STM32F4xx_SensorTest.h → flight/targets/boards/sensortest/pios_board.h
View File

0
flight/PiOS/Boards/sim_posix.h → flight/targets/boards/simposix/pios_board.h
View File

2
flight/targets/common/bootloader_updater/Makefile
View File

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

4
make/apps-defs.mk
View File

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

4
make/boot-defs.mk
View File

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