From f7f842687a1dc10cdfbb83b87dec7d1184433a1f Mon Sep 17 00:00:00 2001
From: Oleg Semyonov <os@os-linux.local>
Date: Mon, 15 Apr 2013 21:47:23 +0300
Subject: [PATCH] OP-899: rename System to firmware and move Makefile into it

---
 Makefile                                             |  4 ++--
 .../boards/coptercontrol/{ => firmware}/Makefile     |  0
 .../{System => firmware}/coptercontrol.c             |  0
 .../{System => firmware}/inc/FreeRTOSConfig.h        |  0
 .../{System => firmware}/inc/openpilot.h             |  0
 .../{System => firmware}/inc/pios_board_posix.h      |  0
 .../{System => firmware}/inc/pios_config.h           |  0
 .../{System => firmware}/inc/pios_config_posix.h     |  0
 .../{System => firmware}/inc/pios_usb_board_data.h   |  0
 .../coptercontrol/{System => firmware}/pios_board.c  |  0
 .../{System => firmware}/pios_board_posix.c          |  0
 .../{System => firmware}/pios_usb_board_data.c       |  0
 .../boards/oplinkmini/{ => firmware}/Makefile        |  0
 .../{System => firmware}/inc/FreeRTOSConfig.h        |  0
 .../oplinkmini/{System => firmware}/inc/openpilot.h  |  0
 .../{System => firmware}/inc/pios_board_posix.h      |  0
 .../{System => firmware}/inc/pios_config.h           |  0
 .../{System => firmware}/inc/pios_config_posix.h     |  0
 .../{System => firmware}/inc/pios_usb_board_data.h   |  0
 .../boards/oplinkmini/{System => firmware}/oplink.c  |  0
 .../oplinkmini/{System => firmware}/pios_board.c     |  0
 .../{System => firmware}/pios_board_posix.c          |  0
 .../{System => firmware}/pios_usb_board_data.c       |  0
 flight/targets/boards/osd/{ => firmware}/Makefile    |  0
 .../osd/{System => firmware}/cm3_fault_handlers.c    |  0
 .../boards/osd/{System => firmware}/dcc_stdio.c      |  0
 .../osd/{System => firmware}/font_outlined8x14.c     |  0
 .../osd/{System => firmware}/font_outlined8x8.c      |  0
 .../targets/boards/osd/{System => firmware}/fonts.c  |  0
 .../osd/{System => firmware}/inc/FreeRTOSConfig.h    |  0
 .../boards/osd/{System => firmware}/inc/dcc_stdio.h  |  0
 .../boards/osd/{System => firmware}/inc/font12x18.h  |  0
 .../boards/osd/{System => firmware}/inc/font8x10.h   |  0
 .../osd/{System => firmware}/inc/font_outlined8x14.h |  0
 .../osd/{System => firmware}/inc/font_outlined8x8.h  |  0
 .../boards/osd/{System => firmware}/inc/fonts.h      |  0
 .../boards/osd/{System => firmware}/inc/openpilot.h  |  0
 .../osd/{System => firmware}/inc/pios_config.h       |  0
 .../{System => firmware}/inc/pios_usb_board_data.h   |  0
 .../boards/osd/{System => firmware}/inc/splash.h     |  0
 flight/targets/boards/osd/{System => firmware}/osd.c |  0
 .../boards/osd/{System => firmware}/pios_board.c     |  0
 .../osd/{System => firmware}/pios_usb_board_data.c   |  0
 .../boards/revolution/{ => firmware}/Makefile        |  0
 .../boards/revolution/{ => firmware}/Makefile.osx    |  0
 .../boards/revolution/{ => firmware}/UAVObjects.inc  |  0
 .../{System => firmware}/cm3_fault_handlers.c        |  0
 .../revolution/{System => firmware}/dcc_stdio.c      |  0
 .../{System => firmware}/inc/FreeRTOSConfig.h        |  0
 .../revolution/{System => firmware}/inc/dcc_stdio.h  |  0
 .../revolution/{System => firmware}/inc/openpilot.h  |  0
 .../{System => firmware}/inc/pios_board_sim.h        |  0
 .../{System => firmware}/inc/pios_config.h           |  0
 .../{System => firmware}/inc/pios_config_sim.h       |  0
 .../{System => firmware}/inc/pios_usb_board_data.h   |  0
 .../revolution/{System => firmware}/pios_board.c     |  0
 .../revolution/{System => firmware}/pios_board_sim.c |  0
 .../{System => firmware}/pios_usb_board_data.c       |  0
 .../revolution/{System => firmware}/revolution.c     |  0
 .../boards/sensortest/{ => firmware}/Makefile        |  0
 .../boards/sensortest/{ => firmware}/Makefile.osx    |  0
 .../boards/sensortest/{ => firmware}/UAVObjects.inc  |  0
 .../{System => firmware}/cm3_fault_handlers.c        |  0
 .../sensortest/{System => firmware}/dcc_stdio.c      |  0
 .../{System => firmware}/inc/FreeRTOSConfig.h        |  0
 .../sensortest/{System => firmware}/inc/dcc_stdio.h  |  0
 .../sensortest/{System => firmware}/inc/openpilot.h  |  0
 .../{System => firmware}/inc/pios_board_sim.h        |  0
 .../{System => firmware}/inc/pios_config.h           |  0
 .../{System => firmware}/inc/pios_config_sim.h       |  0
 .../{System => firmware}/inc/pios_usb_board_data.h   |  0
 .../sensortest/{System => firmware}/pios_board.c     |  0
 .../sensortest/{System => firmware}/pios_board_sim.c |  0
 .../{System => firmware}/pios_usb_board_data.c       |  0
 .../sensortest/{System => firmware}/revolution.c     |  0
 .../targets/boards/simposix/{ => firmware}/Makefile  | 12 ++++++------
 .../boards/simposix/{ => firmware}/UAVObjects.inc    |  0
 .../{System => firmware}/inc/FreeRTOSConfig.h        |  0
 .../{System => firmware}/inc/FreeRTOSConfig_bk.h     |  0
 .../simposix/{System => firmware}/inc/dcc_stdio.h    |  0
 .../simposix/{System => firmware}/inc/openpilot.h    |  0
 .../simposix/{System => firmware}/inc/pios_config.h  |  0
 .../simposix/{System => firmware}/pios_board.c       |  0
 .../boards/simposix/{System => firmware}/simposix.c  |  0
 make/apps-defs.mk                                    |  2 +-
 85 files changed, 9 insertions(+), 9 deletions(-)
 rename flight/targets/boards/coptercontrol/{ => firmware}/Makefile (100%)
 rename flight/targets/boards/coptercontrol/{System => firmware}/coptercontrol.c (100%)
 rename flight/targets/boards/coptercontrol/{System => firmware}/inc/FreeRTOSConfig.h (100%)
 rename flight/targets/boards/coptercontrol/{System => firmware}/inc/openpilot.h (100%)
 rename flight/targets/boards/coptercontrol/{System => firmware}/inc/pios_board_posix.h (100%)
 rename flight/targets/boards/coptercontrol/{System => firmware}/inc/pios_config.h (100%)
 rename flight/targets/boards/coptercontrol/{System => firmware}/inc/pios_config_posix.h (100%)
 rename flight/targets/boards/coptercontrol/{System => firmware}/inc/pios_usb_board_data.h (100%)
 rename flight/targets/boards/coptercontrol/{System => firmware}/pios_board.c (100%)
 rename flight/targets/boards/coptercontrol/{System => firmware}/pios_board_posix.c (100%)
 rename flight/targets/boards/coptercontrol/{System => firmware}/pios_usb_board_data.c (100%)
 rename flight/targets/boards/oplinkmini/{ => firmware}/Makefile (100%)
 rename flight/targets/boards/oplinkmini/{System => firmware}/inc/FreeRTOSConfig.h (100%)
 rename flight/targets/boards/oplinkmini/{System => firmware}/inc/openpilot.h (100%)
 rename flight/targets/boards/oplinkmini/{System => firmware}/inc/pios_board_posix.h (100%)
 rename flight/targets/boards/oplinkmini/{System => firmware}/inc/pios_config.h (100%)
 rename flight/targets/boards/oplinkmini/{System => firmware}/inc/pios_config_posix.h (100%)
 rename flight/targets/boards/oplinkmini/{System => firmware}/inc/pios_usb_board_data.h (100%)
 rename flight/targets/boards/oplinkmini/{System => firmware}/oplink.c (100%)
 rename flight/targets/boards/oplinkmini/{System => firmware}/pios_board.c (100%)
 rename flight/targets/boards/oplinkmini/{System => firmware}/pios_board_posix.c (100%)
 rename flight/targets/boards/oplinkmini/{System => firmware}/pios_usb_board_data.c (100%)
 rename flight/targets/boards/osd/{ => firmware}/Makefile (100%)
 rename flight/targets/boards/osd/{System => firmware}/cm3_fault_handlers.c (100%)
 rename flight/targets/boards/osd/{System => firmware}/dcc_stdio.c (100%)
 rename flight/targets/boards/osd/{System => firmware}/font_outlined8x14.c (100%)
 rename flight/targets/boards/osd/{System => firmware}/font_outlined8x8.c (100%)
 rename flight/targets/boards/osd/{System => firmware}/fonts.c (100%)
 rename flight/targets/boards/osd/{System => firmware}/inc/FreeRTOSConfig.h (100%)
 rename flight/targets/boards/osd/{System => firmware}/inc/dcc_stdio.h (100%)
 rename flight/targets/boards/osd/{System => firmware}/inc/font12x18.h (100%)
 rename flight/targets/boards/osd/{System => firmware}/inc/font8x10.h (100%)
 rename flight/targets/boards/osd/{System => firmware}/inc/font_outlined8x14.h (100%)
 rename flight/targets/boards/osd/{System => firmware}/inc/font_outlined8x8.h (100%)
 rename flight/targets/boards/osd/{System => firmware}/inc/fonts.h (100%)
 rename flight/targets/boards/osd/{System => firmware}/inc/openpilot.h (100%)
 rename flight/targets/boards/osd/{System => firmware}/inc/pios_config.h (100%)
 rename flight/targets/boards/osd/{System => firmware}/inc/pios_usb_board_data.h (100%)
 rename flight/targets/boards/osd/{System => firmware}/inc/splash.h (100%)
 rename flight/targets/boards/osd/{System => firmware}/osd.c (100%)
 rename flight/targets/boards/osd/{System => firmware}/pios_board.c (100%)
 rename flight/targets/boards/osd/{System => firmware}/pios_usb_board_data.c (100%)
 rename flight/targets/boards/revolution/{ => firmware}/Makefile (100%)
 rename flight/targets/boards/revolution/{ => firmware}/Makefile.osx (100%)
 rename flight/targets/boards/revolution/{ => firmware}/UAVObjects.inc (100%)
 rename flight/targets/boards/revolution/{System => firmware}/cm3_fault_handlers.c (100%)
 rename flight/targets/boards/revolution/{System => firmware}/dcc_stdio.c (100%)
 rename flight/targets/boards/revolution/{System => firmware}/inc/FreeRTOSConfig.h (100%)
 rename flight/targets/boards/revolution/{System => firmware}/inc/dcc_stdio.h (100%)
 rename flight/targets/boards/revolution/{System => firmware}/inc/openpilot.h (100%)
 rename flight/targets/boards/revolution/{System => firmware}/inc/pios_board_sim.h (100%)
 rename flight/targets/boards/revolution/{System => firmware}/inc/pios_config.h (100%)
 rename flight/targets/boards/revolution/{System => firmware}/inc/pios_config_sim.h (100%)
 rename flight/targets/boards/revolution/{System => firmware}/inc/pios_usb_board_data.h (100%)
 rename flight/targets/boards/revolution/{System => firmware}/pios_board.c (100%)
 rename flight/targets/boards/revolution/{System => firmware}/pios_board_sim.c (100%)
 rename flight/targets/boards/revolution/{System => firmware}/pios_usb_board_data.c (100%)
 rename flight/targets/boards/revolution/{System => firmware}/revolution.c (100%)
 rename flight/targets/boards/sensortest/{ => firmware}/Makefile (100%)
 rename flight/targets/boards/sensortest/{ => firmware}/Makefile.osx (100%)
 rename flight/targets/boards/sensortest/{ => firmware}/UAVObjects.inc (100%)
 rename flight/targets/boards/sensortest/{System => firmware}/cm3_fault_handlers.c (100%)
 rename flight/targets/boards/sensortest/{System => firmware}/dcc_stdio.c (100%)
 rename flight/targets/boards/sensortest/{System => firmware}/inc/FreeRTOSConfig.h (100%)
 rename flight/targets/boards/sensortest/{System => firmware}/inc/dcc_stdio.h (100%)
 rename flight/targets/boards/sensortest/{System => firmware}/inc/openpilot.h (100%)
 rename flight/targets/boards/sensortest/{System => firmware}/inc/pios_board_sim.h (100%)
 rename flight/targets/boards/sensortest/{System => firmware}/inc/pios_config.h (100%)
 rename flight/targets/boards/sensortest/{System => firmware}/inc/pios_config_sim.h (100%)
 rename flight/targets/boards/sensortest/{System => firmware}/inc/pios_usb_board_data.h (100%)
 rename flight/targets/boards/sensortest/{System => firmware}/pios_board.c (100%)
 rename flight/targets/boards/sensortest/{System => firmware}/pios_board_sim.c (100%)
 rename flight/targets/boards/sensortest/{System => firmware}/pios_usb_board_data.c (100%)
 rename flight/targets/boards/sensortest/{System => firmware}/revolution.c (100%)
 rename flight/targets/boards/simposix/{ => firmware}/Makefile (98%)
 rename flight/targets/boards/simposix/{ => firmware}/UAVObjects.inc (100%)
 rename flight/targets/boards/simposix/{System => firmware}/inc/FreeRTOSConfig.h (100%)
 rename flight/targets/boards/simposix/{System => firmware}/inc/FreeRTOSConfig_bk.h (100%)
 rename flight/targets/boards/simposix/{System => firmware}/inc/dcc_stdio.h (100%)
 rename flight/targets/boards/simposix/{System => firmware}/inc/openpilot.h (100%)
 rename flight/targets/boards/simposix/{System => firmware}/inc/pios_config.h (100%)
 rename flight/targets/boards/simposix/{System => firmware}/pios_board.c (100%)
 rename flight/targets/boards/simposix/{System => firmware}/simposix.c (100%)

diff --git a/Makefile b/Makefile
index 698c4b08c..543b5720f 100644
--- a/Makefile
+++ b/Makefile
@@ -260,13 +260,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/boards/$(1) && \
+	$(V1) cd $(ROOT_DIR)/flight/targets/boards/$(1)/firmware && \
 		$$(MAKE) -r --no-print-directory \
 		BOARD_NAME=$(1) \
 		BOARD_SHORT_NAME=$(2) \
 		BUILD_TYPE=fw \
 		HWDEFSINC=$(HWDEFS)/$(1) \
-		TOPDIR=$(ROOT_DIR)/flight/targets/boards/$(1) \
+		TOPDIR=$(ROOT_DIR)/flight/targets/boards/$(1)/firmware \
 		OUTDIR=$(BUILD_DIR)/fw_$(1) \
 		TARGET=fw_$(1) \
 		$$*
diff --git a/flight/targets/boards/coptercontrol/Makefile b/flight/targets/boards/coptercontrol/firmware/Makefile
similarity index 100%
rename from flight/targets/boards/coptercontrol/Makefile
rename to flight/targets/boards/coptercontrol/firmware/Makefile
diff --git a/flight/targets/boards/coptercontrol/System/coptercontrol.c b/flight/targets/boards/coptercontrol/firmware/coptercontrol.c
similarity index 100%
rename from flight/targets/boards/coptercontrol/System/coptercontrol.c
rename to flight/targets/boards/coptercontrol/firmware/coptercontrol.c
diff --git a/flight/targets/boards/coptercontrol/System/inc/FreeRTOSConfig.h b/flight/targets/boards/coptercontrol/firmware/inc/FreeRTOSConfig.h
similarity index 100%
rename from flight/targets/boards/coptercontrol/System/inc/FreeRTOSConfig.h
rename to flight/targets/boards/coptercontrol/firmware/inc/FreeRTOSConfig.h
diff --git a/flight/targets/boards/coptercontrol/System/inc/openpilot.h b/flight/targets/boards/coptercontrol/firmware/inc/openpilot.h
similarity index 100%
rename from flight/targets/boards/coptercontrol/System/inc/openpilot.h
rename to flight/targets/boards/coptercontrol/firmware/inc/openpilot.h
diff --git a/flight/targets/boards/coptercontrol/System/inc/pios_board_posix.h b/flight/targets/boards/coptercontrol/firmware/inc/pios_board_posix.h
similarity index 100%
rename from flight/targets/boards/coptercontrol/System/inc/pios_board_posix.h
rename to flight/targets/boards/coptercontrol/firmware/inc/pios_board_posix.h
diff --git a/flight/targets/boards/coptercontrol/System/inc/pios_config.h b/flight/targets/boards/coptercontrol/firmware/inc/pios_config.h
similarity index 100%
rename from flight/targets/boards/coptercontrol/System/inc/pios_config.h
rename to flight/targets/boards/coptercontrol/firmware/inc/pios_config.h
diff --git a/flight/targets/boards/coptercontrol/System/inc/pios_config_posix.h b/flight/targets/boards/coptercontrol/firmware/inc/pios_config_posix.h
similarity index 100%
rename from flight/targets/boards/coptercontrol/System/inc/pios_config_posix.h
rename to flight/targets/boards/coptercontrol/firmware/inc/pios_config_posix.h
diff --git a/flight/targets/boards/coptercontrol/System/inc/pios_usb_board_data.h b/flight/targets/boards/coptercontrol/firmware/inc/pios_usb_board_data.h
similarity index 100%
rename from flight/targets/boards/coptercontrol/System/inc/pios_usb_board_data.h
rename to flight/targets/boards/coptercontrol/firmware/inc/pios_usb_board_data.h
diff --git a/flight/targets/boards/coptercontrol/System/pios_board.c b/flight/targets/boards/coptercontrol/firmware/pios_board.c
similarity index 100%
rename from flight/targets/boards/coptercontrol/System/pios_board.c
rename to flight/targets/boards/coptercontrol/firmware/pios_board.c
diff --git a/flight/targets/boards/coptercontrol/System/pios_board_posix.c b/flight/targets/boards/coptercontrol/firmware/pios_board_posix.c
similarity index 100%
rename from flight/targets/boards/coptercontrol/System/pios_board_posix.c
rename to flight/targets/boards/coptercontrol/firmware/pios_board_posix.c
diff --git a/flight/targets/boards/coptercontrol/System/pios_usb_board_data.c b/flight/targets/boards/coptercontrol/firmware/pios_usb_board_data.c
similarity index 100%
rename from flight/targets/boards/coptercontrol/System/pios_usb_board_data.c
rename to flight/targets/boards/coptercontrol/firmware/pios_usb_board_data.c
diff --git a/flight/targets/boards/oplinkmini/Makefile b/flight/targets/boards/oplinkmini/firmware/Makefile
similarity index 100%
rename from flight/targets/boards/oplinkmini/Makefile
rename to flight/targets/boards/oplinkmini/firmware/Makefile
diff --git a/flight/targets/boards/oplinkmini/System/inc/FreeRTOSConfig.h b/flight/targets/boards/oplinkmini/firmware/inc/FreeRTOSConfig.h
similarity index 100%
rename from flight/targets/boards/oplinkmini/System/inc/FreeRTOSConfig.h
rename to flight/targets/boards/oplinkmini/firmware/inc/FreeRTOSConfig.h
diff --git a/flight/targets/boards/oplinkmini/System/inc/openpilot.h b/flight/targets/boards/oplinkmini/firmware/inc/openpilot.h
similarity index 100%
rename from flight/targets/boards/oplinkmini/System/inc/openpilot.h
rename to flight/targets/boards/oplinkmini/firmware/inc/openpilot.h
diff --git a/flight/targets/boards/oplinkmini/System/inc/pios_board_posix.h b/flight/targets/boards/oplinkmini/firmware/inc/pios_board_posix.h
similarity index 100%
rename from flight/targets/boards/oplinkmini/System/inc/pios_board_posix.h
rename to flight/targets/boards/oplinkmini/firmware/inc/pios_board_posix.h
diff --git a/flight/targets/boards/oplinkmini/System/inc/pios_config.h b/flight/targets/boards/oplinkmini/firmware/inc/pios_config.h
similarity index 100%
rename from flight/targets/boards/oplinkmini/System/inc/pios_config.h
rename to flight/targets/boards/oplinkmini/firmware/inc/pios_config.h
diff --git a/flight/targets/boards/oplinkmini/System/inc/pios_config_posix.h b/flight/targets/boards/oplinkmini/firmware/inc/pios_config_posix.h
similarity index 100%
rename from flight/targets/boards/oplinkmini/System/inc/pios_config_posix.h
rename to flight/targets/boards/oplinkmini/firmware/inc/pios_config_posix.h
diff --git a/flight/targets/boards/oplinkmini/System/inc/pios_usb_board_data.h b/flight/targets/boards/oplinkmini/firmware/inc/pios_usb_board_data.h
similarity index 100%
rename from flight/targets/boards/oplinkmini/System/inc/pios_usb_board_data.h
rename to flight/targets/boards/oplinkmini/firmware/inc/pios_usb_board_data.h
diff --git a/flight/targets/boards/oplinkmini/System/oplink.c b/flight/targets/boards/oplinkmini/firmware/oplink.c
similarity index 100%
rename from flight/targets/boards/oplinkmini/System/oplink.c
rename to flight/targets/boards/oplinkmini/firmware/oplink.c
diff --git a/flight/targets/boards/oplinkmini/System/pios_board.c b/flight/targets/boards/oplinkmini/firmware/pios_board.c
similarity index 100%
rename from flight/targets/boards/oplinkmini/System/pios_board.c
rename to flight/targets/boards/oplinkmini/firmware/pios_board.c
diff --git a/flight/targets/boards/oplinkmini/System/pios_board_posix.c b/flight/targets/boards/oplinkmini/firmware/pios_board_posix.c
similarity index 100%
rename from flight/targets/boards/oplinkmini/System/pios_board_posix.c
rename to flight/targets/boards/oplinkmini/firmware/pios_board_posix.c
diff --git a/flight/targets/boards/oplinkmini/System/pios_usb_board_data.c b/flight/targets/boards/oplinkmini/firmware/pios_usb_board_data.c
similarity index 100%
rename from flight/targets/boards/oplinkmini/System/pios_usb_board_data.c
rename to flight/targets/boards/oplinkmini/firmware/pios_usb_board_data.c
diff --git a/flight/targets/boards/osd/Makefile b/flight/targets/boards/osd/firmware/Makefile
similarity index 100%
rename from flight/targets/boards/osd/Makefile
rename to flight/targets/boards/osd/firmware/Makefile
diff --git a/flight/targets/boards/osd/System/cm3_fault_handlers.c b/flight/targets/boards/osd/firmware/cm3_fault_handlers.c
similarity index 100%
rename from flight/targets/boards/osd/System/cm3_fault_handlers.c
rename to flight/targets/boards/osd/firmware/cm3_fault_handlers.c
diff --git a/flight/targets/boards/osd/System/dcc_stdio.c b/flight/targets/boards/osd/firmware/dcc_stdio.c
similarity index 100%
rename from flight/targets/boards/osd/System/dcc_stdio.c
rename to flight/targets/boards/osd/firmware/dcc_stdio.c
diff --git a/flight/targets/boards/osd/System/font_outlined8x14.c b/flight/targets/boards/osd/firmware/font_outlined8x14.c
similarity index 100%
rename from flight/targets/boards/osd/System/font_outlined8x14.c
rename to flight/targets/boards/osd/firmware/font_outlined8x14.c
diff --git a/flight/targets/boards/osd/System/font_outlined8x8.c b/flight/targets/boards/osd/firmware/font_outlined8x8.c
similarity index 100%
rename from flight/targets/boards/osd/System/font_outlined8x8.c
rename to flight/targets/boards/osd/firmware/font_outlined8x8.c
diff --git a/flight/targets/boards/osd/System/fonts.c b/flight/targets/boards/osd/firmware/fonts.c
similarity index 100%
rename from flight/targets/boards/osd/System/fonts.c
rename to flight/targets/boards/osd/firmware/fonts.c
diff --git a/flight/targets/boards/osd/System/inc/FreeRTOSConfig.h b/flight/targets/boards/osd/firmware/inc/FreeRTOSConfig.h
similarity index 100%
rename from flight/targets/boards/osd/System/inc/FreeRTOSConfig.h
rename to flight/targets/boards/osd/firmware/inc/FreeRTOSConfig.h
diff --git a/flight/targets/boards/osd/System/inc/dcc_stdio.h b/flight/targets/boards/osd/firmware/inc/dcc_stdio.h
similarity index 100%
rename from flight/targets/boards/osd/System/inc/dcc_stdio.h
rename to flight/targets/boards/osd/firmware/inc/dcc_stdio.h
diff --git a/flight/targets/boards/osd/System/inc/font12x18.h b/flight/targets/boards/osd/firmware/inc/font12x18.h
similarity index 100%
rename from flight/targets/boards/osd/System/inc/font12x18.h
rename to flight/targets/boards/osd/firmware/inc/font12x18.h
diff --git a/flight/targets/boards/osd/System/inc/font8x10.h b/flight/targets/boards/osd/firmware/inc/font8x10.h
similarity index 100%
rename from flight/targets/boards/osd/System/inc/font8x10.h
rename to flight/targets/boards/osd/firmware/inc/font8x10.h
diff --git a/flight/targets/boards/osd/System/inc/font_outlined8x14.h b/flight/targets/boards/osd/firmware/inc/font_outlined8x14.h
similarity index 100%
rename from flight/targets/boards/osd/System/inc/font_outlined8x14.h
rename to flight/targets/boards/osd/firmware/inc/font_outlined8x14.h
diff --git a/flight/targets/boards/osd/System/inc/font_outlined8x8.h b/flight/targets/boards/osd/firmware/inc/font_outlined8x8.h
similarity index 100%
rename from flight/targets/boards/osd/System/inc/font_outlined8x8.h
rename to flight/targets/boards/osd/firmware/inc/font_outlined8x8.h
diff --git a/flight/targets/boards/osd/System/inc/fonts.h b/flight/targets/boards/osd/firmware/inc/fonts.h
similarity index 100%
rename from flight/targets/boards/osd/System/inc/fonts.h
rename to flight/targets/boards/osd/firmware/inc/fonts.h
diff --git a/flight/targets/boards/osd/System/inc/openpilot.h b/flight/targets/boards/osd/firmware/inc/openpilot.h
similarity index 100%
rename from flight/targets/boards/osd/System/inc/openpilot.h
rename to flight/targets/boards/osd/firmware/inc/openpilot.h
diff --git a/flight/targets/boards/osd/System/inc/pios_config.h b/flight/targets/boards/osd/firmware/inc/pios_config.h
similarity index 100%
rename from flight/targets/boards/osd/System/inc/pios_config.h
rename to flight/targets/boards/osd/firmware/inc/pios_config.h
diff --git a/flight/targets/boards/osd/System/inc/pios_usb_board_data.h b/flight/targets/boards/osd/firmware/inc/pios_usb_board_data.h
similarity index 100%
rename from flight/targets/boards/osd/System/inc/pios_usb_board_data.h
rename to flight/targets/boards/osd/firmware/inc/pios_usb_board_data.h
diff --git a/flight/targets/boards/osd/System/inc/splash.h b/flight/targets/boards/osd/firmware/inc/splash.h
similarity index 100%
rename from flight/targets/boards/osd/System/inc/splash.h
rename to flight/targets/boards/osd/firmware/inc/splash.h
diff --git a/flight/targets/boards/osd/System/osd.c b/flight/targets/boards/osd/firmware/osd.c
similarity index 100%
rename from flight/targets/boards/osd/System/osd.c
rename to flight/targets/boards/osd/firmware/osd.c
diff --git a/flight/targets/boards/osd/System/pios_board.c b/flight/targets/boards/osd/firmware/pios_board.c
similarity index 100%
rename from flight/targets/boards/osd/System/pios_board.c
rename to flight/targets/boards/osd/firmware/pios_board.c
diff --git a/flight/targets/boards/osd/System/pios_usb_board_data.c b/flight/targets/boards/osd/firmware/pios_usb_board_data.c
similarity index 100%
rename from flight/targets/boards/osd/System/pios_usb_board_data.c
rename to flight/targets/boards/osd/firmware/pios_usb_board_data.c
diff --git a/flight/targets/boards/revolution/Makefile b/flight/targets/boards/revolution/firmware/Makefile
similarity index 100%
rename from flight/targets/boards/revolution/Makefile
rename to flight/targets/boards/revolution/firmware/Makefile
diff --git a/flight/targets/boards/revolution/Makefile.osx b/flight/targets/boards/revolution/firmware/Makefile.osx
similarity index 100%
rename from flight/targets/boards/revolution/Makefile.osx
rename to flight/targets/boards/revolution/firmware/Makefile.osx
diff --git a/flight/targets/boards/revolution/UAVObjects.inc b/flight/targets/boards/revolution/firmware/UAVObjects.inc
similarity index 100%
rename from flight/targets/boards/revolution/UAVObjects.inc
rename to flight/targets/boards/revolution/firmware/UAVObjects.inc
diff --git a/flight/targets/boards/revolution/System/cm3_fault_handlers.c b/flight/targets/boards/revolution/firmware/cm3_fault_handlers.c
similarity index 100%
rename from flight/targets/boards/revolution/System/cm3_fault_handlers.c
rename to flight/targets/boards/revolution/firmware/cm3_fault_handlers.c
diff --git a/flight/targets/boards/revolution/System/dcc_stdio.c b/flight/targets/boards/revolution/firmware/dcc_stdio.c
similarity index 100%
rename from flight/targets/boards/revolution/System/dcc_stdio.c
rename to flight/targets/boards/revolution/firmware/dcc_stdio.c
diff --git a/flight/targets/boards/revolution/System/inc/FreeRTOSConfig.h b/flight/targets/boards/revolution/firmware/inc/FreeRTOSConfig.h
similarity index 100%
rename from flight/targets/boards/revolution/System/inc/FreeRTOSConfig.h
rename to flight/targets/boards/revolution/firmware/inc/FreeRTOSConfig.h
diff --git a/flight/targets/boards/revolution/System/inc/dcc_stdio.h b/flight/targets/boards/revolution/firmware/inc/dcc_stdio.h
similarity index 100%
rename from flight/targets/boards/revolution/System/inc/dcc_stdio.h
rename to flight/targets/boards/revolution/firmware/inc/dcc_stdio.h
diff --git a/flight/targets/boards/revolution/System/inc/openpilot.h b/flight/targets/boards/revolution/firmware/inc/openpilot.h
similarity index 100%
rename from flight/targets/boards/revolution/System/inc/openpilot.h
rename to flight/targets/boards/revolution/firmware/inc/openpilot.h
diff --git a/flight/targets/boards/revolution/System/inc/pios_board_sim.h b/flight/targets/boards/revolution/firmware/inc/pios_board_sim.h
similarity index 100%
rename from flight/targets/boards/revolution/System/inc/pios_board_sim.h
rename to flight/targets/boards/revolution/firmware/inc/pios_board_sim.h
diff --git a/flight/targets/boards/revolution/System/inc/pios_config.h b/flight/targets/boards/revolution/firmware/inc/pios_config.h
similarity index 100%
rename from flight/targets/boards/revolution/System/inc/pios_config.h
rename to flight/targets/boards/revolution/firmware/inc/pios_config.h
diff --git a/flight/targets/boards/revolution/System/inc/pios_config_sim.h b/flight/targets/boards/revolution/firmware/inc/pios_config_sim.h
similarity index 100%
rename from flight/targets/boards/revolution/System/inc/pios_config_sim.h
rename to flight/targets/boards/revolution/firmware/inc/pios_config_sim.h
diff --git a/flight/targets/boards/revolution/System/inc/pios_usb_board_data.h b/flight/targets/boards/revolution/firmware/inc/pios_usb_board_data.h
similarity index 100%
rename from flight/targets/boards/revolution/System/inc/pios_usb_board_data.h
rename to flight/targets/boards/revolution/firmware/inc/pios_usb_board_data.h
diff --git a/flight/targets/boards/revolution/System/pios_board.c b/flight/targets/boards/revolution/firmware/pios_board.c
similarity index 100%
rename from flight/targets/boards/revolution/System/pios_board.c
rename to flight/targets/boards/revolution/firmware/pios_board.c
diff --git a/flight/targets/boards/revolution/System/pios_board_sim.c b/flight/targets/boards/revolution/firmware/pios_board_sim.c
similarity index 100%
rename from flight/targets/boards/revolution/System/pios_board_sim.c
rename to flight/targets/boards/revolution/firmware/pios_board_sim.c
diff --git a/flight/targets/boards/revolution/System/pios_usb_board_data.c b/flight/targets/boards/revolution/firmware/pios_usb_board_data.c
similarity index 100%
rename from flight/targets/boards/revolution/System/pios_usb_board_data.c
rename to flight/targets/boards/revolution/firmware/pios_usb_board_data.c
diff --git a/flight/targets/boards/revolution/System/revolution.c b/flight/targets/boards/revolution/firmware/revolution.c
similarity index 100%
rename from flight/targets/boards/revolution/System/revolution.c
rename to flight/targets/boards/revolution/firmware/revolution.c
diff --git a/flight/targets/boards/sensortest/Makefile b/flight/targets/boards/sensortest/firmware/Makefile
similarity index 100%
rename from flight/targets/boards/sensortest/Makefile
rename to flight/targets/boards/sensortest/firmware/Makefile
diff --git a/flight/targets/boards/sensortest/Makefile.osx b/flight/targets/boards/sensortest/firmware/Makefile.osx
similarity index 100%
rename from flight/targets/boards/sensortest/Makefile.osx
rename to flight/targets/boards/sensortest/firmware/Makefile.osx
diff --git a/flight/targets/boards/sensortest/UAVObjects.inc b/flight/targets/boards/sensortest/firmware/UAVObjects.inc
similarity index 100%
rename from flight/targets/boards/sensortest/UAVObjects.inc
rename to flight/targets/boards/sensortest/firmware/UAVObjects.inc
diff --git a/flight/targets/boards/sensortest/System/cm3_fault_handlers.c b/flight/targets/boards/sensortest/firmware/cm3_fault_handlers.c
similarity index 100%
rename from flight/targets/boards/sensortest/System/cm3_fault_handlers.c
rename to flight/targets/boards/sensortest/firmware/cm3_fault_handlers.c
diff --git a/flight/targets/boards/sensortest/System/dcc_stdio.c b/flight/targets/boards/sensortest/firmware/dcc_stdio.c
similarity index 100%
rename from flight/targets/boards/sensortest/System/dcc_stdio.c
rename to flight/targets/boards/sensortest/firmware/dcc_stdio.c
diff --git a/flight/targets/boards/sensortest/System/inc/FreeRTOSConfig.h b/flight/targets/boards/sensortest/firmware/inc/FreeRTOSConfig.h
similarity index 100%
rename from flight/targets/boards/sensortest/System/inc/FreeRTOSConfig.h
rename to flight/targets/boards/sensortest/firmware/inc/FreeRTOSConfig.h
diff --git a/flight/targets/boards/sensortest/System/inc/dcc_stdio.h b/flight/targets/boards/sensortest/firmware/inc/dcc_stdio.h
similarity index 100%
rename from flight/targets/boards/sensortest/System/inc/dcc_stdio.h
rename to flight/targets/boards/sensortest/firmware/inc/dcc_stdio.h
diff --git a/flight/targets/boards/sensortest/System/inc/openpilot.h b/flight/targets/boards/sensortest/firmware/inc/openpilot.h
similarity index 100%
rename from flight/targets/boards/sensortest/System/inc/openpilot.h
rename to flight/targets/boards/sensortest/firmware/inc/openpilot.h
diff --git a/flight/targets/boards/sensortest/System/inc/pios_board_sim.h b/flight/targets/boards/sensortest/firmware/inc/pios_board_sim.h
similarity index 100%
rename from flight/targets/boards/sensortest/System/inc/pios_board_sim.h
rename to flight/targets/boards/sensortest/firmware/inc/pios_board_sim.h
diff --git a/flight/targets/boards/sensortest/System/inc/pios_config.h b/flight/targets/boards/sensortest/firmware/inc/pios_config.h
similarity index 100%
rename from flight/targets/boards/sensortest/System/inc/pios_config.h
rename to flight/targets/boards/sensortest/firmware/inc/pios_config.h
diff --git a/flight/targets/boards/sensortest/System/inc/pios_config_sim.h b/flight/targets/boards/sensortest/firmware/inc/pios_config_sim.h
similarity index 100%
rename from flight/targets/boards/sensortest/System/inc/pios_config_sim.h
rename to flight/targets/boards/sensortest/firmware/inc/pios_config_sim.h
diff --git a/flight/targets/boards/sensortest/System/inc/pios_usb_board_data.h b/flight/targets/boards/sensortest/firmware/inc/pios_usb_board_data.h
similarity index 100%
rename from flight/targets/boards/sensortest/System/inc/pios_usb_board_data.h
rename to flight/targets/boards/sensortest/firmware/inc/pios_usb_board_data.h
diff --git a/flight/targets/boards/sensortest/System/pios_board.c b/flight/targets/boards/sensortest/firmware/pios_board.c
similarity index 100%
rename from flight/targets/boards/sensortest/System/pios_board.c
rename to flight/targets/boards/sensortest/firmware/pios_board.c
diff --git a/flight/targets/boards/sensortest/System/pios_board_sim.c b/flight/targets/boards/sensortest/firmware/pios_board_sim.c
similarity index 100%
rename from flight/targets/boards/sensortest/System/pios_board_sim.c
rename to flight/targets/boards/sensortest/firmware/pios_board_sim.c
diff --git a/flight/targets/boards/sensortest/System/pios_usb_board_data.c b/flight/targets/boards/sensortest/firmware/pios_usb_board_data.c
similarity index 100%
rename from flight/targets/boards/sensortest/System/pios_usb_board_data.c
rename to flight/targets/boards/sensortest/firmware/pios_usb_board_data.c
diff --git a/flight/targets/boards/sensortest/System/revolution.c b/flight/targets/boards/sensortest/firmware/revolution.c
similarity index 100%
rename from flight/targets/boards/sensortest/System/revolution.c
rename to flight/targets/boards/sensortest/firmware/revolution.c
diff --git a/flight/targets/boards/simposix/Makefile b/flight/targets/boards/simposix/firmware/Makefile
similarity index 98%
rename from flight/targets/boards/simposix/Makefile
rename to flight/targets/boards/simposix/firmware/Makefile
index e56cb7bad..5679a5870 100644
--- a/flight/targets/boards/simposix/Makefile
+++ b/flight/targets/boards/simposix/firmware/Makefile
@@ -41,15 +41,15 @@ MODULES += FirmwareIAP
 #MODULES += OveroSync
 
 # Paths
