From 2fbb24c5f886ca5a2308523e4f97f7d86a67c2b6 Mon Sep 17 00:00:00 2001 From: Gregor Date: Tue, 14 Aug 2018 15:02:06 +0200 Subject: [PATCH] fix output filename of LFS image built in tools + fix spiffs image creation --- tools/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 8a784ce3f9..38c23e1372 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -73,16 +73,16 @@ spiffsimg/spiffsimg: spiffsscript: remove-image LFSimage spiffsimg/spiffsimg rm -f ./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), if [ -r ../bin/spiffs-$(sz).dat ]; then echo Built $$(cat ../bin/spiffs-$(sz).dat)-$(sz).bin; fi; ) ifneq ($(LFSSOURCES),) LFSimage: $(LFSSOURCES) - $(LUAC_CROSS) -f -o $(FSSOURCE)flash.img $(LFSSOURCES) + $(LUAC_CROSS) -f -o $(FSSOURCE)/LFS.img $(LFSSOURCES) else LFSimage: - rm -f $(FSSOURCE)flash.img + rm -f $(FSSOURCE)/LFS.img endif remove-image: