From 9b8a10a09f172d0316ae6380c579ebcbc7dedc40 Mon Sep 17 00:00:00 2001
From: Dominic Clifton <me@dominicclifton.name>
Date: Mon, 21 Apr 2014 03:34:29 +0100
Subject: [PATCH] Updating makefile so the binaries are build with the name of
 the fork, in this case 'cleanflight'.  Updating binaries to reflect this
 change.

Also renamed the 'startup' folder from 'baseflight_startups'.
---
 Makefile                                         | 16 +++++++++-------
 ...aseflight_FY90Q.hex => cleanflight_FY90Q.hex} |  4 ++--
 ...{baseflight_NAZE.hex => cleanflight_NAZE.hex} |  2 +-
 ...t_OLIMEXINO.hex => cleanflight_OLIMEXINO.hex} |  2 +-
 .../startup_stm32f10x_md.s                       |  0
 .../startup_stm32f10x_md_fy90q.s                 |  0
 .../startup_stm32f10x_md_gcc.S                   |  0
 7 files changed, 13 insertions(+), 11 deletions(-)
 rename obj/{baseflight_FY90Q.hex => cleanflight_FY90Q.hex} (97%)
 rename obj/{baseflight_NAZE.hex => cleanflight_NAZE.hex} (97%)
 rename obj/{baseflight_OLIMEXINO.hex => cleanflight_OLIMEXINO.hex} (97%)
 rename src/{baseflight_startups => startup}/startup_stm32f10x_md.s (100%)
 rename src/{baseflight_startups => startup}/startup_stm32f10x_md_fy90q.s (100%)
 rename src/{baseflight_startups => startup}/startup_stm32f10x_md_gcc.S (100%)

diff --git a/Makefile b/Makefile
index 226ee2c070..0e83a6cb75 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 # 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.
 # 
@@ -30,6 +30,8 @@ SERIAL_DEVICE	?= /dev/ttyUSB0
 # Things that need to be maintained as the source changes
 #
 
+FORKNAME			 = cleanflight
+
 VALID_TARGETS	 = NAZE FY90Q OLIMEXINO
 
 # Working directories
@@ -128,8 +130,8 @@ OLIMEXINO_SRC	 = drivers/accgyro_adxl345.c \
 # This will prevent accidental deletion of startup code.
 .PRECIOUS: %.s
 
-# Search path for baseflight sources
-VPATH		:= $(SRC_DIR):$(SRC_DIR)/baseflight_startups
+# Search path for sources
+VPATH		:= $(SRC_DIR):$(SRC_DIR)/startup
 
 # Search path and source files for the CMSIS sources
 VPATH		:= $(VPATH):$(CMSIS_DIR)/CM3/CoreSupport:$(CMSIS_DIR)/CM3/DeviceSupport/ST/STM32F10x
@@ -200,10 +202,10 @@ CFLAGS = $(BASE_CFLAGS) \
 endif
 
 
-TARGET_HEX	 = $(BIN_DIR)/baseflight_$(TARGET).hex
-TARGET_ELF	 = $(BIN_DIR)/baseflight_$(TARGET).elf
+TARGET_HEX	 = $(BIN_DIR)/$(FORKNAME)_$(TARGET).hex
+TARGET_ELF	 = $(BIN_DIR)/$(FORKNAME)_$(TARGET).elf
 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.
 # It would be nice to compute these lists, but that seems to be just beyond make.
@@ -250,7 +252,7 @@ unbrick: unbrick_$(TARGET)
 
 help:
 	@echo ""
-	@echo "Makefile for the baseflight firmware"
+	@echo "Makefile for the $(FORKNAME) firmware"
 	@echo ""
 	@echo "Usage:"
 	@echo "        make [TARGET=<target>] [OPTIONS=\"<options>\"]"
diff --git a/obj/baseflight_FY90Q.hex b/obj/cleanflight_FY90Q.hex
similarity index 97%
rename from obj/baseflight_FY90Q.hex
rename to obj/cleanflight_FY90Q.hex
index 563f9f8115..029bc3ef7c 100644
--- a/obj/baseflight_FY90Q.hex
+++ b/obj/cleanflight_FY90Q.hex
@@ -3642,8 +3642,8 @@
 :10E380004748494A4B4C4D4E4F50515253545556A5
 :10E390005758595A004166726F333220434C492016
 :10E3A00076657273696F6E20322E32204170722052
-:10E3B00032312032303134202F2030333A31333A69
-:10E3C000303100417661696C61626C6520636F6D0C
+:10E3B00032312032303134202F2030333A33313A69
+:10E3C000353300417661696C61626C6520636F6D05
 :10E3D0006D616E64733A0D0A0025730925730D0A89
 :10E3E0000053797374656D20557074696D653A20BA
 :10E3F0002564207365636F6E64732C20566F6C7494
diff --git a/obj/baseflight_NAZE.hex b/obj/cleanflight_NAZE.hex
similarity index 97%
rename from obj/baseflight_NAZE.hex
rename to obj/cleanflight_NAZE.hex
index 91cd2b4ef9..c8cdd4928c 100644
--- a/obj/baseflight_NAZE.hex
+++ b/obj/cleanflight_NAZE.hex
@@ -4516,7 +4516,7 @@
 :101A10004B4C4D4E4F505152535455565758595A9E
 :101A2000004166726F333220434C492076657273F1
 :101A3000696F6E20322E3220417072203231203296
-:101A4000303134202F2030333A31323A35330041AF
+:101A4000303134202F2030333A33313A33390041AA
 :101A50007661696C61626C6520636F6D6D616E6447
 :101A6000733A0D0A0025730925730D0A0053797323
 :101A700074656D20557074696D653A202564207316
diff --git a/obj/baseflight_OLIMEXINO.hex b/obj/cleanflight_OLIMEXINO.hex
similarity index 97%
rename from obj/baseflight_OLIMEXINO.hex
rename to obj/cleanflight_OLIMEXINO.hex
index 90f3bc790e..dabfa878fd 100644
--- a/obj/baseflight_OLIMEXINO.hex
+++ b/obj/cleanflight_OLIMEXINO.hex
@@ -3913,7 +3913,7 @@
 :10F470004F505152535455565758595A004166727D
 :10F480006F333220434C492076657273696F6E206A
 :10F49000322E32204170722032312032303134200D
-:10F4A0002F2030333A31333A303900417661696C7C
+:10F4A0002F2030333A33323A303200417661696C82
 :10F4B00061626C6520636F6D6D616E64733A0D0AF5
 :10F4C0000025730925730D0A0053797374656D2047
 :10F4D000557074696D653A202564207365636F6E9D
diff --git a/src/baseflight_startups/startup_stm32f10x_md.s b/src/startup/startup_stm32f10x_md.s
similarity index 100%
rename from src/baseflight_startups/startup_stm32f10x_md.s
rename to src/startup/startup_stm32f10x_md.s
diff --git a/src/baseflight_startups/startup_stm32f10x_md_fy90q.s b/src/startup/startup_stm32f10x_md_fy90q.s
similarity index 100%
rename from src/baseflight_startups/startup_stm32f10x_md_fy90q.s
rename to src/startup/startup_stm32f10x_md_fy90q.s
diff --git a/src/baseflight_startups/startup_stm32f10x_md_gcc.S b/src/startup/startup_stm32f10x_md_gcc.S
similarity index 100%
rename from src/baseflight_startups/startup_stm32f10x_md_gcc.S
rename to src/startup/startup_stm32f10x_md_gcc.S