rename: move board-specific dirs into flight/targets

Conflicts:

	flight/targets/Bootloaders/Revolution/Makefile
	flight/targets/CopterControl/Makefile

Makefile

@@ -737,7 +737,7 @@ fw_$(1): fw_$(1)_opfw
 
 fw_$(1)_%: uavobjects_flight
 	$(V1) mkdir -p $(BUILD_DIR)/fw_$(1)/dep
-	$(V1) cd $(ROOT_DIR)/flight/$(2) && \
+	$(V1) cd $(ROOT_DIR)/flight/targets/$(2) && \
 		$$(MAKE) -r --no-print-directory \
 		BOARD_NAME=$(1) \
 		BOARD_SHORT_NAME=$(3) \
@@ -762,7 +762,7 @@ bl_$(1)_bino: bl_$(1)_bin
 
 bl_$(1)_%:
 	$(V1) mkdir -p $(BUILD_DIR)/bl_$(1)/dep
-	$(V1) cd $(ROOT_DIR)/flight/Bootloaders/$(2) && \
+	$(V1) cd $(ROOT_DIR)/flight/targets/Bootloaders/$(2) && \
 		$$(MAKE) -r --no-print-directory \
 		BOARD_NAME=$(1) \
 		BOARD_SHORT_NAME=$(3) \
@@ -798,7 +798,7 @@ bu_$(1): bu_$(1)_opfw
 
 bu_$(1)_%: bl_$(1)_bino
 	$(V1) mkdir -p $(BUILD_DIR)/bu_$(1)/dep
-	$(V1) cd $(ROOT_DIR)/flight/Bootloaders/BootloaderUpdater && \
+	$(V1) cd $(ROOT_DIR)/flight/targets/Bootloaders/BootloaderUpdater && \
 		$$(MAKE) -r --no-print-directory \
 		BOARD_NAME=$(1) \
 		BOARD_SHORT_NAME=$(3) \
@@ -820,7 +820,7 @@ ef_$(1): ef_$(1)_bin
 
 ef_$(1)_%: bl_$(1)_bin fw_$(1)_opfw
 	$(V1) mkdir -p $(BUILD_DIR)/ef_$(1)/dep
-	$(V1) cd $(ROOT_DIR)/flight/EntireFlash && \
+	$(V1) cd $(ROOT_DIR)/flight/targets/EntireFlash && \
 		$$(MAKE) -r --no-print-directory \
 		BOARD_NAME=$(1) \
 		BOARD_SHORT_NAME=$(3) \
@@ -958,7 +958,7 @@ sim_win32: sim_win32_exe
 sim_win32_%: uavobjects_flight
 	$(V1) mkdir -p $(BUILD_DIR)/sitl_win32
 	$(V1) $(MAKE) --no-print-directory \
-		-C $(ROOT_DIR)/flight/OpenPilot --file=$(ROOT_DIR)/flight/OpenPilot/Makefile.win32 $*
+		-C $(ROOT_DIR)/flight/targets/OpenPilot --file=$(ROOT_DIR)/flight/targets/OpenPilot/Makefile.win32 $*
 
 .PHONY: sim_osx
 sim_osx: sim_osx_elf
@@ -966,7 +966,7 @@ sim_osx: sim_osx_elf
 sim_osx_%: uavobjects_flight
 	$(V1) mkdir -p $(BUILD_DIR)/sim_osx
 	$(V1) $(MAKE) --no-print-directory \
-		-C $(ROOT_DIR)/flight/Revolution --file=$(ROOT_DIR)/flight/Revolution/Makefile.osx $*
+		-C $(ROOT_DIR)/flight/targets/Revolution --file=$(ROOT_DIR)/flight/targets/Revolution/Makefile.osx $*
 ##############################
 #
 # Packaging components

flight/OpenPilot/System/pios_usb_board_data.c