-OPSYSTEM = ./System
+OPSYSTEM = .
 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
@@ -59,7 +59,7 @@ PIOSBOARDS = $(PIOS)/Boards
 PIOSCOMMONLIB = $(PIOS)/Common/Libraries
 BOOT = 
 BOOTINC = 
-HWDEFSINC = ../../board_hw_defs/$(BOARD_NAME)
+HWDEFSINC = ../../../board_hw_defs/$(BOARD_NAME)
 UAVOBJSYNTHDIR = $(OUTDIR)/../uavobject-synthetics/flight
 
 # optional component libraries
diff --git a/flight/targets/boards/simposix/UAVObjects.inc b/flight/targets/boards/simposix/firmware/UAVObjects.inc
similarity index 100%
rename from flight/targets/boards/simposix/UAVObjects.inc
rename to flight/targets/boards/simposix/firmware/UAVObjects.inc
diff --git a/flight/targets/boards/simposix/System/inc/FreeRTOSConfig.h b/flight/targets/boards/simposix/firmware/inc/FreeRTOSConfig.h
similarity index 100%
rename from flight/targets/boards/simposix/System/inc/FreeRTOSConfig.h
rename to flight/targets/boards/simposix/firmware/inc/FreeRTOSConfig.h
diff --git a/flight/targets/boards/simposix/System/inc/FreeRTOSConfig_bk.h b/flight/targets/boards/simposix/firmware/inc/FreeRTOSConfig_bk.h
similarity index 100%
rename from flight/targets/boards/simposix/System/inc/FreeRTOSConfig_bk.h
rename to flight/targets/boards/simposix/firmware/inc/FreeRTOSConfig_bk.h
diff --git a/flight/targets/boards/simposix/System/inc/dcc_stdio.h b/flight/targets/boards/simposix/firmware/inc/dcc_stdio.h
similarity index 100%
rename from flight/targets/boards/simposix/System/inc/dcc_stdio.h
rename to flight/targets/boards/simposix/firmware/inc/dcc_stdio.h
diff --git a/flight/targets/boards/simposix/System/inc/openpilot.h b/flight/targets/boards/simposix/firmware/inc/openpilot.h
similarity index 100%
rename from flight/targets/boards/simposix/System/inc/openpilot.h
rename to flight/targets/boards/simposix/firmware/inc/openpilot.h
diff --git a/flight/targets/boards/simposix/System/inc/pios_config.h b/flight/targets/boards/simposix/firmware/inc/pios_config.h
similarity index 100%
rename from flight/targets/boards/simposix/System/inc/pios_config.h
rename to flight/targets/boards/simposix/firmware/inc/pios_config.h
diff --git a/flight/targets/boards/simposix/System/pios_board.c b/flight/targets/boards/simposix/firmware/pios_board.c
similarity index 100%
rename from flight/targets/boards/simposix/System/pios_board.c
rename to flight/targets/boards/simposix/firmware/pios_board.c
diff --git a/flight/targets/boards/simposix/System/simposix.c b/flight/targets/boards/simposix/firmware/simposix.c
similarity index 100%
rename from flight/targets/boards/simposix/System/simposix.c
rename to flight/targets/boards/simposix/firmware/simposix.c
diff --git a/make/apps-defs.mk b/make/apps-defs.mk
index 1f23dc493..fa34fee36 100644
--- a/make/apps-defs.mk
+++ b/make/apps-defs.mk
@@ -22,7 +22,7 @@ endif
 
 # Paths
 TOPDIR		= .
-OPSYSTEM	= $(TOPDIR)/System
+OPSYSTEM	= $(TOPDIR)
 OPSYSTEMINC	= $(OPSYSTEM)/inc
 PIOSINC		= $(PIOS)/inc
 PIOSCOMMON	= $(PIOS)/Common