OP-899: rename System to firmware and move Makefile into it

2025-02-05 21:52:10 +01:00 · 2013-04-15 21:47:23 +03:00 · 2013-04-15 21:47:23 +03:00 · f7f842687a
commit f7f842687a
parent fce12662bc
85 changed files with 9 additions and 9 deletions
--- a/4
+++ b/4
@ -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) \
 		$$*
--- a/flight/targets/boards/coptercontrol/firmware/Makefile
+++ b/flight/targets/boards/coptercontrol/firmware/Makefile
--- a/flight/targets/boards/coptercontrol/firmware/coptercontrol.c
+++ b/flight/targets/boards/coptercontrol/firmware/coptercontrol.c
--- a/flight/targets/boards/coptercontrol/firmware/inc/FreeRTOSConfig.h
+++ b/flight/targets/boards/coptercontrol/firmware/inc/FreeRTOSConfig.h
--- a/flight/targets/boards/coptercontrol/firmware/inc/openpilot.h
+++ b/flight/targets/boards/coptercontrol/firmware/inc/openpilot.h
--- a/flight/targets/boards/coptercontrol/firmware/inc/pios_board_posix.h
+++ b/flight/targets/boards/coptercontrol/firmware/inc/pios_board_posix.h
--- a/flight/targets/boards/coptercontrol/firmware/inc/pios_config.h
+++ b/flight/targets/boards/coptercontrol/firmware/inc/pios_config.h
--- a/flight/targets/boards/coptercontrol/firmware/inc/pios_config_posix.h
+++ b/flight/targets/boards/coptercontrol/firmware/inc/pios_config_posix.h
--- a/flight/targets/boards/coptercontrol/firmware/inc/pios_usb_board_data.h
+++ b/flight/targets/boards/coptercontrol/firmware/inc/pios_usb_board_data.h
--- a/flight/targets/boards/coptercontrol/firmware/pios_board.c
+++ b/flight/targets/boards/coptercontrol/firmware/pios_board.c
--- a/flight/targets/boards/coptercontrol/firmware/pios_board_posix.c
+++ b/flight/targets/boards/coptercontrol/firmware/pios_board_posix.c
--- a/flight/targets/boards/coptercontrol/firmware/pios_usb_board_data.c
+++ b/flight/targets/boards/coptercontrol/firmware/pios_usb_board_data.c
--- a/flight/targets/boards/oplinkmini/firmware/Makefile
+++ b/flight/targets/boards/oplinkmini/firmware/Makefile
--- a/flight/targets/boards/oplinkmini/firmware/inc/FreeRTOSConfig.h
+++ b/flight/targets/boards/oplinkmini/firmware/inc/FreeRTOSConfig.h
--- a/flight/targets/boards/oplinkmini/firmware/inc/openpilot.h
+++ b/flight/targets/boards/oplinkmini/firmware/inc/openpilot.h
--- a/flight/targets/boards/oplinkmini/firmware/inc/pios_board_posix.h
+++ b/flight/targets/boards/oplinkmini/firmware/inc/pios_board_posix.h
--- a/flight/targets/boards/oplinkmini/firmware/inc/pios_config.h
+++ b/flight/targets/boards/oplinkmini/firmware/inc/pios_config.h
--- a/flight/targets/boards/oplinkmini/firmware/inc/pios_config_posix.h
+++ b/flight/targets/boards/oplinkmini/firmware/inc/pios_config_posix.h
--- a/flight/targets/boards/oplinkmini/firmware/inc/pios_usb_board_data.h
+++ b/flight/targets/boards/oplinkmini/firmware/inc/pios_usb_board_data.h
--- a/flight/targets/boards/oplinkmini/firmware/oplink.c
+++ b/flight/targets/boards/oplinkmini/firmware/oplink.c
--- a/flight/targets/boards/oplinkmini/firmware/pios_board.c
+++ b/flight/targets/boards/oplinkmini/firmware/pios_board.c
--- a/flight/targets/boards/oplinkmini/firmware/pios_board_posix.c
+++ b/flight/targets/boards/oplinkmini/firmware/pios_board_posix.c
--- a/flight/targets/boards/oplinkmini/firmware/pios_usb_board_data.c
+++ b/flight/targets/boards/oplinkmini/firmware/pios_usb_board_data.c
--- a/flight/targets/boards/osd/firmware/Makefile
+++ b/flight/targets/boards/osd/firmware/Makefile
--- a/flight/targets/boards/osd/firmware/cm3_fault_handlers.c
+++ b/flight/targets/boards/osd/firmware/cm3_fault_handlers.c
--- a/flight/targets/boards/osd/firmware/dcc_stdio.c
+++ b/flight/targets/boards/osd/firmware/dcc_stdio.c
--- a/flight/targets/boards/osd/firmware/font_outlined8x14.c
+++ b/flight/targets/boards/osd/firmware/font_outlined8x14.c
--- a/flight/targets/boards/osd/firmware/font_outlined8x8.c
+++ b/flight/targets/boards/osd/firmware/font_outlined8x8.c
--- a/flight/targets/boards/osd/firmware/fonts.c
+++ b/flight/targets/boards/osd/firmware/fonts.c
--- a/flight/targets/boards/osd/firmware/inc/FreeRTOSConfig.h
+++ b/flight/targets/boards/osd/firmware/inc/FreeRTOSConfig.h
--- a/flight/targets/boards/osd/firmware/inc/dcc_stdio.h
+++ b/flight/targets/boards/osd/firmware/inc/dcc_stdio.h
--- a/flight/targets/boards/osd/firmware/inc/font12x18.h
+++ b/flight/targets/boards/osd/firmware/inc/font12x18.h
--- a/flight/targets/boards/osd/firmware/inc/font8x10.h
+++ b/flight/targets/boards/osd/firmware/inc/font8x10.h
--- a/flight/targets/boards/osd/firmware/inc/font_outlined8x14.h
+++ b/flight/targets/boards/osd/firmware/inc/font_outlined8x14.h
--- a/flight/targets/boards/osd/firmware/inc/font_outlined8x8.h
+++ b/flight/targets/boards/osd/firmware/inc/font_outlined8x8.h
--- a/flight/targets/boards/osd/firmware/inc/fonts.h
+++ b/flight/targets/boards/osd/firmware/inc/fonts.h
--- a/flight/targets/boards/osd/firmware/inc/openpilot.h
+++ b/flight/targets/boards/osd/firmware/inc/openpilot.h
--- a/flight/targets/boards/osd/firmware/inc/pios_config.h
+++ b/flight/targets/boards/osd/firmware/inc/pios_config.h
--- a/flight/targets/boards/osd/firmware/inc/pios_usb_board_data.h
+++ b/flight/targets/boards/osd/firmware/inc/pios_usb_board_data.h
--- a/flight/targets/boards/osd/firmware/inc/splash.h
+++ b/flight/targets/boards/osd/firmware/inc/splash.h
--- a/flight/targets/boards/osd/firmware/osd.c
+++ b/flight/targets/boards/osd/firmware/osd.c
--- a/flight/targets/boards/osd/firmware/pios_board.c
+++ b/flight/targets/boards/osd/firmware/pios_board.c
--- a/flight/targets/boards/osd/firmware/pios_usb_board_data.c
+++ b/flight/targets/boards/osd/firmware/pios_usb_board_data.c
--- a/flight/targets/boards/revolution/firmware/Makefile
+++ b/flight/targets/boards/revolution/firmware/Makefile
--- a/flight/targets/boards/revolution/firmware/Makefile.osx
+++ b/flight/targets/boards/revolution/firmware/Makefile.osx
--- a/flight/targets/boards/revolution/firmware/UAVObjects.inc
+++ b/flight/targets/boards/revolution/firmware/UAVObjects.inc
--- a/flight/targets/boards/revolution/firmware/cm3_fault_handlers.c
+++ b/flight/targets/boards/revolution/firmware/cm3_fault_handlers.c
--- a/flight/targets/boards/revolution/firmware/dcc_stdio.c
+++ b/flight/targets/boards/revolution/firmware/dcc_stdio.c
--- a/flight/targets/boards/revolution/firmware/inc/FreeRTOSConfig.h
+++ b/flight/targets/boards/revolution/firmware/inc/FreeRTOSConfig.h
--- a/flight/targets/boards/revolution/firmware/inc/dcc_stdio.h
+++ b/flight/targets/boards/revolution/firmware/inc/dcc_stdio.h
--- a/flight/targets/boards/revolution/firmware/inc/openpilot.h
+++ b/flight/targets/boards/revolution/firmware/inc/openpilot.h
--- a/flight/targets/boards/revolution/firmware/inc/pios_board_sim.h
+++ b/flight/targets/boards/revolution/firmware/inc/pios_board_sim.h
--- a/flight/targets/boards/revolution/firmware/inc/pios_config.h
+++ b/flight/targets/boards/revolution/firmware/inc/pios_config.h
--- a/flight/targets/boards/revolution/firmware/inc/pios_config_sim.h
+++ b/flight/targets/boards/revolution/firmware/inc/pios_config_sim.h
--- a/flight/targets/boards/revolution/firmware/inc/pios_usb_board_data.h
+++ b/flight/targets/boards/revolution/firmware/inc/pios_usb_board_data.h
--- a/flight/targets/boards/revolution/firmware/pios_board.c
+++ b/flight/targets/boards/revolution/firmware/pios_board.c
--- a/flight/targets/boards/revolution/firmware/pios_board_sim.c
+++ b/flight/targets/boards/revolution/firmware/pios_board_sim.c
--- a/flight/targets/boards/revolution/firmware/pios_usb_board_data.c
+++ b/flight/targets/boards/revolution/firmware/pios_usb_board_data.c
--- a/flight/targets/boards/revolution/firmware/revolution.c
+++ b/flight/targets/boards/revolution/firmware/revolution.c
--- a/flight/targets/boards/sensortest/firmware/Makefile
+++ b/flight/targets/boards/sensortest/firmware/Makefile
--- a/flight/targets/boards/sensortest/firmware/Makefile.osx
+++ b/flight/targets/boards/sensortest/firmware/Makefile.osx
--- a/flight/targets/boards/sensortest/firmware/UAVObjects.inc
+++ b/flight/targets/boards/sensortest/firmware/UAVObjects.inc
--- a/flight/targets/boards/sensortest/firmware/cm3_fault_handlers.c
+++ b/flight/targets/boards/sensortest/firmware/cm3_fault_handlers.c
--- a/flight/targets/boards/sensortest/firmware/dcc_stdio.c
+++ b/flight/targets/boards/sensortest/firmware/dcc_stdio.c
--- a/flight/targets/boards/sensortest/firmware/inc/FreeRTOSConfig.h
+++ b/flight/targets/boards/sensortest/firmware/inc/FreeRTOSConfig.h
--- a/flight/targets/boards/sensortest/firmware/inc/dcc_stdio.h
+++ b/flight/targets/boards/sensortest/firmware/inc/dcc_stdio.h
--- a/flight/targets/boards/sensortest/firmware/inc/openpilot.h
+++ b/flight/targets/boards/sensortest/firmware/inc/openpilot.h
--- a/flight/targets/boards/sensortest/firmware/inc/pios_board_sim.h
+++ b/flight/targets/boards/sensortest/firmware/inc/pios_board_sim.h
--- a/flight/targets/boards/sensortest/firmware/inc/pios_config.h
+++ b/flight/targets/boards/sensortest/firmware/inc/pios_config.h
--- a/flight/targets/boards/sensortest/firmware/inc/pios_config_sim.h
+++ b/flight/targets/boards/sensortest/firmware/inc/pios_config_sim.h
--- a/flight/targets/boards/sensortest/firmware/inc/pios_usb_board_data.h
+++ b/flight/targets/boards/sensortest/firmware/inc/pios_usb_board_data.h
--- a/flight/targets/boards/sensortest/firmware/pios_board.c
+++ b/flight/targets/boards/sensortest/firmware/pios_board.c
--- a/flight/targets/boards/sensortest/firmware/pios_board_sim.c
+++ b/flight/targets/boards/sensortest/firmware/pios_board_sim.c
--- a/flight/targets/boards/sensortest/firmware/pios_usb_board_data.c
+++ b/flight/targets/boards/sensortest/firmware/pios_usb_board_data.c
--- a/flight/targets/boards/sensortest/firmware/revolution.c
+++ b/flight/targets/boards/sensortest/firmware/revolution.c
--- a/flight/targets/boards/simposix/firmware/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
+OPMODULEDIR = ../../../../Modules
-FLIGHTLIB = ../../../Libraries
+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
--- a/flight/targets/boards/simposix/firmware/UAVObjects.inc
+++ b/flight/targets/boards/simposix/firmware/UAVObjects.inc
--- a/flight/targets/boards/simposix/firmware/inc/FreeRTOSConfig.h
+++ b/flight/targets/boards/simposix/firmware/inc/FreeRTOSConfig.h
--- a/flight/targets/boards/simposix/firmware/inc/FreeRTOSConfig_bk.h
+++ b/flight/targets/boards/simposix/firmware/inc/FreeRTOSConfig_bk.h
--- a/flight/targets/boards/simposix/firmware/inc/dcc_stdio.h
+++ b/flight/targets/boards/simposix/firmware/inc/dcc_stdio.h
--- a/flight/targets/boards/simposix/firmware/inc/openpilot.h
+++ b/flight/targets/boards/simposix/firmware/inc/openpilot.h
--- a/flight/targets/boards/simposix/firmware/inc/pios_config.h
+++ b/flight/targets/boards/simposix/firmware/inc/pios_config.h
--- a/flight/targets/boards/simposix/firmware/pios_board.c
+++ b/flight/targets/boards/simposix/firmware/pios_board.c
--- a/flight/targets/boards/simposix/firmware/simposix.c
+++ b/flight/targets/boards/simposix/firmware/simposix.c
--- 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