@@ -1,120 +0,0 @@
-/**
- ******************************************************************************
- * @addtogroup PIOS PIOS Core hardware abstraction layer
- * @{
- * @addtogroup PIOS_USB_BOARD Board specific USB definitions
- * @brief Board specific USB definitions
- * @{
- *
- * @file       pios_usb_board_data.c
- * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
- * @brief      Board specific USB definitions
- * @see        The GNU Public License (GPL) Version 3
- *
- *****************************************************************************/
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include "pios_usb_board_data.h" /* struct usb_*, USB_* */
-#include "pios_sys.h"		 /* PIOS_SYS_SerialNumberGet */
-#include "pios_usbhook.h"	 /* PIOS_USBHOOK_* */
-
-static const uint8_t usb_product_id[20] = {
-	sizeof(usb_product_id),
-	USB_DESC_TYPE_STRING,
-	'O', 0,
-	'p', 0,
-	'e', 0,
-	'n', 0,
-	'P', 0,
-	'i', 0,
-	'l', 0,
-	'o', 0,
-	't', 0,
-};
-
-static uint8_t usb_serial_number[52] = {
-	sizeof(usb_serial_number),
-	USB_DESC_TYPE_STRING,
-	0, 0,
-	0, 0,
-	0, 0,
-	0, 0,
-	0, 0,
-	0, 0,
-	0, 0,
-	0, 0,
-	0, 0,
-	0, 0,
-	0, 0,
-	0, 0,
-	0, 0,
-	0, 0,
-	0, 0,
-	0, 0,
-	0, 0,
-	0, 0,
-	0, 0,
-	0, 0,
-	0, 0,
-	0, 0,
-	0, 0,
-	0, 0,
-	0, 0
-};
-
-static const struct usb_string_langid usb_lang_id = {
-	.bLength = sizeof(usb_lang_id),
-	.bDescriptorType = USB_DESC_TYPE_STRING,
-	.bLangID = htousbs(USB_LANGID_ENGLISH_UK),
-};
-
-static const uint8_t usb_vendor_id[28] = {
-	sizeof(usb_vendor_id),
-	USB_DESC_TYPE_STRING,
-	'o', 0,
-	'p', 0,
-	'e', 0,
-	'n', 0,
-	'p', 0,
-	'i', 0,
-	'l', 0,
-	'o', 0,
-	't', 0,
-	'.', 0,
-	'o', 0,
-	'r', 0,
-	'g', 0
-};
-
-int32_t PIOS_USB_BOARD_DATA_Init(void)
-{
-	/* Load device serial number into serial number string */
-	uint8_t sn[25];
-	PIOS_SYS_SerialNumberGet((char *)sn);
-	for (uint8_t i = 0; sn[i] != '\0' && (2 * i) < usb_serial_number[0]; i++) {
-		usb_serial_number[2 + 2 * i] = sn[i];
-	}
-
-	PIOS_USBHOOK_RegisterString(USB_STRING_DESC_PRODUCT, (uint8_t *)&usb_product_id, sizeof(usb_product_id));
-	PIOS_USBHOOK_RegisterString(USB_STRING_DESC_SERIAL, (uint8_t *)&usb_serial_number, sizeof(usb_serial_number));
-
-	PIOS_USBHOOK_RegisterString(USB_STRING_DESC_LANG, (uint8_t *)&usb_lang_id, sizeof(usb_lang_id));
-	PIOS_USBHOOK_RegisterString(USB_STRING_DESC_VENDOR, (uint8_t *)&usb_vendor_id, sizeof(usb_vendor_id));
-
-	return 0;
-}
-

flight/targets/Bootloaders/BootloaderUpdater/Makefile

@@ -23,7 +23,7 @@
  #####
 
 WHEREAMI := $(dir $(lastword $(MAKEFILE_LIST)))
-TOP      := $(realpath $(WHEREAMI)/../../../)
+TOP      := $(realpath $(WHEREAMI)/../../../../)
 include $(TOP)/make/firmware-defs.mk
 include $(TOP)/make/boards/$(BOARD_NAME)/board-info.mk
 
@@ -61,15 +61,7 @@ FLASH_TOOL = OPENOCD
 # Paths
 OPSYSTEM = .
 OPSYSTEMINC = $(OPSYSTEM)/inc
-OPUAVTALK = ./UAVTalk
+PIOS = ../../../PiOS
-OPUAVTALKINC = $(OPUAVTALK)/inc
-OPUAVOBJ = ./UAVObjects
-OPUAVOBJINC = $(OPUAVOBJ)/inc
-OPTESTS  = ./Tests
-OPMODULEDIR = ./Modules
-FLIGHTLIB = ../../Libraries
-FLIGHTLIBINC = ../../Libraries/inc
-PIOS = ../../PiOS
 PIOSINC = $(PIOS)/inc
 PIOSSTM32F10X = $(PIOS)/STM32F10x
 PIOSCOMMON = $(PIOS)/Common
@@ -89,7 +81,7 @@ RTOSDIR = $(APPLIBDIR)/FreeRTOS
 RTOSSRCDIR = $(RTOSDIR)/Source
 RTOSINCDIR = $(RTOSSRCDIR)/include
 DOXYGENDIR = ../Doc/Doxygen
-HWDEFSINC = $(TOP)/flight/board_hw_defs/$(BOARD_NAME)
+HWDEFSINC = $(TOP)/flight/targets/board_hw_defs/$(BOARD_NAME)
 
 # List C source files here. (C dependencies are automatically generated.)
 # use file-extension c for "c-only"-files

flight/targets/Bootloaders/CopterControl/Makefile

@@ -23,7 +23,7 @@
  #####
 
 WHEREAMI := $(dir $(lastword $(MAKEFILE_LIST)))
-TOP      := $(realpath $(WHEREAMI)/../../../)
+TOP      := $(realpath $(WHEREAMI)/../../../../)
 include $(TOP)/make/firmware-defs.mk
 include $(TOP)/make/boards/$(BOARD_NAME)/board-info.mk
 
@@ -58,15 +58,9 @@ FLASH_TOOL = OPENOCD
 # Paths
 OPSYSTEM = .
 OPSYSTEMINC = $(OPSYSTEM)/inc
-OPUAVTALK = ./UAVTalk
+FLIGHTLIB = ../../../Libraries
-OPUAVTALKINC = $(OPUAVTALK)/inc
+FLIGHTLIBINC = $(FLIGHTLIB)/inc
-OPUAVOBJ = ./UAVObjects
+PIOS = ../../../PiOS
-OPUAVOBJINC = $(OPUAVOBJ)/inc
-OPTESTS  = ./Tests
-OPMODULEDIR = ./Modules
-FLIGHTLIB = ../../Libraries
-FLIGHTLIBINC = ../../Libraries/inc
-PIOS = ../../PiOS
 PIOSINC = $(PIOS)/inc
 PIOSSTM32F10X = $(PIOS)/STM32F10x
 PIOSCOMMON = $(PIOS)/Common

flight/targets/Bootloaders/OSD/Makefile

@@ -23,7 +23,7 @@
  #####
 
 WHEREAMI := $(dir $(lastword $(MAKEFILE_LIST)))
-TOP      := $(realpath $(WHEREAMI)/../../../)
+TOP      := $(realpath $(WHEREAMI)/../../../../)
 include $(TOP)/make/firmware-defs.mk
 include $(TOP)/make/boards/$(BOARD_NAME)/board-info.mk
 
@@ -49,10 +49,10 @@ endif
 # Paths
 OSD_BL = $(WHEREAMI)
 OSD_BLINC = $(OSD_BL)/inc
-PIOS = ../../PiOS
+PIOS = ../../../PiOS
 PIOSINC = $(PIOS)/inc
-FLIGHTLIB = ../../Libraries
+FLIGHTLIB = ../../../Libraries
-FLIGHTLIBINC = ../../Libraries/inc
+FLIGHTLIBINC = $(FLIGHTLIB)/inc
 PIOSSTM32F4XX = $(PIOS)/STM32F4xx
 PIOSCOMMON = $(PIOS)/Common
 PIOSBOARDS = $(PIOS)/Boards

flight/targets/Bootloaders/PipXtreme/Makefile

@@ -23,7 +23,7 @@
  #####
 
 WHEREAMI := $(dir $(lastword $(MAKEFILE_LIST)))
-TOP      := $(realpath $(WHEREAMI)/../../../)
+TOP      := $(realpath $(WHEREAMI)/../../../../)
 include $(TOP)/make/firmware-defs.mk
 include $(TOP)/make/boards/$(BOARD_NAME)/board-info.mk
 
@@ -58,15 +58,9 @@ FLASH_TOOL = OPENOCD
 # Paths
 OPSYSTEM = .
 OPSYSTEMINC = $(OPSYSTEM)/inc
