Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
0a248cdf
Commit
0a248cdf
authored
Aug 15, 2018
by
Gregor Hartmann
Committed by
Marcel Stör
Aug 15, 2018
Browse files
Fix output filename of LFS image built in tools (#2459)
parent
3fd4b404
Changes
1
Hide whitespace changes
Inline
Side-by-side
tools/Makefile
View file @
0a248cdf
...
...
@@ -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
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment