Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 00:35:39 +03:00
Code Issues Wiki Activity

Updating makefile so the binaries are build with the name of the fork,

Browse source 
in this case 'cleanflight'.  Updating binaries to reflect this change.  

Also renamed the 'startup' folder from 'baseflight_startups'.
This commit is contained in:
Dominic Clifton 2014-04-21 03:34:29 +01:00
parent 06b3e46b8b
commit 9b8a10a09f
7 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Makefile
View file

@ -5,7 +5,7 @@
# this stuff is worth it, you can buy me a beer in return # this stuff is worth it, you can buy me a beer in return
############################################################################### ###############################################################################
# #
# Makefile for building the baseflight firmware. # Makefile for building the cleanflight firmware.
# #
# Invoke this with 'make help' to see the list of supported targets. # Invoke this with 'make help' to see the list of supported targets.
# #
@ -30,6 +30,8 @@ SERIAL_DEVICE ?= /dev/ttyUSB0
# Things that need to be maintained as the source changes # Things that need to be maintained as the source changes
# #
FORKNAME = cleanflight
VALID_TARGETS = NAZE FY90Q OLIMEXINO VALID_TARGETS = NAZE FY90Q OLIMEXINO
# Working directories # Working directories
@ -128,8 +130,8 @@ OLIMEXINO_SRC = drivers/accgyro_adxl345.c \
# This will prevent accidental deletion of startup code. # This will prevent accidental deletion of startup code.
.PRECIOUS: %.s .PRECIOUS: %.s
# Search path for baseflight sources # Search path for sources
VPATH := $(SRC_DIR):$(SRC_DIR)/baseflight_startups VPATH := $(SRC_DIR):$(SRC_DIR)/startup
# Search path and source files for the CMSIS sources # Search path and source files for the CMSIS sources
VPATH := $(VPATH):$(CMSIS_DIR)/CM3/CoreSupport:$(CMSIS_DIR)/CM3/DeviceSupport/ST/STM32F10x VPATH := $(VPATH):$(CMSIS_DIR)/CM3/CoreSupport:$(CMSIS_DIR)/CM3/DeviceSupport/ST/STM32F10x
@ -200,10 +202,10 @@ CFLAGS = $(BASE_CFLAGS) \
endif endif
TARGET_HEX = $(BIN_DIR)/baseflight_$(TARGET).hex TARGET_HEX = $(BIN_DIR)/$(FORKNAME)_$(TARGET).hex
TARGET_ELF = $(BIN_DIR)/baseflight_$(TARGET).elf TARGET_ELF = $(BIN_DIR)/$(FORKNAME)_$(TARGET).elf
TARGET_OBJS = $(addsuffix .o,$(addprefix $(OBJECT_DIR)/$(TARGET)/,$(basename $($(TARGET)_SRC)))) TARGET_OBJS = $(addsuffix .o,$(addprefix $(OBJECT_DIR)/$(TARGET)/,$(basename $($(TARGET)_SRC))))
TARGET_MAP = $(OBJECT_DIR)/baseflight_$(TARGET).map TARGET_MAP = $(OBJECT_DIR)/$(FORKNAME)_$(TARGET).map
# List of buildable ELF files and their object dependencies. # List of buildable ELF files and their object dependencies.
# It would be nice to compute these lists, but that seems to be just beyond make. # It would be nice to compute these lists, but that seems to be just beyond make.
@ -250,7 +252,7 @@ unbrick: unbrick_$(TARGET)
help: help:
@echo "" @echo ""
@echo "Makefile for the baseflight firmware" @echo "Makefile for the $(FORKNAME) firmware"
@echo "" @echo ""
@echo "Usage:" @echo "Usage:"
@echo " make [TARGET=<target>] [OPTIONS=\"<options>\"]" @echo " make [TARGET=<target>] [OPTIONS=\"<options>\"]"

4
obj/baseflight_FY90Q.hex → obj/cleanflight_FY90Q.hex
View file

@ -3642,8 +3642,8 @@
:10E380004748494A4B4C4D4E4F50515253545556A5 :10E380004748494A4B4C4D4E4F50515253545556A5
:10E390005758595A004166726F333220434C492016 :10E390005758595A004166726F333220434C492016
:10E3A00076657273696F6E20322E32204170722052 :10E3A00076657273696F6E20322E32204170722052
:10E3B00032312032303134202F2030333A31333A69 :10E3B00032312032303134202F2030333A33313A69
:10E3C000303100417661696C61626C6520636F6D0C :10E3C000353300417661696C61626C6520636F6D05
:10E3D0006D616E64733A0D0A0025730925730D0A89 :10E3D0006D616E64733A0D0A0025730925730D0A89
:10E3E0000053797374656D20557074696D653A20BA :10E3E0000053797374656D20557074696D653A20BA
:10E3F0002564207365636F6E64732C20566F6C7494 :10E3F0002564207365636F6E64732C20566F6C7494

2
obj/baseflight_NAZE.hex → obj/cleanflight_NAZE.hex
View file

@ -4516,7 +4516,7 @@
:101A10004B4C4D4E4F505152535455565758595A9E :101A10004B4C4D4E4F505152535455565758595A9E
:101A2000004166726F333220434C492076657273F1 :101A2000004166726F333220434C492076657273F1
:101A3000696F6E20322E3220417072203231203296 :101A3000696F6E20322E3220417072203231203296
:101A4000303134202F2030333A31323A35330041AF :101A4000303134202F2030333A33313A33390041AA
:101A50007661696C61626C6520636F6D6D616E6447 :101A50007661696C61626C6520636F6D6D616E6447
:101A6000733A0D0A0025730925730D0A0053797323 :101A6000733A0D0A0025730925730D0A0053797323
:101A700074656D20557074696D653A202564207316 :101A700074656D20557074696D653A202564207316

2
obj/baseflight_OLIMEXINO.hex → obj/cleanflight_OLIMEXINO.hex
View file

@ -3913,7 +3913,7 @@
:10F470004F505152535455565758595A004166727D :10F470004F505152535455565758595A004166727D
:10F480006F333220434C492076657273696F6E206A :10F480006F333220434C492076657273696F6E206A
:10F49000322E32204170722032312032303134200D :10F49000322E32204170722032312032303134200D
:10F4A0002F2030333A31333A303900417661696C7C :10F4A0002F2030333A33323A303200417661696C82
:10F4B00061626C6520636F6D6D616E64733A0D0AF5 :10F4B00061626C6520636F6D6D616E64733A0D0AF5
:10F4C0000025730925730D0A0053797374656D2047 :10F4C0000025730925730D0A0053797374656D2047
:10F4D000557074696D653A202564207365636F6E9D :10F4D000557074696D653A202564207365636F6E9D

0
src/baseflight_startups/startup_stm32f10x_md.s → src/startup/startup_stm32f10x_md.s
View file

0
src/baseflight_startups/startup_stm32f10x_md_fy90q.s → src/startup/startup_stm32f10x_md_fy90q.s
View file

0
src/baseflight_startups/startup_stm32f10x_md_gcc.S → src/startup/startup_stm32f10x_md_gcc.S
View file