UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[build] Fixed bootloader build system

Browse Source
This commit is contained in:
M4x1m3
2022-02-28 20:47:49 +01:00
parent 9fda743de9
commit fc3941511f
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -12,10 +12,14 @@ include build/toolchain.$(TOOLCHAIN).mak
include build/variants.mak include build/variants.mak
include build/helpers.mk include build/helpers.mk
ifeq (${MODEL},$(filter ${MODEL},n0110 bootloader)) ifeq (${MODEL},n0110)
apps_list = ${EPSILON_APPS} apps_list = ${EPSILON_APPS}
else else
apps_list = $(foreach i, ${EPSILON_APPS}, $(if $(filter external, $(i)),,$(i))) ifeq (${MODEL},n0110)
apps_list = ${EPSILON_APPS}
else
apps_list = $(foreach i, ${EPSILON_APPS}, $(if $(filter external, $(i)),,$(i)))
endif
endif endif
ifdef FORCE_EXTERNAL ifdef FORCE_EXTERNAL

8
build/targets.device.bootloader.mak
View File

@@ -21,6 +21,11 @@ $(BUILD_DIR)/epsilon.B.$(EXE): $(call flavored_object_for,$(epsilon_src))
$(BUILD_DIR)/epsilon.B.$(EXE): LDSCRIPT = ion/src/device/bootloader/bootloader.B.ld $(BUILD_DIR)/epsilon.B.$(EXE): LDSCRIPT = ion/src/device/bootloader/bootloader.B.ld
$(BUILD_DIR)/epsilon.bin: $(BUILD_DIR)/epsilon.A.bin $(BUILD_DIR)/epsilon.B.bin $(BUILD_DIR)/epsilon.bin: $(BUILD_DIR)/epsilon.A.bin $(BUILD_DIR)/epsilon.B.bin
@echo "COMBINE $@"
$(Q) cat $(BUILD_DIR)/epsilon.A.bin >> $(BUILD_DIR)/epsilon.bin
$(Q) truncate -s 4MiB $(BUILD_DIR)/epsilon.bin
$(Q) cat $(BUILD_DIR)/epsilon.B.bin >> $(BUILD_DIR)/epsilon.bin
$(Q) truncate -s 8MiB $(BUILD_DIR)/epsilon.bin
$(foreach flavor,$(epsilon_flavors),$(eval $(call rule_for_epsilon_flavor_bootloader,$(flavor)))) $(foreach flavor,$(epsilon_flavors),$(eval $(call rule_for_epsilon_flavor_bootloader,$(flavor))))
@@ -28,6 +33,9 @@ $(foreach flavor,$(epsilon_flavors),$(eval $(call rule_for_epsilon_flavor_bootlo
HANDY_TARGETS = $(foreach flavor,$(epsilon_flavors_bootloader),epsilon.$(flavor)) HANDY_TARGETS = $(foreach flavor,$(epsilon_flavors_bootloader),epsilon.$(flavor))
HANDY_TARGETS += epsilon.A epsilon.B HANDY_TARGETS += epsilon.A epsilon.B
.PHONY: epsilon
epsilon: $(BUILD_DIR)/epsilon.onboarding.bin
.DEFAULT_GOAL := epsilon
.PHONY: %_flash .PHONY: %_flash
%_flash: $(BUILD_DIR)/%.dfu %_flash: $(BUILD_DIR)/%.dfu