Skip to content

Commit 9d7a5a0

Browse files
committed
Minor changes to make it work with latest esp-idf
1 parent 23a093c commit 9d7a5a0

File tree

4 files changed

+11
-747
lines changed

4 files changed

+11
-747
lines changed

components/spiffs/spiffs_vfs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,7 @@ void vfs_spiffs_register() {
833833
}
834834

835835
esp_vfs_t vfs = {
836-
.fd_offset = 0,
836+
//.fd_offset = 0, // not available in latest esp-idf
837837
.flags = ESP_VFS_FLAG_DEFAULT,
838838
.write = &vfs_spiffs_write,
839839
.open = &vfs_spiffs_open,

components/spiffs_image/Makefile.projbuild

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ flashfs: $(SDKCONFIG_MAKEFILE) mkspiffs
1313
@echo "Making spiffs image ..."
1414
@echo "$(ESPTOOLPY_WRITE_FLASH)"
1515
$(MKSPIFFS_COMPONENT_PATH)/../mkspiffs/src/$(MKSPIFFS_BIN) -c $(SPIFFS_IMAGE_COMPONENT_PATH)/image -b $(CONFIG_SPIFFS_LOG_BLOCK_SIZE) -p $(CONFIG_SPIFFS_LOG_PAGE_SIZE) -s $(CONFIG_SPIFFS_SIZE) $(BUILD_DIR_BASE)/spiffs_image.img
16-
$(ESPTOOLPY_WRITE_FLASH) 0x$(CONFIG_SPIFFS_BASE_ADDR) $(BUILD_DIR_BASE)/spiffs_image.img
16+
$(ESPTOOLPY_WRITE_FLASH) $(CONFIG_SPIFFS_BASE_ADDR) $(BUILD_DIR_BASE)/spiffs_image.img
1717

1818
makefs: $(SDKCONFIG_MAKEFILE) mkspiffs
1919
@echo "Making spiffs image ..."
@@ -23,4 +23,4 @@ makefs: $(SDKCONFIG_MAKEFILE) mkspiffs
2323
copyfs:
2424
@echo "Flashing spiffs image ..."
2525
@echo "$(ESPTOOLPY_WRITE_FLASH)"
26-
$(ESPTOOLPY_WRITE_FLASH) 0x$(CONFIG_SPIFFS_BASE_ADDR) $(SPIFFS_IMAGE_COMPONENT_PATH)/spiffs_image.img
26+
$(ESPTOOLPY_WRITE_FLASH) $(CONFIG_SPIFFS_BASE_ADDR) $(SPIFFS_IMAGE_COMPONENT_PATH)/spiffs_image.img

0 commit comments

Comments
 (0)