FIRMWARE_OUTPUTS readability

This commit is contained in:
rusefillc 2024-03-31 20:56:24 -04:00 committed by rusefillc
parent edcd61a5dc
commit 10e6d995b2
1 changed files with 5 additions and 5 deletions

View File

@ -79,10 +79,10 @@ ifeq ($(USE_OPENBLT),yes)
BOOTLOADER_BIN_OUT = $(FOLDER)/openblt.bin
SREC_TARGET = $(FOLDER)/rusefi_update.srec
else
OUTS = $(FOLDER)/$(PROJECT).hex
FIRMWARE_OUTPUTS = $(FOLDER)/$(PROJECT).hex
BINSRC = $(BUILDDIR)/$(PROJECT).bin
ifeq ($(INCLUDE_ELF),yes)
OUTS += $(FOLDER)/$(PROJECT).elf $(FOLDER)/$(PROJECT).map $(FOLDER)/$(PROJECT).list
FIRMWARE_OUTPUTS += $(FOLDER)/$(PROJECT).elf $(FOLDER)/$(PROJECT).map $(FOLDER)/$(PROJECT).list
endif
endif
@ -99,7 +99,7 @@ MOST_COMMON_BUNDLE_FILES = \
$(UPDATE_CONSOLE_FOLDER_TARGETS)
UPDATE_BUNDLE_FILES = \
$(OUTS) \
$(FIRMWARE_OUTPUTS) \
$(BOOTLOADER_BIN_OUT) \
$(FIRMWARE_BIN_OUT) \
$(SREC_TARGET) \
@ -137,7 +137,7 @@ $(BUILDDIR)/$(PROJECT).map: $(BUILDDIR)/$(PROJECT).elf
$(SREC_TARGET): $(BUILDDIR)/rusefi.srec
ln -rfs $< $@
$(OUTS): $(FOLDER)/%: $(BUILDDIR)/% | $(FOLDER)
$(FIRMWARE_OUTPUTS): $(FOLDER)/%: $(BUILDDIR)/% | $(FOLDER)
ln -rfs $< $@
$(BOOTLOADER_BIN_OUT): $(FOLDER)/openblt%: bootloader/blbuild/openblt_$(PROJECT_BOARD)% | $(FOLDER)
@ -182,7 +182,7 @@ $(ARTIFACTS)/$(BUNDLE_FULL_NAME).zip: $(BUNDLE_FILES) | $(ARTIFACTS)
zip -r $@ $(BUNDLE_FILES)
$(ARTIFACTS)/$(BUNDLE_FULL_NAME)_obfuscated_public.zip: $(OBFUSCATED_OUT) $(BUNDLE_FILES) | $(ARTIFACTS)
zip -r $@ $(filter-out $(OUTS) $(BOOTLOADER_BIN_OUT) $(FIRMWARE_BIN_OUT) $(SREC_TARGET),$(BUNDLE_FILES)) $(OBFUSCATED_SREC)
zip -r $@ $(filter-out $(FIRMWARE_OUTPUTS) $(BOOTLOADER_BIN_OUT) $(FIRMWARE_BIN_OUT) $(SREC_TARGET),$(BUNDLE_FILES)) $(OBFUSCATED_SREC)
# The autopdate zip doesn't have a folder with the bundle contents
$(ARTIFACTS)/$(BUNDLE_FULL_NAME)_autoupdate.zip: $(UPDATE_BUNDLE_FILES) | $(ARTIFACTS)