Skip to content

Commit

Permalink
rename esp32:upload-fs -> upload-spiffs
Browse files Browse the repository at this point in the history
  • Loading branch information
jscrane committed Aug 1, 2023
1 parent 044a585 commit 44b127b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion build-targets.mk
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,6 @@ bootloader:
version:
@echo "$(name) $(notdir $(runtime.platform.path))"

.PHONY: clean all path term version build-summary prebuild build-variables upload program erase bootloader
.PHONY: clean all path term version build-summary prebuild build-variables upload program erase bootloader $(PREBUILD_HOOKS) $(PRELINK_HOOKS)

-include $(DEPS)
2 changes: 1 addition & 1 deletion docs/esp.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ other variables:

targets:
- ota
- upload-fs: builds and uploads spiffs image
- upload-spiffs: builds and uploads spiffs image

### examples

Expand Down
6 changes: 3 additions & 3 deletions esp32.mk
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ SPIFFS_BLOCKSIZE := 4096
$(SPIFFS_IMAGE): $(wildcard $(SPIFFS_DIR)/*)
$(runtime.tools.mkspiffs.path)/$(runtime.tools.mkspiffs.cmd) -c $(FS_DIR) -b $(SPIFFS_BLOCKSIZE) -p $(SPIFFS_PAGESIZE) -s $(SPIFFS_SIZE) $@

upload-fs: cmd = $(tools.$(upload.tool).cmd)
upload-fs: $(SPIFFS_IMAGE)
upload-spiffs: cmd = $(tools.$(upload.tool).cmd)
upload-spiffs: $(SPIFFS_IMAGE)
$(runtime.tools.$(upload.tool).path)/$(cmd) --chip esp32 --port $(serial.port) --before default_reset --after hard_reset write_flash -z --flash_mode $(build.flash_mode) --flash_freq $(build.flash_freq) --flash_size detect $(SPIFFS_START) $(SPIFFS_IMAGE)

.PHONY: upload upload-fs ota
.PHONY: upload upload-spiffs ota
2 changes: 1 addition & 1 deletion esp8266.mk
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ fs: $(LITTLEFS_IMAGE)
upload-fs: $(LITTLEFS_IMAGE)
$(tools.esptool.cmd) $(runtime.platform.path)/tools/upload.py --chip esp8266 --port $(serial.port) --baud $(upload.speed) $(upload.verbose) write_flash $(build.spiffs_start) $<

.PHONY: upload ota spiffs upload-spiffs fs upload-fs
.PHONY: ota spiffs upload-spiffs fs upload-fs

0 comments on commit 44b127b

Please sign in to comment.