Skip to content
Permalink
Browse files

makefile fixes, v0.9.15

  • Loading branch information...
rene-dev committed Apr 9, 2018
1 parent f8bcab4 commit 8b90278fde72399fce11bc9c02d605b2664037fd
Showing with 41 additions and 44 deletions.
  1. +3 −3 .travis.yml
  2. +32 −17 Makefile
  3. +1 −1 bootloader/src/version.c
  4. +2 −2 f3_boot/src/version.c
  5. +1 −1 src/version.c
  6. +1 −19 stm32f103/Makefile
  7. +1 −1 stm32f303/src/version.c
@@ -20,9 +20,9 @@ deploy:
secure: L9ek7B1nN9zC/aTFjWam5ytBOL+yYDCr1ItSihxMZGFVODYg1Ng1YrpY2fMbQgH8/Bbw7zLiakkZ+Q/Ln3y/IHWI1QBaYHFaRcOLp556hSuI8G6j9EElrYQkBW9y/1mtXDbgmhmDJZMZLY4Iy7jXueQQNEzqZ02dkXTqzEIidS8G+x0DqyqHP/arumVb6X2iNUuB8gcCUgclT/nvfjML7N90FG5UUVL46BGsho25jtNGnINhK35eKqyVLF/GLk3t152i8kTTNb/p9xKplkC6WAshZDmv6UpSVkv6EinLUO0Ua/91tk1CgeckqO8vo0R7lgQFw3r7yvyhyPpEdIkb3f+nx2H8ZO4aoXiX7ZDQFMKTQ+jJsHm0Sie0KOL+yR2QKwCr3Hywbk/EqVa3BbJAFpvnrPhW21YkFPvJvlnWC2pCLbBQ79d9PGvi14vjJgyWMhmTOSs5drA5oXarNg+6uJDLE7I0aesYyrtpBTa0wIRZtT5BLQkudVUo0OtwmL624y4iUc4UOGjfs+XUlrdP+ze9yl0QI5cVPrJHZ5F0xA+olKb2xiao27bj6BnMPqAzHtnN9LFUZTp+poZyAkI3sQ9DlIFCJ2zdiaYO5PPQIIv7mUJL+7hVpLvZUYaYbmTwgR59hJ9EOIAGerkZXLnHC8C5NXWqd3gkkIRa+ycpJR0=
file:
- obj_app/stmbl.bin
- obj_boot/blboot.bin
- obj_f3dfu/f3dfu.bin
- obj_hvf3/hvf3.bin
- obj_app/stmbl.dfu
- f3.bin
- f4.bin
on:
tags: true
all_branches: true
@@ -249,7 +249,7 @@ ADDRESS = 0x08010000
#
all: gccversion tbl boot build showsize

build: tbl elf hex bin lss sym
build: tbl elf hex bin lss sym f3_boot

elf: $(TARGET).elf
hex: $(TARGET).hex
@@ -269,43 +269,58 @@ tbl:
@$(PYTHON) tools/create_config.py conf/template/* > src/conf_templates.c
@$(PYTHON) tools/create_cmd.py $(SOURCES) > inc/commandslist.h

#build f4 bootloader
boot:
$(MAKE) -f bootloader/Makefile

boot_clean:
$(MAKE) -f bootloader/Makefile clean

#flash f4 bootloader using stlink
boot_flash: boot
$(MAKE) -f bootloader/Makefile flash

hv_flash: boot
$(MAKE) -f stm32f103/Makefile flash

#flash f4 bootloader using df-util
boot_btburn: boot
$(MAKE) -f bootloader/Makefile btflash
$(MAKE) -f bootloader/Makefile btburn

hv:
$(MAKE) -f stm32f103/Makefile

#build f3 bootloader
f3_boot:
$(MAKE) -f f3_boot/Makefile

#flash f3 bootloader using stlink
f3_boot_flash:
$(MAKE) -f f3_boot/Makefile flash

#flash f3 bootloader using df-util
f3_boot_btburn:
$(MAKE) -f f3_boot/Makefile btburn


#build f3 firmware
f3:
$(MAKE) -f stm32f303/Makefile

#flash f3 firmware using stlink
f3_flash:
$(MAKE) -f stm32f303/Makefile flash

#flash f3 firmware using df-util
f3_btburn:
$(MAKE) -f stm32f303/Makefile btburn

f3_boot:
$(MAKE) -f f3_boot/Makefile

f3_boot_btburn:
$(MAKE) -f f3_boot/Makefile btburn

#generate f3 firmware object from f3 bin
hv_firmware.o:
$(MAKE) -f stm32f303/Makefile all

deploy: boot f3_boot f3 build
#build f103 firmware for V3 hardware
f1:
$(MAKE) -f stm32f103/Makefile

#flash f103 firmware for V3 hardware using stlink
f1_flash: boot
$(MAKE) -f stm32f103/Makefile flash

deploy: f3_boot f3 boot build obj_app/stmbl.dfu binall

binall:
cat obj_boot/blboot.bin /dev/zero | head -c 32768 > f4.bin
@@ -345,4 +360,4 @@ include toolchain.mak
.PHONY: all build flash clean \
boot boot_clean boot_flash btburn boot_btflash boot_flash\
elf lss sym \
showsize gccversion tbl
showsize gccversion tbl f3_boot
@@ -4,4 +4,4 @@ volatile const version_info_t version_info __attribute__((section(".version_info
.product_name = "STMBL-Bootloader",
.major = 0,
.minor = 9,
.patch = 14};
.patch = 15};
@@ -1,7 +1,7 @@
#include "version.h"

volatile const version_info_t version_info __attribute__((section(".version_info"))) = {
.product_name = "STMBL-hv-f303",
.product_name = "STMBL-f3-boot",
.major = 0,
.minor = 9,
.patch = 0};
.patch = 15};
@@ -4,4 +4,4 @@ volatile const version_info_t version_info __attribute__((section(".version_info
.product_name = "STMBL",
.major = 0,
.minor = 9,
.patch = 14};
.patch = 15};
@@ -7,7 +7,7 @@ OPT = -O1 -flto
# Object files directory
# Warning: this will be removed by make clean!
#
OBJDIR = obj_hv
OBJDIR = obj_f1

# Target file name (without extension)
TARGET = $(OBJDIR)/hv
@@ -136,24 +136,6 @@ hex: $(TARGET).hex
bin: $(TARGET).bin
lss: $(TARGET).lss
sym: $(TARGET).sym
hv_firmware.o:
$(OBJCOPY) --rename-section .data=.hv_firmware -I binary obj_hv/hv.bin -B arm -O elf32-littlearm hv_firmware.o

# Display compiler version information
#
gccversion:
@$(CC) --version

# Show the final program size
#
showsize: build
@echo
@$(SIZE) $(TARGET).elf 2>/dev/null

# Flash the device
#
flash: build
st-flash --reset write $(TARGET).bin 0x8000000

# Target: clean project
#
@@ -4,4 +4,4 @@ volatile const version_info_t version_info __attribute__((section(".version_info
.product_name = "STMBL-hv-f303",
.major = 0,
.minor = 9,
.patch = 14};
.patch = 15};

0 comments on commit 8b90278

Please sign in to comment.
You can’t perform that action at this time.