diff --git a/Makefile b/Makefile index cf1403a49..698c4b08c 100644 --- a/Makefile +++ b/Makefile @@ -288,13 +288,13 @@ bl_$(1)_bino: bl_$(1)_bin bl_$(1)_%: $(V1) $$(ARM_GCC_VERSION_CHECK_TEMPLATE) $(V1) $(MKDIR) -p $(BUILD_DIR)/bl_$(1)/dep - $(V1) cd $(ROOT_DIR)/flight/targets/Bootloaders/$(1) && \ + $(V1) cd $(ROOT_DIR)/flight/targets/boards/$(1)/bootloader && \ $$(MAKE) -r --no-print-directory \ BOARD_NAME=$(1) \ BOARD_SHORT_NAME=$(2) \ BUILD_TYPE=bl \ HWDEFSINC=$(HWDEFS)/$(1) \ - TOPDIR=$(ROOT_DIR)/flight/targets/Bootloaders/$(1) \ + TOPDIR=$(ROOT_DIR)/flight/targets/boards/$(1)/bootloader \ OUTDIR=$(BUILD_DIR)/bl_$(1) \ TARGET=bl_$(1) \ $$* diff --git a/flight/targets/Bootloaders/coptercontrol/Makefile b/flight/targets/boards/coptercontrol/bootloader/Makefile similarity index 100% rename from flight/targets/Bootloaders/coptercontrol/Makefile rename to flight/targets/boards/coptercontrol/bootloader/Makefile diff --git a/flight/targets/Bootloaders/coptercontrol/inc/common.h b/flight/targets/boards/coptercontrol/bootloader/inc/common.h similarity index 100% rename from flight/targets/Bootloaders/coptercontrol/inc/common.h rename to flight/targets/boards/coptercontrol/bootloader/inc/common.h diff --git a/flight/targets/Bootloaders/coptercontrol/inc/op_dfu.h b/flight/targets/boards/coptercontrol/bootloader/inc/op_dfu.h similarity index 100% rename from flight/targets/Bootloaders/coptercontrol/inc/op_dfu.h rename to flight/targets/boards/coptercontrol/bootloader/inc/op_dfu.h diff --git a/flight/targets/Bootloaders/coptercontrol/inc/pios_config.h b/flight/targets/boards/coptercontrol/bootloader/inc/pios_config.h similarity index 100% rename from flight/targets/Bootloaders/coptercontrol/inc/pios_config.h rename to flight/targets/boards/coptercontrol/bootloader/inc/pios_config.h diff --git a/flight/targets/Bootloaders/coptercontrol/inc/pios_usb_board_data.h b/flight/targets/boards/coptercontrol/bootloader/inc/pios_usb_board_data.h similarity index 100% rename from flight/targets/Bootloaders/coptercontrol/inc/pios_usb_board_data.h rename to flight/targets/boards/coptercontrol/bootloader/inc/pios_usb_board_data.h diff --git a/flight/targets/Bootloaders/coptercontrol/main.c b/flight/targets/boards/coptercontrol/bootloader/main.c similarity index 100% rename from flight/targets/Bootloaders/coptercontrol/main.c rename to flight/targets/boards/coptercontrol/bootloader/main.c diff --git a/flight/targets/Bootloaders/coptercontrol/op_dfu.c b/flight/targets/boards/coptercontrol/bootloader/op_dfu.c similarity index 100% rename from flight/targets/Bootloaders/coptercontrol/op_dfu.c rename to flight/targets/boards/coptercontrol/bootloader/op_dfu.c diff --git a/flight/targets/Bootloaders/coptercontrol/pios_board.c b/flight/targets/boards/coptercontrol/bootloader/pios_board.c similarity index 100% rename from flight/targets/Bootloaders/coptercontrol/pios_board.c rename to flight/targets/boards/coptercontrol/bootloader/pios_board.c diff --git a/flight/targets/Bootloaders/coptercontrol/pios_usb_board_data.c b/flight/targets/boards/coptercontrol/bootloader/pios_usb_board_data.c similarity index 100% rename from flight/targets/Bootloaders/coptercontrol/pios_usb_board_data.c rename to flight/targets/boards/coptercontrol/bootloader/pios_usb_board_data.c diff --git a/flight/targets/Bootloaders/oplinkmini/Makefile b/flight/targets/boards/oplinkmini/bootloader/Makefile similarity index 100% rename from flight/targets/Bootloaders/oplinkmini/Makefile rename to flight/targets/boards/oplinkmini/bootloader/Makefile diff --git a/flight/targets/Bootloaders/oplinkmini/inc/common.h b/flight/targets/boards/oplinkmini/bootloader/inc/common.h similarity index 100% rename from flight/targets/Bootloaders/oplinkmini/inc/common.h rename to flight/targets/boards/oplinkmini/bootloader/inc/common.h diff --git a/flight/targets/Bootloaders/oplinkmini/inc/op_dfu.h b/flight/targets/boards/oplinkmini/bootloader/inc/op_dfu.h similarity index 100% rename from flight/targets/Bootloaders/oplinkmini/inc/op_dfu.h rename to flight/targets/boards/oplinkmini/bootloader/inc/op_dfu.h diff --git a/flight/targets/Bootloaders/oplinkmini/inc/pios_config.h b/flight/targets/boards/oplinkmini/bootloader/inc/pios_config.h similarity index 100% rename from flight/targets/Bootloaders/oplinkmini/inc/pios_config.h rename to flight/targets/boards/oplinkmini/bootloader/inc/pios_config.h diff --git a/flight/targets/Bootloaders/oplinkmini/inc/pios_usb_board_data.h b/flight/targets/boards/oplinkmini/bootloader/inc/pios_usb_board_data.h similarity index 100% rename from flight/targets/Bootloaders/oplinkmini/inc/pios_usb_board_data.h rename to flight/targets/boards/oplinkmini/bootloader/inc/pios_usb_board_data.h diff --git a/flight/targets/Bootloaders/oplinkmini/main.c b/flight/targets/boards/oplinkmini/bootloader/main.c similarity index 100% rename from flight/targets/Bootloaders/oplinkmini/main.c rename to flight/targets/boards/oplinkmini/bootloader/main.c diff --git a/flight/targets/Bootloaders/oplinkmini/op_dfu.c b/flight/targets/boards/oplinkmini/bootloader/op_dfu.c similarity index 100% rename from flight/targets/Bootloaders/oplinkmini/op_dfu.c rename to flight/targets/boards/oplinkmini/bootloader/op_dfu.c diff --git a/flight/targets/Bootloaders/oplinkmini/pios_board.c b/flight/targets/boards/oplinkmini/bootloader/pios_board.c similarity index 100% rename from flight/targets/Bootloaders/oplinkmini/pios_board.c rename to flight/targets/boards/oplinkmini/bootloader/pios_board.c diff --git a/flight/targets/Bootloaders/oplinkmini/pios_usb_board_data.c b/flight/targets/boards/oplinkmini/bootloader/pios_usb_board_data.c similarity index 100% rename from flight/targets/Bootloaders/oplinkmini/pios_usb_board_data.c rename to flight/targets/boards/oplinkmini/bootloader/pios_usb_board_data.c diff --git a/flight/targets/Bootloaders/osd/Makefile b/flight/targets/boards/osd/bootloader/Makefile similarity index 100% rename from flight/targets/Bootloaders/osd/Makefile rename to flight/targets/boards/osd/bootloader/Makefile diff --git a/flight/targets/Bootloaders/osd/inc/common.h b/flight/targets/boards/osd/bootloader/inc/common.h similarity index 100% rename from flight/targets/Bootloaders/osd/inc/common.h rename to flight/targets/boards/osd/bootloader/inc/common.h diff --git a/flight/targets/Bootloaders/osd/inc/op_dfu.h b/flight/targets/boards/osd/bootloader/inc/op_dfu.h similarity index 100% rename from flight/targets/Bootloaders/osd/inc/op_dfu.h rename to flight/targets/boards/osd/bootloader/inc/op_dfu.h diff --git a/flight/targets/Bootloaders/osd/inc/pios_config.h b/flight/targets/boards/osd/bootloader/inc/pios_config.h similarity index 100% rename from flight/targets/Bootloaders/osd/inc/pios_config.h rename to flight/targets/boards/osd/bootloader/inc/pios_config.h diff --git a/flight/targets/Bootloaders/osd/inc/pios_usb_board_data.h b/flight/targets/boards/osd/bootloader/inc/pios_usb_board_data.h similarity index 100% rename from flight/targets/Bootloaders/osd/inc/pios_usb_board_data.h rename to flight/targets/boards/osd/bootloader/inc/pios_usb_board_data.h diff --git a/flight/targets/Bootloaders/osd/main.c b/flight/targets/boards/osd/bootloader/main.c similarity index 100% rename from flight/targets/Bootloaders/osd/main.c rename to flight/targets/boards/osd/bootloader/main.c diff --git a/flight/targets/Bootloaders/osd/op_dfu.c b/flight/targets/boards/osd/bootloader/op_dfu.c similarity index 100% rename from flight/targets/Bootloaders/osd/op_dfu.c rename to flight/targets/boards/osd/bootloader/op_dfu.c diff --git a/flight/targets/Bootloaders/osd/pios_board.c b/flight/targets/boards/osd/bootloader/pios_board.c similarity index 100% rename from flight/targets/Bootloaders/osd/pios_board.c rename to flight/targets/boards/osd/bootloader/pios_board.c diff --git a/flight/targets/Bootloaders/osd/pios_usb_board_data.c b/flight/targets/boards/osd/bootloader/pios_usb_board_data.c similarity index 100% rename from flight/targets/Bootloaders/osd/pios_usb_board_data.c rename to flight/targets/boards/osd/bootloader/pios_usb_board_data.c diff --git a/flight/targets/Bootloaders/revolution/Makefile b/flight/targets/boards/revolution/bootloader/Makefile similarity index 100% rename from flight/targets/Bootloaders/revolution/Makefile rename to flight/targets/boards/revolution/bootloader/Makefile diff --git a/flight/targets/Bootloaders/revolution/inc/common.h b/flight/targets/boards/revolution/bootloader/inc/common.h similarity index 100% rename from flight/targets/Bootloaders/revolution/inc/common.h rename to flight/targets/boards/revolution/bootloader/inc/common.h diff --git a/flight/targets/Bootloaders/revolution/inc/op_dfu.h b/flight/targets/boards/revolution/bootloader/inc/op_dfu.h similarity index 100% rename from flight/targets/Bootloaders/revolution/inc/op_dfu.h rename to flight/targets/boards/revolution/bootloader/inc/op_dfu.h diff --git a/flight/targets/Bootloaders/revolution/inc/pios_config.h b/flight/targets/boards/revolution/bootloader/inc/pios_config.h similarity index 100% rename from flight/targets/Bootloaders/revolution/inc/pios_config.h rename to flight/targets/boards/revolution/bootloader/inc/pios_config.h diff --git a/flight/targets/Bootloaders/revolution/inc/pios_usb_board_data.h b/flight/targets/boards/revolution/bootloader/inc/pios_usb_board_data.h similarity index 100% rename from flight/targets/Bootloaders/revolution/inc/pios_usb_board_data.h rename to flight/targets/boards/revolution/bootloader/inc/pios_usb_board_data.h diff --git a/flight/targets/Bootloaders/revolution/main.c b/flight/targets/boards/revolution/bootloader/main.c similarity index 100% rename from flight/targets/Bootloaders/revolution/main.c rename to flight/targets/boards/revolution/bootloader/main.c diff --git a/flight/targets/Bootloaders/revolution/op_dfu.c b/flight/targets/boards/revolution/bootloader/op_dfu.c similarity index 100% rename from flight/targets/Bootloaders/revolution/op_dfu.c rename to flight/targets/boards/revolution/bootloader/op_dfu.c diff --git a/flight/targets/Bootloaders/revolution/pios_board.c b/flight/targets/boards/revolution/bootloader/pios_board.c similarity index 100% rename from flight/targets/Bootloaders/revolution/pios_board.c rename to flight/targets/boards/revolution/bootloader/pios_board.c diff --git a/flight/targets/Bootloaders/revolution/pios_usb_board_data.c b/flight/targets/boards/revolution/bootloader/pios_usb_board_data.c similarity index 100% rename from flight/targets/Bootloaders/revolution/pios_usb_board_data.c rename to flight/targets/boards/revolution/bootloader/pios_usb_board_data.c diff --git a/flight/targets/Bootloaders/sensortest/Makefile b/flight/targets/boards/sensortest/bootloader/Makefile similarity index 100% rename from flight/targets/Bootloaders/sensortest/Makefile rename to flight/targets/boards/sensortest/bootloader/Makefile diff --git a/flight/targets/Bootloaders/sensortest/inc/common.h b/flight/targets/boards/sensortest/bootloader/inc/common.h similarity index 100% rename from flight/targets/Bootloaders/sensortest/inc/common.h rename to flight/targets/boards/sensortest/bootloader/inc/common.h diff --git a/flight/targets/Bootloaders/sensortest/inc/op_dfu.h b/flight/targets/boards/sensortest/bootloader/inc/op_dfu.h similarity index 100% rename from flight/targets/Bootloaders/sensortest/inc/op_dfu.h rename to flight/targets/boards/sensortest/bootloader/inc/op_dfu.h diff --git a/flight/targets/Bootloaders/sensortest/inc/pios_config.h b/flight/targets/boards/sensortest/bootloader/inc/pios_config.h similarity index 100% rename from flight/targets/Bootloaders/sensortest/inc/pios_config.h rename to flight/targets/boards/sensortest/bootloader/inc/pios_config.h diff --git a/flight/targets/Bootloaders/sensortest/inc/pios_usb_board_data.h b/flight/targets/boards/sensortest/bootloader/inc/pios_usb_board_data.h similarity index 100% rename from flight/targets/Bootloaders/sensortest/inc/pios_usb_board_data.h rename to flight/targets/boards/sensortest/bootloader/inc/pios_usb_board_data.h diff --git a/flight/targets/Bootloaders/sensortest/main.c b/flight/targets/boards/sensortest/bootloader/main.c similarity index 100% rename from flight/targets/Bootloaders/sensortest/main.c rename to flight/targets/boards/sensortest/bootloader/main.c diff --git a/flight/targets/Bootloaders/sensortest/op_dfu.c b/flight/targets/boards/sensortest/bootloader/op_dfu.c similarity index 100% rename from flight/targets/Bootloaders/sensortest/op_dfu.c rename to flight/targets/boards/sensortest/bootloader/op_dfu.c diff --git a/flight/targets/Bootloaders/sensortest/pios_board.c b/flight/targets/boards/sensortest/bootloader/pios_board.c similarity index 100% rename from flight/targets/Bootloaders/sensortest/pios_board.c rename to flight/targets/boards/sensortest/bootloader/pios_board.c diff --git a/flight/targets/Bootloaders/sensortest/pios_usb_board_data.c b/flight/targets/boards/sensortest/bootloader/pios_usb_board_data.c similarity index 100% rename from flight/targets/Bootloaders/sensortest/pios_usb_board_data.c rename to flight/targets/boards/sensortest/bootloader/pios_usb_board_data.c