From 393b37fa7acb137f25eb68d85b9e064f48ec1e7c Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Tue, 16 Apr 2013 16:57:11 +0300 Subject: [PATCH] OP-899: move board-info.mk from make/boards to board directories --- {make => flight/targets}/boards/coptercontrol/board-info.mk | 0 flight/targets/boards/coptercontrol/bootloader/Makefile | 2 +- flight/targets/boards/coptercontrol/firmware/Makefile | 2 +- {make => flight/targets}/boards/oplinkmini/board-info.mk | 0 flight/targets/boards/oplinkmini/bootloader/Makefile | 2 +- flight/targets/boards/oplinkmini/firmware/Makefile | 2 +- {make => flight/targets}/boards/osd/board-info.mk | 0 flight/targets/boards/osd/bootloader/Makefile | 2 +- flight/targets/boards/osd/firmware/Makefile | 2 +- {make => flight/targets}/boards/revolution/board-info.mk | 0 flight/targets/boards/revolution/bootloader/Makefile | 2 +- flight/targets/boards/revolution/firmware/Makefile | 2 +- {make => flight/targets}/boards/sensortest/board-info.mk | 0 flight/targets/boards/sensortest/bootloader/Makefile | 2 +- flight/targets/boards/sensortest/firmware/Makefile | 2 +- {make => flight/targets}/boards/simposix/board-info.mk | 0 flight/targets/boards/simposix/firmware/Makefile | 2 +- 17 files changed, 11 insertions(+), 11 deletions(-) rename {make => flight/targets}/boards/coptercontrol/board-info.mk (100%) rename {make => flight/targets}/boards/oplinkmini/board-info.mk (100%) rename {make => flight/targets}/boards/osd/board-info.mk (100%) rename {make => flight/targets}/boards/revolution/board-info.mk (100%) rename {make => flight/targets}/boards/sensortest/board-info.mk (100%) rename {make => flight/targets}/boards/simposix/board-info.mk (100%) diff --git a/make/boards/coptercontrol/board-info.mk b/flight/targets/boards/coptercontrol/board-info.mk similarity index 100% rename from make/boards/coptercontrol/board-info.mk rename to flight/targets/boards/coptercontrol/board-info.mk diff --git a/flight/targets/boards/coptercontrol/bootloader/Makefile b/flight/targets/boards/coptercontrol/bootloader/Makefile index bdfea5986..bca8a4cd8 100644 --- a/flight/targets/boards/coptercontrol/bootloader/Makefile +++ b/flight/targets/boards/coptercontrol/bootloader/Makefile @@ -20,7 +20,7 @@ ifndef OPENPILOT_IS_COOL $(error Top level Makefile must be used to build this target) endif -include $(ROOT_DIR)/make/boards/$(BOARD_NAME)/board-info.mk +include ../board-info.mk include $(ROOT_DIR)/make/firmware-defs.mk include $(ROOT_DIR)/make/boot-defs.mk include $(ROOT_DIR)/make/common-defs.mk diff --git a/flight/targets/boards/coptercontrol/firmware/Makefile b/flight/targets/boards/coptercontrol/firmware/Makefile index 361616210..08061757d 100644 --- a/flight/targets/boards/coptercontrol/firmware/Makefile +++ b/flight/targets/boards/coptercontrol/firmware/Makefile @@ -21,7 +21,7 @@ ifndef OPENPILOT_IS_COOL $(error Top level Makefile must be used to build this target) endif -include $(ROOT_DIR)/make/boards/$(BOARD_NAME)/board-info.mk +include ../board-info.mk include $(ROOT_DIR)/make/firmware-defs.mk # ARM DSP library diff --git a/make/boards/oplinkmini/board-info.mk b/flight/targets/boards/oplinkmini/board-info.mk similarity index 100% rename from make/boards/oplinkmini/board-info.mk rename to flight/targets/boards/oplinkmini/board-info.mk diff --git a/flight/targets/boards/oplinkmini/bootloader/Makefile b/flight/targets/boards/oplinkmini/bootloader/Makefile index e6a37c2e4..1c52470cb 100644 --- a/flight/targets/boards/oplinkmini/bootloader/Makefile +++ b/flight/targets/boards/oplinkmini/bootloader/Makefile @@ -20,7 +20,7 @@ ifndef OPENPILOT_IS_COOL $(error Top level Makefile must be used to build this target) endif -include $(ROOT_DIR)/make/boards/$(BOARD_NAME)/board-info.mk +include ../board-info.mk include $(ROOT_DIR)/make/firmware-defs.mk include $(ROOT_DIR)/make/boot-defs.mk include $(ROOT_DIR)/make/common-defs.mk diff --git a/flight/targets/boards/oplinkmini/firmware/Makefile b/flight/targets/boards/oplinkmini/firmware/Makefile index 599ea4ce9..dc7aa53e0 100644 --- a/flight/targets/boards/oplinkmini/firmware/Makefile +++ b/flight/targets/boards/oplinkmini/firmware/Makefile @@ -20,7 +20,7 @@ ifndef OPENPILOT_IS_COOL $(error Top level Makefile must be used to build this target) endif -include $(ROOT_DIR)/make/boards/$(BOARD_NAME)/board-info.mk +include ../board-info.mk include $(ROOT_DIR)/make/firmware-defs.mk # ARM DSP library diff --git a/make/boards/osd/board-info.mk b/flight/targets/boards/osd/board-info.mk similarity index 100% rename from make/boards/osd/board-info.mk rename to flight/targets/boards/osd/board-info.mk diff --git a/flight/targets/boards/osd/bootloader/Makefile b/flight/targets/boards/osd/bootloader/Makefile index ed5d04928..e046f6e80 100644 --- a/flight/targets/boards/osd/bootloader/Makefile +++ b/flight/targets/boards/osd/bootloader/Makefile @@ -20,7 +20,7 @@ ifndef OPENPILOT_IS_COOL $(error Top level Makefile must be used to build this target) endif -include $(ROOT_DIR)/make/boards/$(BOARD_NAME)/board-info.mk +include ../board-info.mk include $(ROOT_DIR)/make/firmware-defs.mk include $(ROOT_DIR)/make/boot-defs.mk include $(ROOT_DIR)/make/common-defs.mk diff --git a/flight/targets/boards/osd/firmware/Makefile b/flight/targets/boards/osd/firmware/Makefile index af54fafc8..53404e2fd 100644 --- a/flight/targets/boards/osd/firmware/Makefile +++ b/flight/targets/boards/osd/firmware/Makefile @@ -20,7 +20,7 @@ ifndef OPENPILOT_IS_COOL $(error Top level Makefile must be used to build this target) endif -include $(ROOT_DIR)/make/boards/$(BOARD_NAME)/board-info.mk +include ../board-info.mk include $(ROOT_DIR)/make/firmware-defs.mk # ARM DSP library diff --git a/make/boards/revolution/board-info.mk b/flight/targets/boards/revolution/board-info.mk similarity index 100% rename from make/boards/revolution/board-info.mk rename to flight/targets/boards/revolution/board-info.mk diff --git a/flight/targets/boards/revolution/bootloader/Makefile b/flight/targets/boards/revolution/bootloader/Makefile index ed5d04928..e046f6e80 100644 --- a/flight/targets/boards/revolution/bootloader/Makefile +++ b/flight/targets/boards/revolution/bootloader/Makefile @@ -20,7 +20,7 @@ ifndef OPENPILOT_IS_COOL $(error Top level Makefile must be used to build this target) endif -include $(ROOT_DIR)/make/boards/$(BOARD_NAME)/board-info.mk +include ../board-info.mk include $(ROOT_DIR)/make/firmware-defs.mk include $(ROOT_DIR)/make/boot-defs.mk include $(ROOT_DIR)/make/common-defs.mk diff --git a/flight/targets/boards/revolution/firmware/Makefile b/flight/targets/boards/revolution/firmware/Makefile index 958c575c1..a9de50a75 100644 --- a/flight/targets/boards/revolution/firmware/Makefile +++ b/flight/targets/boards/revolution/firmware/Makefile @@ -21,7 +21,7 @@ ifndef OPENPILOT_IS_COOL $(error Top level Makefile must be used to build this target) endif -include $(ROOT_DIR)/make/boards/$(BOARD_NAME)/board-info.mk +include ../board-info.mk include $(ROOT_DIR)/make/firmware-defs.mk # ARM DSP library diff --git a/make/boards/sensortest/board-info.mk b/flight/targets/boards/sensortest/board-info.mk similarity index 100% rename from make/boards/sensortest/board-info.mk rename to flight/targets/boards/sensortest/board-info.mk diff --git a/flight/targets/boards/sensortest/bootloader/Makefile b/flight/targets/boards/sensortest/bootloader/Makefile index ed5d04928..e046f6e80 100644 --- a/flight/targets/boards/sensortest/bootloader/Makefile +++ b/flight/targets/boards/sensortest/bootloader/Makefile @@ -20,7 +20,7 @@ ifndef OPENPILOT_IS_COOL $(error Top level Makefile must be used to build this target) endif -include $(ROOT_DIR)/make/boards/$(BOARD_NAME)/board-info.mk +include ../board-info.mk include $(ROOT_DIR)/make/firmware-defs.mk include $(ROOT_DIR)/make/boot-defs.mk include $(ROOT_DIR)/make/common-defs.mk diff --git a/flight/targets/boards/sensortest/firmware/Makefile b/flight/targets/boards/sensortest/firmware/Makefile index 8de424358..522992243 100644 --- a/flight/targets/boards/sensortest/firmware/Makefile +++ b/flight/targets/boards/sensortest/firmware/Makefile @@ -21,7 +21,7 @@ ifndef OPENPILOT_IS_COOL $(error Top level Makefile must be used to build this target) endif -include $(ROOT_DIR)/make/boards/$(BOARD_NAME)/board-info.mk +include ../board-info.mk include $(ROOT_DIR)/make/firmware-defs.mk # ARM DSP library diff --git a/make/boards/simposix/board-info.mk b/flight/targets/boards/simposix/board-info.mk similarity index 100% rename from make/boards/simposix/board-info.mk rename to flight/targets/boards/simposix/board-info.mk diff --git a/flight/targets/boards/simposix/firmware/Makefile b/flight/targets/boards/simposix/firmware/Makefile index 5679a5870..3d200e6f3 100644 --- a/flight/targets/boards/simposix/firmware/Makefile +++ b/flight/targets/boards/simposix/firmware/Makefile @@ -23,8 +23,8 @@ override ARM_SDK_PREFIX := override THUMB := +include ../board-info.mk include $(ROOT_DIR)/make/firmware-defs.mk -include $(ROOT_DIR)/make/boards/$(BOARD_NAME)/board-info.mk # Set developer code and compile options # Set to YES for debugging