MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix output filename of LFS image built in tools (#2459)

This commit is contained in:
Gregor Hartmann 2018-08-15 10:48:23 +02:00 committed by Marcel Stör
parent 3fd4b4047f
commit 0a248cdfd7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/Makefile
View File

@ -73,16 +73,16 @@ spiffsimg/spiffsimg:
spiffsscript: remove-image LFSimage spiffsimg/spiffsimg spiffsscript: remove-image LFSimage spiffsimg/spiffsimg
rm -f ./spiffsimg/spiffs.lst rm -f ./spiffsimg/spiffs.lst
@echo "" >> ./spiffsimg/spiffs.lst @echo "" >> ./spiffsimg/spiffs.lst
@$(foreach f, $(SPIFFSFILES), echo "import $(FSSOURCE)$(f) $(f)" >> ./spiffsimg/spiffs.lst ;) @$(foreach f, $(SPIFFSFILES), echo "import $(FSSOURCE)/$(f) $(f)" >> ./spiffsimg/spiffs.lst ;)
$(foreach sz, $(FLASHSIZE), spiffsimg/spiffsimg -f ../bin/0x%x-$(sz).img $(FLASH_SW) $(sz) -U $(FLASH_FS_LOC) -r ./spiffsimg/spiffs.lst -d; ) $(foreach sz, $(FLASHSIZE), spiffsimg/spiffsimg -f ../bin/0x%x-$(sz).img $(FLASH_SW) $(sz) -U $(FLASH_FS_LOC) -r ./spiffsimg/spiffs.lst -d; )
@$(foreach sz, $(FLASHSIZE), if [ -r ../bin/spiffs-$(sz).dat ]; then echo Built $$(cat ../bin/spiffs-$(sz).dat)-$(sz).bin; fi; ) @$(foreach sz, $(FLASHSIZE), if [ -r ../bin/spiffs-$(sz).dat ]; then echo Built $$(cat ../bin/spiffs-$(sz).dat)-$(sz).bin; fi; )
ifneq ($(LFSSOURCES),) ifneq ($(LFSSOURCES),)
LFSimage: $(LFSSOURCES) LFSimage: $(LFSSOURCES)
$(LUAC_CROSS) -f -o $(FSSOURCE)flash.img $(LFSSOURCES) $(LUAC_CROSS) -f -o $(FSSOURCE)/LFS.img $(LFSSOURCES)
else else
LFSimage: LFSimage:
rm -f $(FSSOURCE)flash.img rm -f $(FSSOURCE)/LFS.img
endif endif
remove-image: remove-image: