Make: add elf to hex step

Author: Clement Leger

make/Makefile.cypress

@@ -14,21 +14,21 @@ PROJECT_NAME = $(basename $(notdir $(PROJECT_DIR)))
 PSOC_CREATOR_DIR ?= $(error PSOC_CREATOR_DIR must be defined)
 PSOC_CREATOR_DIR = $(subst (,\(,$(subst ),\),$(subst $(SPACE),\$(SPACE),$(PSOC_CREATOR_DIR))))
 CROSS_COMPILE := arm-none-eabi-
-BOARD_TYPE ?= CY8C42
+CPU_TYPE ?= CY8C42
 PSOC_TYPE ?= PSoC4
 
 DEBUG_CFLAGS := -g -O0
 RELEASE_CFLAGS := -O3
 GEN_SRC_DIR := Generated_Source/$(PSOC_TYPE)/
 
-COMMON_FLAGS := -mcpu=$($(BOARD_TYPE)_mcpu) -mthumb
+COMMON_FLAGS := -mcpu=$($(CPU_TYPE)_mcpu) -mthumb
 
 CFLAGS :=  $(COMMON_FLAGS) -Wno-main -Wall -ffunction-sections -ffat-lto-objects
 ASFLAGS := $(COMMON_FLAGS)
 INCLUDE_CFLAGS := -I$(PROJECT_DIR)/$(GEN_SRC_DIR) -I$(PROJECT_DIR)/
 
 # Special dir from cypress tools
-CYCOMPONENT_LIB := $(PSOC_CREATOR_DIR)/psoc/content/CyComponentLibrary/CyComponentLibrary.cylib/$($(BOARD_TYPE)_cpu_dir)/ARM_GCC_493/Debug/CyComponentLibrary.a
+CYCOMPONENT_LIB := $(PSOC_CREATOR_DIR)/psoc/content/CyComponentLibrary/CyComponentLibrary.cylib/$($(CPU_TYPE)_cpu_dir)/ARM_GCC_493/Debug/CyComponentLibrary.a
 CYELFTOOL := $(PSOC_CREATOR_DIR)/bin/cyelftool.exe
 
 BUILD_DIR ?= ./build
@@ -39,7 +39,7 @@ BOOTASM_GNU := $(PROJECT_DIR)/$(GEN_SRC_DIR)/CyBootAsmGnu.s
 OBJ_FILES := $(patsubst %.c,%.o,$(SRC_C_FILES)) $(subst .s,.o,$(BOOTASM_GNU))
 OBJ_FILES := $(subst $(PROJECT_DIR),$(BUILD_DIR),$(OBJ_FILES))
 
-all: $(BUILD_DIR)/$(PROJECT_NAME).elf
+all: $(BUILD_DIR)/$(PROJECT_NAME).hex
 
 $(BUILD_DIR)/%.o: $(PROJECT_DIR)/%.c
 	@mkdir -p $(dir $@)
@@ -56,8 +56,11 @@ $(BUILD_DIR)/$(PROJECT_NAME).a: $(OBJ_FILES) $(BUILD_DIR)
 $(BUILD_DIR)/$(PROJECT_NAME).elf: $(BUILD_DIR)/$(PROJECT_NAME).a
 	@mkdir -p $(dir $@)
 	$(CROSS_COMPILE)gcc -specs=nano.specs $(CFLAGS) -Wl,-Map,$(BUILD_DIR)/$(PROJECT_NAME).map -L$(BUILD_DIR)/ -T $(PROJECT_DIR)/$(GEN_SRC_DIR)/cm0gcc.ld -o $@ -Wl,--start-group $^ "$(CYCOMPONENT_LIB)" -Wl,--end-group -Wl,--gc-sections 
-	wine "$(CYELFTOOL)" -B $@ --flash_row_size $($(BOARD_TYPE)_flash_row_size) --flash_size $($(BOARD_TYPE)_flash_size) --flash_array_size $($(BOARD_TYPE)_flash_array_size)
+	wine "$(CYELFTOOL)" -B $@ --flash_row_size $($(CPU_TYPE)_flash_row_size) --flash_size $($(CPU_TYPE)_flash_size) --flash_array_size $($(CPU_TYPE)_flash_array_size)
 	wine "$(CYELFTOOL)" -S $@
 
+$(BUILD_DIR)/$(PROJECT_NAME).hex: $(BUILD_DIR)/$(PROJECT_NAME).elf
+	$(CROSS_COMPILE)objcopy --gap-fill 0x00 -O ihex $^ $@
+
 clean:
 	rm -rf $(BUILD_DIR)