From fc845888d33bf23ca8d4a563002b1e583c8d06cd Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Mon, 15 Apr 2013 17:02:01 +0300 Subject: [PATCH] OP-899: move board targets under targets/boards --- Makefile | 4 ++-- flight/targets/{ => boards}/CopterControl/Makefile | 0 .../CopterControl/System/coptercontrol.c | 0 .../CopterControl/System/inc/FreeRTOSConfig.h | 0 .../CopterControl/System/inc/openpilot.h | 0 .../CopterControl/System/inc/pios_board_posix.h | 0 .../CopterControl/System/inc/pios_config.h | 0 .../CopterControl/System/inc/pios_config_posix.h | 0 .../CopterControl/System/inc/pios_usb_board_data.h | 0 .../{ => boards}/CopterControl/System/pios_board.c | 0 .../CopterControl/System/pios_board_posix.c | 0 .../CopterControl/System/pios_usb_board_data.c | 0 flight/targets/{ => boards}/OPLinkMini/Makefile | 0 .../OPLinkMini/System/inc/FreeRTOSConfig.h | 0 .../{ => boards}/OPLinkMini/System/inc/openpilot.h | 0 .../OPLinkMini/System/inc/pios_board_posix.h | 0 .../OPLinkMini/System/inc/pios_config.h | 0 .../OPLinkMini/System/inc/pios_config_posix.h | 0 .../OPLinkMini/System/inc/pios_usb_board_data.h | 0 .../{ => boards}/OPLinkMini/System/oplink.c | 0 .../{ => boards}/OPLinkMini/System/pios_board.c | 0 .../OPLinkMini/System/pios_board_posix.c | 0 .../OPLinkMini/System/pios_usb_board_data.c | 0 flight/targets/{ => boards}/OSD/Makefile | 0 .../{ => boards}/OSD/System/cm3_fault_handlers.c | 0 flight/targets/{ => boards}/OSD/System/dcc_stdio.c | 0 .../{ => boards}/OSD/System/font_outlined8x14.c | 0 .../{ => boards}/OSD/System/font_outlined8x8.c | 0 flight/targets/{ => boards}/OSD/System/fonts.c | 0 .../{ => boards}/OSD/System/inc/FreeRTOSConfig.h | 0 .../{ => boards}/OSD/System/inc/dcc_stdio.h | 0 .../{ => boards}/OSD/System/inc/font12x18.h | 0 .../targets/{ => boards}/OSD/System/inc/font8x10.h | 0 .../OSD/System/inc/font_outlined8x14.h | 0 .../{ => boards}/OSD/System/inc/font_outlined8x8.h | 0 flight/targets/{ => boards}/OSD/System/inc/fonts.h | 0 .../{ => boards}/OSD/System/inc/openpilot.h | 0 .../{ => boards}/OSD/System/inc/pios_config.h | 0 .../OSD/System/inc/pios_usb_board_data.h | 0 .../targets/{ => boards}/OSD/System/inc/splash.h | 0 flight/targets/{ => boards}/OSD/System/osd.c | 0 .../targets/{ => boards}/OSD/System/pios_board.c | 0 .../{ => boards}/OSD/System/pios_usb_board_data.c | 0 flight/targets/{ => boards}/Revolution/Makefile | 0 .../targets/{ => boards}/Revolution/Makefile.osx | 0 .../Revolution/System/cm3_fault_handlers.c | 0 .../{ => boards}/Revolution/System/dcc_stdio.c | 0 .../Revolution/System/inc/FreeRTOSConfig.h | 0 .../{ => boards}/Revolution/System/inc/dcc_stdio.h | 0 .../{ => boards}/Revolution/System/inc/openpilot.h | 0 .../Revolution/System/inc/pios_board_sim.h | 0 .../Revolution/System/inc/pios_config.h | 0 .../Revolution/System/inc/pios_config_sim.h | 0 .../Revolution/System/inc/pios_usb_board_data.h | 0 .../{ => boards}/Revolution/System/pios_board.c | 0 .../Revolution/System/pios_board_sim.c | 0 .../Revolution/System/pios_usb_board_data.c | 0 .../{ => boards}/Revolution/System/revolution.c | 0 .../targets/{ => boards}/Revolution/UAVObjects.inc | 0 flight/targets/{ => boards}/SensorTest/Makefile | 0 .../targets/{ => boards}/SensorTest/Makefile.osx | 0 .../SensorTest/System/cm3_fault_handlers.c | 0 .../{ => boards}/SensorTest/System/dcc_stdio.c | 0 .../SensorTest/System/inc/FreeRTOSConfig.h | 0 .../{ => boards}/SensorTest/System/inc/dcc_stdio.h | 0 .../{ => boards}/SensorTest/System/inc/openpilot.h | 0 .../SensorTest/System/inc/pios_board_sim.h | 0 .../SensorTest/System/inc/pios_config.h | 0 .../SensorTest/System/inc/pios_config_sim.h | 0 .../SensorTest/System/inc/pios_usb_board_data.h | 0 .../{ => boards}/SensorTest/System/pios_board.c | 0 .../SensorTest/System/pios_board_sim.c | 0 .../SensorTest/System/pios_usb_board_data.c | 0 .../{ => boards}/SensorTest/System/revolution.c | 0 .../targets/{ => boards}/SensorTest/UAVObjects.inc | 0 flight/targets/{ => boards}/SimPosix/Makefile | 14 ++++++-------- .../SimPosix/System/inc/FreeRTOSConfig.h | 0 .../SimPosix/System/inc/FreeRTOSConfig_bk.h | 0 .../{ => boards}/SimPosix/System/inc/dcc_stdio.h | 0 .../{ => boards}/SimPosix/System/inc/openpilot.h | 0 .../{ => boards}/SimPosix/System/inc/pios_config.h | 0 .../{ => boards}/SimPosix/System/pios_board.c | 0 .../{ => boards}/SimPosix/System/simposix.c | 0 .../targets/{ => boards}/SimPosix/UAVObjects.inc | 0 84 files changed, 8 insertions(+), 10 deletions(-) rename flight/targets/{ => boards}/CopterControl/Makefile (100%) rename flight/targets/{ => boards}/CopterControl/System/coptercontrol.c (100%) rename flight/targets/{ => boards}/CopterControl/System/inc/FreeRTOSConfig.h (100%) rename flight/targets/{ => boards}/CopterControl/System/inc/openpilot.h (100%) rename flight/targets/{ => boards}/CopterControl/System/inc/pios_board_posix.h (100%) rename flight/targets/{ => boards}/CopterControl/System/inc/pios_config.h (100%) rename flight/targets/{ => boards}/CopterControl/System/inc/pios_config_posix.h (100%) rename flight/targets/{ => boards}/CopterControl/System/inc/pios_usb_board_data.h (100%) rename flight/targets/{ => boards}/CopterControl/System/pios_board.c (100%) rename flight/targets/{ => boards}/CopterControl/System/pios_board_posix.c (100%) rename flight/targets/{ => boards}/CopterControl/System/pios_usb_board_data.c (100%) rename flight/targets/{ => boards}/OPLinkMini/Makefile (100%) rename flight/targets/{ => boards}/OPLinkMini/System/inc/FreeRTOSConfig.h (100%) rename flight/targets/{ => boards}/OPLinkMini/System/inc/openpilot.h (100%) rename flight/targets/{ => boards}/OPLinkMini/System/inc/pios_board_posix.h (100%) rename flight/targets/{ => boards}/OPLinkMini/System/inc/pios_config.h (100%) rename flight/targets/{ => boards}/OPLinkMini/System/inc/pios_config_posix.h (100%) rename flight/targets/{ => boards}/OPLinkMini/System/inc/pios_usb_board_data.h (100%) rename flight/targets/{ => boards}/OPLinkMini/System/oplink.c (100%) rename flight/targets/{ => boards}/OPLinkMini/System/pios_board.c (100%) rename flight/targets/{ => boards}/OPLinkMini/System/pios_board_posix.c (100%) rename flight/targets/{ => boards}/OPLinkMini/System/pios_usb_board_data.c (100%) rename flight/targets/{ => boards}/OSD/Makefile (100%) rename flight/targets/{ => boards}/OSD/System/cm3_fault_handlers.c (100%) rename flight/targets/{ => boards}/OSD/System/dcc_stdio.c (100%) rename flight/targets/{ => boards}/OSD/System/font_outlined8x14.c (100%) rename flight/targets/{ => boards}/OSD/System/font_outlined8x8.c (100%) rename flight/targets/{ => boards}/OSD/System/fonts.c (100%) rename flight/targets/{ => boards}/OSD/System/inc/FreeRTOSConfig.h (100%) rename flight/targets/{ => boards}/OSD/System/inc/dcc_stdio.h (100%) rename flight/targets/{ => boards}/OSD/System/inc/font12x18.h (100%) rename flight/targets/{ => boards}/OSD/System/inc/font8x10.h (100%) rename flight/targets/{ => boards}/OSD/System/inc/font_outlined8x14.h (100%) rename flight/targets/{ => boards}/OSD/System/inc/font_outlined8x8.h (100%) rename flight/targets/{ => boards}/OSD/System/inc/fonts.h (100%) rename flight/targets/{ => boards}/OSD/System/inc/openpilot.h (100%) rename flight/targets/{ => boards}/OSD/System/inc/pios_config.h (100%) rename flight/targets/{ => boards}/OSD/System/inc/pios_usb_board_data.h (100%) rename flight/targets/{ => boards}/OSD/System/inc/splash.h (100%) rename flight/targets/{ => boards}/OSD/System/osd.c (100%) rename flight/targets/{ => boards}/OSD/System/pios_board.c (100%) rename flight/targets/{ => boards}/OSD/System/pios_usb_board_data.c (100%) rename flight/targets/{ => boards}/Revolution/Makefile (100%) rename flight/targets/{ => boards}/Revolution/Makefile.osx (100%) rename flight/targets/{ => boards}/Revolution/System/cm3_fault_handlers.c (100%) rename flight/targets/{ => boards}/Revolution/System/dcc_stdio.c (100%) rename flight/targets/{ => boards}/Revolution/System/inc/FreeRTOSConfig.h (100%) rename flight/targets/{ => boards}/Revolution/System/inc/dcc_stdio.h (100%) rename flight/targets/{ => boards}/Revolution/System/inc/openpilot.h (100%) rename flight/targets/{ => boards}/Revolution/System/inc/pios_board_sim.h (100%) rename flight/targets/{ => boards}/Revolution/System/inc/pios_config.h (100%) rename flight/targets/{ => boards}/Revolution/System/inc/pios_config_sim.h (100%) rename flight/targets/{ => boards}/Revolution/System/inc/pios_usb_board_data.h (100%) rename flight/targets/{ => boards}/Revolution/System/pios_board.c (100%) rename flight/targets/{ => boards}/Revolution/System/pios_board_sim.c (100%) rename flight/targets/{ => boards}/Revolution/System/pios_usb_board_data.c (100%) rename flight/targets/{ => boards}/Revolution/System/revolution.c (100%) rename flight/targets/{ => boards}/Revolution/UAVObjects.inc (100%) rename flight/targets/{ => boards}/SensorTest/Makefile (100%) rename flight/targets/{ => boards}/SensorTest/Makefile.osx (100%) rename flight/targets/{ => boards}/SensorTest/System/cm3_fault_handlers.c (100%) rename flight/targets/{ => boards}/SensorTest/System/dcc_stdio.c (100%) rename flight/targets/{ => boards}/SensorTest/System/inc/FreeRTOSConfig.h (100%) rename flight/targets/{ => boards}/SensorTest/System/inc/dcc_stdio.h (100%) rename flight/targets/{ => boards}/SensorTest/System/inc/openpilot.h (100%) rename flight/targets/{ => boards}/SensorTest/System/inc/pios_board_sim.h (100%) rename flight/targets/{ => boards}/SensorTest/System/inc/pios_config.h (100%) rename flight/targets/{ => boards}/SensorTest/System/inc/pios_config_sim.h (100%) rename flight/targets/{ => boards}/SensorTest/System/inc/pios_usb_board_data.h (100%) rename flight/targets/{ => boards}/SensorTest/System/pios_board.c (100%) rename flight/targets/{ => boards}/SensorTest/System/pios_board_sim.c (100%) rename flight/targets/{ => boards}/SensorTest/System/pios_usb_board_data.c (100%) rename flight/targets/{ => boards}/SensorTest/System/revolution.c (100%) rename flight/targets/{ => boards}/SensorTest/UAVObjects.inc (100%) rename flight/targets/{ => boards}/SimPosix/Makefile (96%) rename flight/targets/{ => boards}/SimPosix/System/inc/FreeRTOSConfig.h (100%) rename flight/targets/{ => boards}/SimPosix/System/inc/FreeRTOSConfig_bk.h (100%) rename flight/targets/{ => boards}/SimPosix/System/inc/dcc_stdio.h (100%) rename flight/targets/{ => boards}/SimPosix/System/inc/openpilot.h (100%) rename flight/targets/{ => boards}/SimPosix/System/inc/pios_config.h (100%) rename flight/targets/{ => boards}/SimPosix/System/pios_board.c (100%) rename flight/targets/{ => boards}/SimPosix/System/simposix.c (100%) rename flight/targets/{ => boards}/SimPosix/UAVObjects.inc (100%) diff --git a/Makefile b/Makefile index 08974154b..d00d51683 100644 --- a/Makefile +++ b/Makefile @@ -269,13 +269,13 @@ fw_$(1): fw_$(1)_opfw fw_$(1)_%: uavobjects_flight $(V1) $$(ARM_GCC_VERSION_CHECK_TEMPLATE) $(V1) $(MKDIR) -p $(BUILD_DIR)/fw_$(1)/dep - $(V1) cd $(ROOT_DIR)/flight/targets/$(2) && \ + $(V1) cd $(ROOT_DIR)/flight/targets/boards/$(2) && \ $$(MAKE) -r --no-print-directory \ BOARD_NAME=$(1) \ BOARD_SHORT_NAME=$(3) \ BUILD_TYPE=fw \ HWDEFSINC=$(HWDEFS)/$(1) \ - TOPDIR=$(ROOT_DIR)/flight/targets/$(2) \ + TOPDIR=$(ROOT_DIR)/flight/targets/boards/$(2) \ OUTDIR=$(BUILD_DIR)/fw_$(1) \ TARGET=fw_$(1) \ $$* diff --git a/flight/targets/CopterControl/Makefile b/flight/targets/boards/CopterControl/Makefile similarity index 100% rename from flight/targets/CopterControl/Makefile rename to flight/targets/boards/CopterControl/Makefile diff --git a/flight/targets/CopterControl/System/coptercontrol.c b/flight/targets/boards/CopterControl/System/coptercontrol.c similarity index 100% rename from flight/targets/CopterControl/System/coptercontrol.c rename to flight/targets/boards/CopterControl/System/coptercontrol.c diff --git a/flight/targets/CopterControl/System/inc/FreeRTOSConfig.h b/flight/targets/boards/CopterControl/System/inc/FreeRTOSConfig.h similarity index 100% rename from flight/targets/CopterControl/System/inc/FreeRTOSConfig.h rename to flight/targets/boards/CopterControl/System/inc/FreeRTOSConfig.h diff --git a/flight/targets/CopterControl/System/inc/openpilot.h b/flight/targets/boards/CopterControl/System/inc/openpilot.h similarity index 100% rename from flight/targets/CopterControl/System/inc/openpilot.h rename to flight/targets/boards/CopterControl/System/inc/openpilot.h diff --git a/flight/targets/CopterControl/System/inc/pios_board_posix.h b/flight/targets/boards/CopterControl/System/inc/pios_board_posix.h similarity index 100% rename from flight/targets/CopterControl/System/inc/pios_board_posix.h rename to flight/targets/boards/CopterControl/System/inc/pios_board_posix.h diff --git a/flight/targets/CopterControl/System/inc/pios_config.h b/flight/targets/boards/CopterControl/System/inc/pios_config.h similarity index 100% rename from flight/targets/CopterControl/System/inc/pios_config.h rename to flight/targets/boards/CopterControl/System/inc/pios_config.h diff --git a/flight/targets/CopterControl/System/inc/pios_config_posix.h b/flight/targets/boards/CopterControl/System/inc/pios_config_posix.h similarity index 100% rename from flight/targets/CopterControl/System/inc/pios_config_posix.h rename to flight/targets/boards/CopterControl/System/inc/pios_config_posix.h diff --git a/flight/targets/CopterControl/System/inc/pios_usb_board_data.h b/flight/targets/boards/CopterControl/System/inc/pios_usb_board_data.h similarity index 100% rename from flight/targets/CopterControl/System/inc/pios_usb_board_data.h rename to flight/targets/boards/CopterControl/System/inc/pios_usb_board_data.h diff --git a/flight/targets/CopterControl/System/pios_board.c b/flight/targets/boards/CopterControl/System/pios_board.c similarity index 100% rename from flight/targets/CopterControl/System/pios_board.c rename to flight/targets/boards/CopterControl/System/pios_board.c diff --git a/flight/targets/CopterControl/System/pios_board_posix.c b/flight/targets/boards/CopterControl/System/pios_board_posix.c similarity index 100% rename from flight/targets/CopterControl/System/pios_board_posix.c rename to flight/targets/boards/CopterControl/System/pios_board_posix.c diff --git a/flight/targets/CopterControl/System/pios_usb_board_data.c b/flight/targets/boards/CopterControl/System/pios_usb_board_data.c similarity index 100% rename from flight/targets/CopterControl/System/pios_usb_board_data.c rename to flight/targets/boards/CopterControl/System/pios_usb_board_data.c diff --git a/flight/targets/OPLinkMini/Makefile b/flight/targets/boards/OPLinkMini/Makefile similarity index 100% rename from flight/targets/OPLinkMini/Makefile rename to flight/targets/boards/OPLinkMini/Makefile diff --git a/flight/targets/OPLinkMini/System/inc/FreeRTOSConfig.h b/flight/targets/boards/OPLinkMini/System/inc/FreeRTOSConfig.h similarity index 100% rename from flight/targets/OPLinkMini/System/inc/FreeRTOSConfig.h rename to flight/targets/boards/OPLinkMini/System/inc/FreeRTOSConfig.h diff --git a/flight/targets/OPLinkMini/System/inc/openpilot.h b/flight/targets/boards/OPLinkMini/System/inc/openpilot.h similarity index 100% rename from flight/targets/OPLinkMini/System/inc/openpilot.h rename to flight/targets/boards/OPLinkMini/System/inc/openpilot.h diff --git a/flight/targets/OPLinkMini/System/inc/pios_board_posix.h b/flight/targets/boards/OPLinkMini/System/inc/pios_board_posix.h similarity index 100% rename from flight/targets/OPLinkMini/System/inc/pios_board_posix.h rename to flight/targets/boards/OPLinkMini/System/inc/pios_board_posix.h diff --git a/flight/targets/OPLinkMini/System/inc/pios_config.h b/flight/targets/boards/OPLinkMini/System/inc/pios_config.h similarity index 100% rename from flight/targets/OPLinkMini/System/inc/pios_config.h rename to flight/targets/boards/OPLinkMini/System/inc/pios_config.h diff --git a/flight/targets/OPLinkMini/System/inc/pios_config_posix.h b/flight/targets/boards/OPLinkMini/System/inc/pios_config_posix.h similarity index 100% rename from flight/targets/OPLinkMini/System/inc/pios_config_posix.h rename to flight/targets/boards/OPLinkMini/System/inc/pios_config_posix.h diff --git a/flight/targets/OPLinkMini/System/inc/pios_usb_board_data.h b/flight/targets/boards/OPLinkMini/System/inc/pios_usb_board_data.h similarity index 100% rename from flight/targets/OPLinkMini/System/inc/pios_usb_board_data.h rename to flight/targets/boards/OPLinkMini/System/inc/pios_usb_board_data.h diff --git a/flight/targets/OPLinkMini/System/oplink.c b/flight/targets/boards/OPLinkMini/System/oplink.c similarity index 100% rename from flight/targets/OPLinkMini/System/oplink.c rename to flight/targets/boards/OPLinkMini/System/oplink.c diff --git a/flight/targets/OPLinkMini/System/pios_board.c b/flight/targets/boards/OPLinkMini/System/pios_board.c similarity index 100% rename from flight/targets/OPLinkMini/System/pios_board.c rename to flight/targets/boards/OPLinkMini/System/pios_board.c diff --git a/flight/targets/OPLinkMini/System/pios_board_posix.c b/flight/targets/boards/OPLinkMini/System/pios_board_posix.c similarity index 100% rename from flight/targets/OPLinkMini/System/pios_board_posix.c rename to flight/targets/boards/OPLinkMini/System/pios_board_posix.c diff --git a/flight/targets/OPLinkMini/System/pios_usb_board_data.c b/flight/targets/boards/OPLinkMini/System/pios_usb_board_data.c similarity index 100% rename from flight/targets/OPLinkMini/System/pios_usb_board_data.c rename to flight/targets/boards/OPLinkMini/System/pios_usb_board_data.c diff --git a/flight/targets/OSD/Makefile b/flight/targets/boards/OSD/Makefile similarity index 100% rename from flight/targets/OSD/Makefile rename to flight/targets/boards/OSD/Makefile diff --git a/flight/targets/OSD/System/cm3_fault_handlers.c b/flight/targets/boards/OSD/System/cm3_fault_handlers.c similarity index 100% rename from flight/targets/OSD/System/cm3_fault_handlers.c rename to flight/targets/boards/OSD/System/cm3_fault_handlers.c diff --git a/flight/targets/OSD/System/dcc_stdio.c b/flight/targets/boards/OSD/System/dcc_stdio.c similarity index 100% rename from flight/targets/OSD/System/dcc_stdio.c rename to flight/targets/boards/OSD/System/dcc_stdio.c diff --git a/flight/targets/OSD/System/font_outlined8x14.c b/flight/targets/boards/OSD/System/font_outlined8x14.c similarity index 100% rename from flight/targets/OSD/System/font_outlined8x14.c rename to flight/targets/boards/OSD/System/font_outlined8x14.c diff --git a/flight/targets/OSD/System/font_outlined8x8.c b/flight/targets/boards/OSD/System/font_outlined8x8.c similarity index 100% rename from flight/targets/OSD/System/font_outlined8x8.c rename to flight/targets/boards/OSD/System/font_outlined8x8.c diff --git a/flight/targets/OSD/System/fonts.c b/flight/targets/boards/OSD/System/fonts.c similarity index 100% rename from flight/targets/OSD/System/fonts.c rename to flight/targets/boards/OSD/System/fonts.c diff --git a/flight/targets/OSD/System/inc/FreeRTOSConfig.h b/flight/targets/boards/OSD/System/inc/FreeRTOSConfig.h similarity index 100% rename from flight/targets/OSD/System/inc/FreeRTOSConfig.h rename to flight/targets/boards/OSD/System/inc/FreeRTOSConfig.h diff --git a/flight/targets/OSD/System/inc/dcc_stdio.h b/flight/targets/boards/OSD/System/inc/dcc_stdio.h similarity index 100% rename from flight/targets/OSD/System/inc/dcc_stdio.h rename to flight/targets/boards/OSD/System/inc/dcc_stdio.h diff --git a/flight/targets/OSD/System/inc/font12x18.h b/flight/targets/boards/OSD/System/inc/font12x18.h similarity index 100% rename from flight/targets/OSD/System/inc/font12x18.h rename to flight/targets/boards/OSD/System/inc/font12x18.h diff --git a/flight/targets/OSD/System/inc/font8x10.h b/flight/targets/boards/OSD/System/inc/font8x10.h similarity index 100% rename from flight/targets/OSD/System/inc/font8x10.h rename to flight/targets/boards/OSD/System/inc/font8x10.h diff --git a/flight/targets/OSD/System/inc/font_outlined8x14.h b/flight/targets/boards/OSD/System/inc/font_outlined8x14.h similarity index 100% rename from flight/targets/OSD/System/inc/font_outlined8x14.h rename to flight/targets/boards/OSD/System/inc/font_outlined8x14.h diff --git a/flight/targets/OSD/System/inc/font_outlined8x8.h b/flight/targets/boards/OSD/System/inc/font_outlined8x8.h similarity index 100% rename from flight/targets/OSD/System/inc/font_outlined8x8.h rename to flight/targets/boards/OSD/System/inc/font_outlined8x8.h diff --git a/flight/targets/OSD/System/inc/fonts.h b/flight/targets/boards/OSD/System/inc/fonts.h similarity index 100% rename from flight/targets/OSD/System/inc/fonts.h rename to flight/targets/boards/OSD/System/inc/fonts.h diff --git a/flight/targets/OSD/System/inc/openpilot.h b/flight/targets/boards/OSD/System/inc/openpilot.h similarity index 100% rename from flight/targets/OSD/System/inc/openpilot.h rename to flight/targets/boards/OSD/System/inc/openpilot.h diff --git a/flight/targets/OSD/System/inc/pios_config.h b/flight/targets/boards/OSD/System/inc/pios_config.h similarity index 100% rename from flight/targets/OSD/System/inc/pios_config.h rename to flight/targets/boards/OSD/System/inc/pios_config.h diff --git a/flight/targets/OSD/System/inc/pios_usb_board_data.h b/flight/targets/boards/OSD/System/inc/pios_usb_board_data.h similarity index 100% rename from flight/targets/OSD/System/inc/pios_usb_board_data.h rename to flight/targets/boards/OSD/System/inc/pios_usb_board_data.h diff --git a/flight/targets/OSD/System/inc/splash.h b/flight/targets/boards/OSD/System/inc/splash.h similarity index 100% rename from flight/targets/OSD/System/inc/splash.h rename to flight/targets/boards/OSD/System/inc/splash.h diff --git a/flight/targets/OSD/System/osd.c b/flight/targets/boards/OSD/System/osd.c similarity index 100% rename from flight/targets/OSD/System/osd.c rename to flight/targets/boards/OSD/System/osd.c diff --git a/flight/targets/OSD/System/pios_board.c b/flight/targets/boards/OSD/System/pios_board.c similarity index 100% rename from flight/targets/OSD/System/pios_board.c rename to flight/targets/boards/OSD/System/pios_board.c diff --git a/flight/targets/OSD/System/pios_usb_board_data.c b/flight/targets/boards/OSD/System/pios_usb_board_data.c similarity index 100% rename from flight/targets/OSD/System/pios_usb_board_data.c rename to flight/targets/boards/OSD/System/pios_usb_board_data.c diff --git a/flight/targets/Revolution/Makefile b/flight/targets/boards/Revolution/Makefile similarity index 100% rename from flight/targets/Revolution/Makefile rename to flight/targets/boards/Revolution/Makefile diff --git a/flight/targets/Revolution/Makefile.osx b/flight/targets/boards/Revolution/Makefile.osx similarity index 100% rename from flight/targets/Revolution/Makefile.osx rename to flight/targets/boards/Revolution/Makefile.osx diff --git a/flight/targets/Revolution/System/cm3_fault_handlers.c b/flight/targets/boards/Revolution/System/cm3_fault_handlers.c similarity index 100% rename from flight/targets/Revolution/System/cm3_fault_handlers.c rename to flight/targets/boards/Revolution/System/cm3_fault_handlers.c diff --git a/flight/targets/Revolution/System/dcc_stdio.c b/flight/targets/boards/Revolution/System/dcc_stdio.c similarity index 100% rename from flight/targets/Revolution/System/dcc_stdio.c rename to flight/targets/boards/Revolution/System/dcc_stdio.c diff --git a/flight/targets/Revolution/System/inc/FreeRTOSConfig.h b/flight/targets/boards/Revolution/System/inc/FreeRTOSConfig.h similarity index 100% rename from flight/targets/Revolution/System/inc/FreeRTOSConfig.h rename to flight/targets/boards/Revolution/System/inc/FreeRTOSConfig.h diff --git a/flight/targets/Revolution/System/inc/dcc_stdio.h b/flight/targets/boards/Revolution/System/inc/dcc_stdio.h similarity index 100% rename from flight/targets/Revolution/System/inc/dcc_stdio.h rename to flight/targets/boards/Revolution/System/inc/dcc_stdio.h diff --git a/flight/targets/Revolution/System/inc/openpilot.h b/flight/targets/boards/Revolution/System/inc/openpilot.h similarity index 100% rename from flight/targets/Revolution/System/inc/openpilot.h rename to flight/targets/boards/Revolution/System/inc/openpilot.h diff --git a/flight/targets/Revolution/System/inc/pios_board_sim.h b/flight/targets/boards/Revolution/System/inc/pios_board_sim.h similarity index 100% rename from flight/targets/Revolution/System/inc/pios_board_sim.h rename to flight/targets/boards/Revolution/System/inc/pios_board_sim.h diff --git a/flight/targets/Revolution/System/inc/pios_config.h b/flight/targets/boards/Revolution/System/inc/pios_config.h similarity index 100% rename from flight/targets/Revolution/System/inc/pios_config.h rename to flight/targets/boards/Revolution/System/inc/pios_config.h diff --git a/flight/targets/Revolution/System/inc/pios_config_sim.h b/flight/targets/boards/Revolution/System/inc/pios_config_sim.h similarity index 100% rename from flight/targets/Revolution/System/inc/pios_config_sim.h rename to flight/targets/boards/Revolution/System/inc/pios_config_sim.h diff --git a/flight/targets/Revolution/System/inc/pios_usb_board_data.h b/flight/targets/boards/Revolution/System/inc/pios_usb_board_data.h similarity index 100% rename from flight/targets/Revolution/System/inc/pios_usb_board_data.h rename to flight/targets/boards/Revolution/System/inc/pios_usb_board_data.h diff --git a/flight/targets/Revolution/System/pios_board.c b/flight/targets/boards/Revolution/System/pios_board.c similarity index 100% rename from flight/targets/Revolution/System/pios_board.c rename to flight/targets/boards/Revolution/System/pios_board.c diff --git a/flight/targets/Revolution/System/pios_board_sim.c b/flight/targets/boards/Revolution/System/pios_board_sim.c similarity index 100% rename from flight/targets/Revolution/System/pios_board_sim.c rename to flight/targets/boards/Revolution/System/pios_board_sim.c diff --git a/flight/targets/Revolution/System/pios_usb_board_data.c b/flight/targets/boards/Revolution/System/pios_usb_board_data.c similarity index 100% rename from flight/targets/Revolution/System/pios_usb_board_data.c rename to flight/targets/boards/Revolution/System/pios_usb_board_data.c diff --git a/flight/targets/Revolution/System/revolution.c b/flight/targets/boards/Revolution/System/revolution.c similarity index 100% rename from flight/targets/Revolution/System/revolution.c rename to flight/targets/boards/Revolution/System/revolution.c diff --git a/flight/targets/Revolution/UAVObjects.inc b/flight/targets/boards/Revolution/UAVObjects.inc similarity index 100% rename from flight/targets/Revolution/UAVObjects.inc rename to flight/targets/boards/Revolution/UAVObjects.inc diff --git a/flight/targets/SensorTest/Makefile b/flight/targets/boards/SensorTest/Makefile similarity index 100% rename from flight/targets/SensorTest/Makefile rename to flight/targets/boards/SensorTest/Makefile diff --git a/flight/targets/SensorTest/Makefile.osx b/flight/targets/boards/SensorTest/Makefile.osx similarity index 100% rename from flight/targets/SensorTest/Makefile.osx rename to flight/targets/boards/SensorTest/Makefile.osx diff --git a/flight/targets/SensorTest/System/cm3_fault_handlers.c b/flight/targets/boards/SensorTest/System/cm3_fault_handlers.c similarity index 100% rename from flight/targets/SensorTest/System/cm3_fault_handlers.c rename to flight/targets/boards/SensorTest/System/cm3_fault_handlers.c diff --git a/flight/targets/SensorTest/System/dcc_stdio.c b/flight/targets/boards/SensorTest/System/dcc_stdio.c similarity index 100% rename from flight/targets/SensorTest/System/dcc_stdio.c rename to flight/targets/boards/SensorTest/System/dcc_stdio.c diff --git a/flight/targets/SensorTest/System/inc/FreeRTOSConfig.h b/flight/targets/boards/SensorTest/System/inc/FreeRTOSConfig.h similarity index 100% rename from flight/targets/SensorTest/System/inc/FreeRTOSConfig.h rename to flight/targets/boards/SensorTest/System/inc/FreeRTOSConfig.h diff --git a/flight/targets/SensorTest/System/inc/dcc_stdio.h b/flight/targets/boards/SensorTest/System/inc/dcc_stdio.h similarity index 100% rename from flight/targets/SensorTest/System/inc/dcc_stdio.h rename to flight/targets/boards/SensorTest/System/inc/dcc_stdio.h diff --git a/flight/targets/SensorTest/System/inc/openpilot.h b/flight/targets/boards/SensorTest/System/inc/openpilot.h similarity index 100% rename from flight/targets/SensorTest/System/inc/openpilot.h rename to flight/targets/boards/SensorTest/System/inc/openpilot.h diff --git a/flight/targets/SensorTest/System/inc/pios_board_sim.h b/flight/targets/boards/SensorTest/System/inc/pios_board_sim.h similarity index 100% rename from flight/targets/SensorTest/System/inc/pios_board_sim.h rename to flight/targets/boards/SensorTest/System/inc/pios_board_sim.h diff --git a/flight/targets/SensorTest/System/inc/pios_config.h b/flight/targets/boards/SensorTest/System/inc/pios_config.h similarity index 100% rename from flight/targets/SensorTest/System/inc/pios_config.h rename to flight/targets/boards/SensorTest/System/inc/pios_config.h diff --git a/flight/targets/SensorTest/System/inc/pios_config_sim.h b/flight/targets/boards/SensorTest/System/inc/pios_config_sim.h similarity index 100% rename from flight/targets/SensorTest/System/inc/pios_config_sim.h rename to flight/targets/boards/SensorTest/System/inc/pios_config_sim.h diff --git a/flight/targets/SensorTest/System/inc/pios_usb_board_data.h b/flight/targets/boards/SensorTest/System/inc/pios_usb_board_data.h similarity index 100% rename from flight/targets/SensorTest/System/inc/pios_usb_board_data.h rename to flight/targets/boards/SensorTest/System/inc/pios_usb_board_data.h diff --git a/flight/targets/SensorTest/System/pios_board.c b/flight/targets/boards/SensorTest/System/pios_board.c similarity index 100% rename from flight/targets/SensorTest/System/pios_board.c rename to flight/targets/boards/SensorTest/System/pios_board.c diff --git a/flight/targets/SensorTest/System/pios_board_sim.c b/flight/targets/boards/SensorTest/System/pios_board_sim.c similarity index 100% rename from flight/targets/SensorTest/System/pios_board_sim.c rename to flight/targets/boards/SensorTest/System/pios_board_sim.c diff --git a/flight/targets/SensorTest/System/pios_usb_board_data.c b/flight/targets/boards/SensorTest/System/pios_usb_board_data.c similarity index 100% rename from flight/targets/SensorTest/System/pios_usb_board_data.c rename to flight/targets/boards/SensorTest/System/pios_usb_board_data.c diff --git a/flight/targets/SensorTest/System/revolution.c b/flight/targets/boards/SensorTest/System/revolution.c similarity index 100% rename from flight/targets/SensorTest/System/revolution.c rename to flight/targets/boards/SensorTest/System/revolution.c diff --git a/flight/targets/SensorTest/UAVObjects.inc b/flight/targets/boards/SensorTest/UAVObjects.inc similarity index 100% rename from flight/targets/SensorTest/UAVObjects.inc rename to flight/targets/boards/SensorTest/UAVObjects.inc diff --git a/flight/targets/SimPosix/Makefile b/flight/targets/boards/SimPosix/Makefile similarity index 96% rename from flight/targets/SimPosix/Makefile rename to flight/targets/boards/SimPosix/Makefile index 6b948a6fd..e56cb7bad 100644 --- a/flight/targets/SimPosix/Makefile +++ b/flight/targets/boards/SimPosix/Makefile @@ -43,13 +43,13 @@ MODULES += FirmwareIAP # Paths OPSYSTEM = ./System OPSYSTEMINC = $(OPSYSTEM)/inc -OPUAVTALK = ../UAVTalk +OPUAVTALK = ../../UAVTalk OPUAVTALKINC = $(OPUAVTALK)/inc -OPUAVOBJ = ../UAVObjects +OPUAVOBJ = ../../UAVObjects OPUAVOBJINC = $(OPUAVOBJ)/inc PIOSINC = $(PIOS)/inc -OPMODULEDIR = ../../Modules -FLIGHTLIB = ../../Libraries +OPMODULEDIR = ../../../Modules +FLIGHTLIB = ../../../Libraries FLIGHTLIBINC = $(FLIGHTLIB)/inc MATHLIB = $(FLIGHTLIB)/math MATHLIBINC = $(FLIGHTLIB)/math @@ -57,11 +57,9 @@ PIOSPOSIX = $(PIOS)/posix PIOSCOMMON = $(PIOS)/posix PIOSBOARDS = $(PIOS)/Boards PIOSCOMMONLIB = $(PIOS)/Common/Libraries -OPUAVOBJ = ../UAVObjects -OPUAVOBJINC = $(OPUAVOBJ)/inc BOOT = BOOTINC = -HWDEFSINC = ../board_hw_defs/$(BOARD_NAME) +HWDEFSINC = ../../board_hw_defs/$(BOARD_NAME) UAVOBJSYNTHDIR = $(OUTDIR)/../uavobject-synthetics/flight # optional component libraries @@ -248,7 +246,7 @@ LDFLAGS += $(patsubst %,-l%,$(EXTRA_LIBS)) LDFLAGS += $(MATH_LIB) LDFLAGS += -lc -lgcc -lpthread -lrt -#Linker scripts +#Linker scripts LDFLAGS += $(addprefix -T,$(LINKER_SCRIPTS_APP)) diff --git a/flight/targets/SimPosix/System/inc/FreeRTOSConfig.h b/flight/targets/boards/SimPosix/System/inc/FreeRTOSConfig.h similarity index 100% rename from flight/targets/SimPosix/System/inc/FreeRTOSConfig.h rename to flight/targets/boards/SimPosix/System/inc/FreeRTOSConfig.h diff --git a/flight/targets/SimPosix/System/inc/FreeRTOSConfig_bk.h b/flight/targets/boards/SimPosix/System/inc/FreeRTOSConfig_bk.h similarity index 100% rename from flight/targets/SimPosix/System/inc/FreeRTOSConfig_bk.h rename to flight/targets/boards/SimPosix/System/inc/FreeRTOSConfig_bk.h diff --git a/flight/targets/SimPosix/System/inc/dcc_stdio.h b/flight/targets/boards/SimPosix/System/inc/dcc_stdio.h similarity index 100% rename from flight/targets/SimPosix/System/inc/dcc_stdio.h rename to flight/targets/boards/SimPosix/System/inc/dcc_stdio.h diff --git a/flight/targets/SimPosix/System/inc/openpilot.h b/flight/targets/boards/SimPosix/System/inc/openpilot.h similarity index 100% rename from flight/targets/SimPosix/System/inc/openpilot.h rename to flight/targets/boards/SimPosix/System/inc/openpilot.h diff --git a/flight/targets/SimPosix/System/inc/pios_config.h b/flight/targets/boards/SimPosix/System/inc/pios_config.h similarity index 100% rename from flight/targets/SimPosix/System/inc/pios_config.h rename to flight/targets/boards/SimPosix/System/inc/pios_config.h diff --git a/flight/targets/SimPosix/System/pios_board.c b/flight/targets/boards/SimPosix/System/pios_board.c similarity index 100% rename from flight/targets/SimPosix/System/pios_board.c rename to flight/targets/boards/SimPosix/System/pios_board.c diff --git a/flight/targets/SimPosix/System/simposix.c b/flight/targets/boards/SimPosix/System/simposix.c similarity index 100% rename from flight/targets/SimPosix/System/simposix.c rename to flight/targets/boards/SimPosix/System/simposix.c diff --git a/flight/targets/SimPosix/UAVObjects.inc b/flight/targets/boards/SimPosix/UAVObjects.inc similarity index 100% rename from flight/targets/SimPosix/UAVObjects.inc rename to flight/targets/boards/SimPosix/UAVObjects.inc