xobs/simmel-bootloader
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename clean up

Browse Source
This commit is contained in:
hathach 2020-03-24 23:08:23 +07:00
parent f99645ede8
commit 5c5b9945bc
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Makefile
View File

@ -22,12 +22,14 @@ SD_HEX = $(SD_PATH)/$(SD_FILENAME)_softdevice.hex
# linker by MCU and SoftDevice eg. nrf52840_s140_v6.ld # linker by MCU and SoftDevice eg. nrf52840_s140_v6.ld
LD_FILE = linker/$(MCU_SUB_VARIANT)_$(SD_NAME)_v$(word 1, $(subst ., ,$(SD_VERSION))).ld LD_FILE = linker/$(MCU_SUB_VARIANT)_$(SD_NAME)_v$(word 1, $(subst ., ,$(SD_VERSION))).ld
MERGED_FNAME = $(OUTPUT_FILENAME)_$(SD_NAME)_$(SD_VERSION)
GIT_VERSION = $(shell git describe --dirty --always --tags) GIT_VERSION = $(shell git describe --dirty --always --tags)
GIT_SUBMODULE_VERSIONS = $(shell git submodule status | cut -d' ' -f3,4 | paste -s -d" " -) GIT_SUBMODULE_VERSIONS = $(shell git submodule status | cut -d' ' -f3,4 | paste -s -d" " -)
OUTPUT_FILENAME = $(BOARD)_bootloader-$(GIT_VERSION) # compiled file name
OUT_FILE = $(BOARD)_bootloader-$(GIT_VERSION)
# merged file = compiled + sd
MERGED_FILE = $(OUT_FILE)_$(SD_NAME)_$(SD_VERSION)
#****************************************************************************** #******************************************************************************
# Tool configure # Tool configure
@ -250,7 +252,7 @@ CFLAGS += -DMK_BOOTLOADER_VERSION='($(word 1,$(_VER)) << 16) + ($(word 2,$(_VER)
#****************************************************************************** #******************************************************************************
# keep every function in separate section. This will allow linker to dump unused functions # keep every function in separate section. This will allow linker to dump unused functions
LDFLAGS += -Xlinker -Map=$(BUILD)/$(OUTPUT_FILENAME).map LDFLAGS += -Xlinker -Map=$(BUILD)/$(OUT_FILE).map
LDFLAGS += -mthumb -mabi=aapcs -Llinker -T$(LD_FILE) LDFLAGS += -mthumb -mabi=aapcs -Llinker -T$(LD_FILE)
LDFLAGS += -mcpu=cortex-m4 LDFLAGS += -mcpu=cortex-m4
LDFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16 LDFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16
@ -306,7 +308,7 @@ endif
.phony: all clean size flash sd erase .phony: all clean size flash sd erase
# default target to build # default target to build
all: $(BUILD)/$(OUTPUT_FILENAME)-nosd.out size all: $(BUILD)/$(OUT_FILE)-nosd.out size
#******************* Flash target ******************* #******************* Flash target *******************
@ -318,11 +320,11 @@ __check_defined = \
$(error Undefined make flag: $1$(if $2, ($2)))) $(error Undefined make flag: $1$(if $2, ($2))))
# Flash the compiled # Flash the compiled
flash: $(BUILD)/$(OUTPUT_FILENAME)-nosd.hex flash: $(BUILD)/$(OUT_FILE)-nosd.hex
@echo Flashing: $< @echo Flashing: $<
$(NRFJPROG) --program $< --sectoranduicrerase -f nrf52 --reset $(NRFJPROG) --program $< --sectoranduicrerase -f nrf52 --reset
dfu-flash: $(BUILD)/$(MERGED_FNAME).zip dfu-flash: $(BUILD)/$(MERGED_FILE).zip
@:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyACM0) @:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyACM0)
$(NRFUTIL) --verbose dfu serial --package $< -p $(SERIAL) -b 115200 --singlebank --touch 1200 $(NRFUTIL) --verbose dfu serial --package $< -p $(SERIAL) -b 115200 --singlebank --touch 1200
@ -334,11 +336,11 @@ erase:
@echo Erasing chip @echo Erasing chip
$(NRFJPROG) --eraseall -f nrf52 $(NRFJPROG) --eraseall -f nrf52
gdbflash: $(BUILD)/$(MERGED_FNAME).hex gdbflash: $(BUILD)/$(MERGED_FILE).hex
@echo Flashing: $< @echo Flashing: $<
@$(GDB_BMP) -nx --batch -ex 'load $<' -ex 'compare-sections' -ex 'kill' @$(GDB_BMP) -nx --batch -ex 'load $<' -ex 'compare-sections' -ex 'kill'
gdb: $(BUILD)/$(OUTPUT_FILENAME)-nosd.out gdb: $(BUILD)/$(OUT_FILE)-nosd.out
$(GDB_BMP) $< $(GDB_BMP) $<
#******************* Compile rules ******************* #******************* Compile rules *******************
@ -361,11 +363,11 @@ $(BUILD)/%.o: %.S
$(QUIET)$(CC) $(ASMFLAGS) $(INC_PATHS) -c -o $@ $< $(QUIET)$(CC) $(ASMFLAGS) $(INC_PATHS) -c -o $@ $<
# Link # Link
$(BUILD)/$(OUTPUT_FILENAME)-nosd.out: $(BUILD) $(OBJECTS) $(BUILD)/$(OUT_FILE)-nosd.out: $(BUILD) $(OBJECTS)
@echo LD $(OUTPUT_FILENAME)-nosd.out @echo LD $(OUT_FILE)-nosd.out
$(QUIET)$(CC) $(LDFLAGS) $(OBJECTS) $(LIBS) -lm -o $@ $(QUIET)$(CC) $(LDFLAGS) $(OBJECTS) $(LIBS) -lm -o $@
size: $(BUILD)/$(OUTPUT_FILENAME)-nosd.out size: $(BUILD)/$(OUT_FILE)-nosd.out
-@echo '' -@echo ''
$(QUIET)$(SIZE) $< $(QUIET)$(SIZE) $<
-@echo '' -@echo ''
@ -375,21 +377,21 @@ size: $(BUILD)/$(OUTPUT_FILENAME)-nosd.out
.phony: genhex genpkg .phony: genhex genpkg
## Create binary .hex file from the .out file ## Create binary .hex file from the .out file
genhex: $(BUILD)/$(OUTPUT_FILENAME)-nosd.hex genhex: $(BUILD)/$(OUT_FILE)-nosd.hex
$(BUILD)/$(OUTPUT_FILENAME)-nosd.hex: $(BUILD)/$(OUTPUT_FILENAME)-nosd.out $(BUILD)/$(OUT_FILE)-nosd.hex: $(BUILD)/$(OUT_FILE)-nosd.out
@echo CR $(OUTPUT_FILENAME)-nosd.hex @echo CR $(OUT_FILE)-nosd.hex
$(QUIET)$(OBJCOPY) -O ihex $< $@ $(QUIET)$(OBJCOPY) -O ihex $< $@
# merge bootloader and sd hex together # merge bootloader and sd hex together
combinehex: $(BUILD)/$(MERGED_FNAME).hex combinehex: $(BUILD)/$(MERGED_FILE).hex
$(BUILD)/$(MERGED_FNAME).hex: $(BUILD)/$(OUTPUT_FILENAME)-nosd.hex $(BUILD)/$(MERGED_FILE).hex: $(BUILD)/$(OUT_FILE)-nosd.hex
@echo CR $(MERGED_FNAME).hex @echo CR $(MERGED_FILE).hex
@mergehex -q -m $< $(SD_HEX) -o $@ @mergehex -q -m $< $(SD_HEX) -o $@
## Create pkg file for bootloader+SD combo to use with DFU ## Create pkg file for bootloader+SD combo to use with DFU
genpkg: $(BUILD)/$(MERGED_FNAME).zip genpkg: $(BUILD)/$(MERGED_FILE).zip
$(BUILD)/$(MERGED_FNAME).zip: $(BUILD)/$(OUTPUT_FILENAME)-nosd.hex $(BUILD)/$(MERGED_FILE).zip: $(BUILD)/$(OUT_FILE)-nosd.hex
@$(NRFUTIL) dfu genpkg --dev-type 0x0052 --dev-revision $(DFU_DEV_REV) --bootloader $< --softdevice $(SD_HEX) $@ @$(NRFUTIL) dfu genpkg --dev-type 0x0052 --dev-revision $(DFU_DEV_REV) --bootloader $< --softdevice $(SD_HEX) $@