-OPUAVTALK = ./UAVTalk
+FLIGHTLIB = ../../../Libraries
-OPUAVTALKINC = $(OPUAVTALK)/inc
+FLIGHTLIBINC = $(FLIGHTLIB)/inc
-OPUAVOBJ = ./UAVObjects
+PIOS = ../../../PiOS
-OPUAVOBJINC = $(OPUAVOBJ)/inc
-OPTESTS  = ./Tests
-OPMODULEDIR = ./Modules
-FLIGHTLIB = ../../Libraries
-FLIGHTLIBINC = ../../Libraries/inc
-PIOS = ../../PiOS
 PIOSINC = $(PIOS)/inc
 PIOSSTM32F10X = $(PIOS)/STM32F10x
 PIOSCOMMON = $(PIOS)/Common

flight/targets/Bootloaders/RevoMini/Makefile

@@ -23,7 +23,7 @@
  #####
 
 WHEREAMI := $(dir $(lastword $(MAKEFILE_LIST)))
-TOP      := $(realpath $(WHEREAMI)/../../../)
+TOP      := $(realpath $(WHEREAMI)/../../../../)
 include $(TOP)/make/firmware-defs.mk
 include $(TOP)/make/boards/$(BOARD_NAME)/board-info.mk
 
@@ -49,10 +49,10 @@ endif
 # Paths
 REVO_BL = $(WHEREAMI)
 REVO_BLINC = $(REVO_BL)/inc
-PIOS = ../../PiOS
+PIOS = ../../../PiOS
 PIOSINC = $(PIOS)/inc
-FLIGHTLIB = ../../Libraries
+FLIGHTLIB = ../../../Libraries
-FLIGHTLIBINC = ../../Libraries/inc
+FLIGHTLIBINC = $(FLIGHTLIB)/inc
 PIOSSTM32F4XX = $(PIOS)/STM32F4xx
 PIOSCOMMON = $(PIOS)/Common
 PIOSBOARDS = $(PIOS)/Boards

flight/targets/Bootloaders/Revolution/Makefile

@@ -23,7 +23,7 @@
  #####
 
 WHEREAMI := $(dir $(lastword $(MAKEFILE_LIST)))
-TOP      := $(realpath $(WHEREAMI)/../../../)
+TOP      := $(realpath $(WHEREAMI)/../../../../)
 include $(TOP)/make/firmware-defs.mk
 include $(TOP)/make/boards/$(BOARD_NAME)/board-info.mk
 
@@ -49,10 +49,10 @@ endif
 # Paths
 REVO_BL = $(WHEREAMI)
 REVO_BLINC = $(REVO_BL)/inc
-PIOS = ../../PiOS
+PIOS = ../../../PiOS
 PIOSINC = $(PIOS)/inc
-FLIGHTLIB = ../../Libraries
+FLIGHTLIB = ../../../Libraries
-FLIGHTLIBINC = ../../Libraries/inc
+FLIGHTLIBINC = $(FLIGHTLIB)/inc
 PIOSSTM32F4XX = $(PIOS)/STM32F4xx
 PIOSCOMMON = $(PIOS)/Common
 PIOSBOARDS = $(PIOS)/Boards

flight/targets/CopterControl/Makefile

@@ -23,7 +23,7 @@
  #####
 
 WHEREAMI := $(dir $(lastword $(MAKEFILE_LIST)))
-TOP      := $(realpath $(WHEREAMI)/../../)
+TOP      := $(realpath $(WHEREAMI)/../../../)
 include $(TOP)/make/firmware-defs.mk
 include $(TOP)/make/boards/$(BOARD_NAME)/board-info.mk
 
@@ -118,17 +118,17 @@ MODULES += Telemetry
 # Paths
 OPSYSTEM = ./System
 OPSYSTEMINC = $(OPSYSTEM)/inc
-OPUAVTALK = ../UAVTalk
+OPUAVTALK = ../../UAVTalk
 OPUAVTALKINC = $(OPUAVTALK)/inc
-OPUAVOBJ = ../UAVObjects
+OPUAVOBJ = ../../UAVObjects
 OPUAVOBJINC = $(OPUAVOBJ)/inc
 OPTESTS  = ./Tests
-OPMODULEDIR = ../Modules
+OPMODULEDIR = ../../Modules
-FLIGHTLIB = ../Libraries
+FLIGHTLIB = ../../Libraries
 FLIGHTLIBINC = $(FLIGHTLIB)/inc
-MATHLIB = ../Libraries/math
+MATHLIB = ../../Libraries/math
-MATHLIBINC = ../Libraries/math
+MATHLIBINC = ../../Libraries/math
-PIOS = ../PiOS
+PIOS = ../../PiOS
 PIOSINC = $(PIOS)/inc
 PIOSSTM32F10X = $(PIOS)/STM32F10x
 PIOSCOMMON = $(PIOS)/Common

flight/targets/EntireFlash/Makefile

@@ -20,7 +20,7 @@
 #####
 
 WHEREAMI := $(dir $(lastword $(MAKEFILE_LIST)))
-TOP      := $(realpath $(WHEREAMI)/../../)
+TOP      := $(realpath $(WHEREAMI)/../../../)
 include $(TOP)/make/firmware-defs.mk
 include $(TOP)/make/boards/$(BOARD_NAME)/board-info.mk
 

flight/targets/OSD/Makefile

@@ -23,7 +23,7 @@
  #####
 
 WHEREAMI := $(dir $(lastword $(MAKEFILE_LIST)))
-TOP      := $(realpath $(WHEREAMI)/../../)
+TOP      := $(realpath $(WHEREAMI)/../../../)
 include $(TOP)/make/firmware-defs.mk
 include $(TOP)/make/boards/$(BOARD_NAME)/board-info.mk
 
@@ -102,13 +102,13 @@ MODULES += FirmwareIAP
 # Paths
 OPSYSTEM = ./System
 OPSYSTEMINC = $(OPSYSTEM)/inc
-OPUAVTALK = ../UAVTalk
+OPUAVTALK = ../../UAVTalk
 OPUAVTALKINC = $(OPUAVTALK)/inc
-OPMODULEDIR = ../Modules
+OPMODULEDIR = ../../Modules
-PIOS = ../PiOS
+PIOS = ../../PiOS
 PIOSINC = $(PIOS)/inc
-FLIGHTLIB = ../Libraries
+FLIGHTLIB = ../../Libraries
-FLIGHTLIBINC = ../Libraries/inc
+FLIGHTLIBINC = $(FLIGHTLIB)/inc
 PIOSSTM32F4XX = $(PIOS)/STM32F4xx
 PIOSCOMMON = $(PIOS)/Common
 PIOSBOARDS = $(PIOS)/Boards
@@ -125,7 +125,7 @@ RTOSDIR = $(PIOSCOMMONLIB)/FreeRTOS
 RTOSSRCDIR = $(RTOSDIR)/Source
 RTOSINCDIR = $(RTOSSRCDIR)/include
 OPDIR = ../OSD
-OPUAVOBJ = ../UAVObjects
+OPUAVOBJ = ../../UAVObjects
 OPUAVOBJINC = $(OPUAVOBJ)/inc
 OPSYSINC = $(OPDIR)/System/inc
 BOOT = ../Bootloaders/OSD

flight/targets/PipXtreme/Makefile

@@ -23,7 +23,7 @@
  #####
 
 WHEREAMI := $(dir $(lastword $(MAKEFILE_LIST)))
-TOP      := $(realpath $(WHEREAMI)/../../)
+TOP      := $(realpath $(WHEREAMI)/../../../)
 include $(TOP)/make/firmware-defs.mk
 include $(TOP)/make/boards/$(BOARD_NAME)/board-info.mk
 
@@ -78,16 +78,16 @@ MODULES = Radio RadioComBridge
 # Paths
 OPSYSTEM = ./System
 OPSYSTEMINC = $(OPSYSTEM)/inc
-OPUAVTALK = ../UAVTalk
+OPUAVTALK = ../../UAVTalk
 OPUAVTALKINC = $(OPUAVTALK)/inc
-OPUAVOBJ = ../UAVObjects
+OPUAVOBJ = ../../UAVObjects
 OPUAVOBJINC = $(OPUAVOBJ)/inc
 OPTESTS  = ./Tests
-OPMODULEDIR = ../Modules
+OPMODULEDIR = ../../Modules
-FLIGHTLIB = ../Libraries
+FLIGHTLIB = ../../Libraries
 FLIGHTLIBINC = $(FLIGHTLIB)/inc
 RSCODEINC = $(FLIGHTLIB)/rscode
-PIOS = ../PiOS
+PIOS = ../../PiOS
 PIOSINC = $(PIOS)/inc
 PIOSSTM32F10X = $(PIOS)/STM32F10x
 PIOSCOMMON = $(PIOS)/Common