LFS support for ESP8266, part 1

CL: LFS support for ESP8266, part 1

Author: rojer

platforms/cc3200/Makefile.build

@@ -77,6 +77,7 @@ FS_ERASE_SIZE ?= 4096
 FS_META_SIZE = 64
 FS_IMAGE_SIZE = $(shell echo $$(($(FS_SIZE) + $(FS_META_SIZE))))
 MKSPIFFS ?= /usr/local/bin/mkspiffs
+MGOS_ROOT_FS_TYPE = SPIFFS
 
 # With safe code update, new code image is written to a different file on update
 # making it possible to safely revert the update.

platforms/cc3220/Makefile.build

@@ -47,6 +47,7 @@ SDK_PATH ?=
 MGOS_CC3220_PATH ?= $(MGOS_PATH)/platforms/cc3220
 MGOS_CC32XX_PATH ?= $(MGOS_PATH)/platforms/cc32xx
 MKSPIFFS ?= /usr/local/bin/mkspiffs8
+MGOS_ROOT_FS_TYPE = SPIFFS
 
 # Binary images must be signed. By default, we sign with dummy "playground" keys from the SDK.
 SIG_CERT ?= $(SDK_PATH)/tools/cc32xx_tools/certificate-playground/dummy-root-ca-cert

platforms/esp32/Makefile.build

@@ -41,15 +41,6 @@ MGOS_DEBUG_UART ?= 0
 MGOS_ROOT_DEVTAB ?=
 MGOS_ROOT_FS_TYPE ?= SPIFFS
 MGOS_ROOT_FS_SIZE ?= 262144
-ifeq "$(MGOS_ROOT_FS_TYPE)" "SPIFFS"
- MKFS ?= /usr/local/bin/mkspiffs8
- MGOS_ROOT_FS_OPTS ?= {"bs": 4096, "ps": 256, "es": 4096}
-else
-ifeq "$(MGOS_ROOT_FS_TYPE)" "LFS"
- MKFS ?= /usr/local/bin/mklfs
- MGOS_ROOT_FS_OPTS ?= {"bs": 4096, "is": 128}
-endif
-endif
 
 export MGOS_ROOT_FS_SIZE
 

platforms/esp8266/Makefile.build

@@ -51,9 +51,6 @@ MGOS_ESP8266_RTOS ?= 0
 MGOS_UPDATE_BOOT_LOADER ?= false
 
 FLASH_SIZE ?= 4194304
-FS_BLOCK_SIZE = 4096
-FS_PAGE_SIZE = 256
-FS_ERASE_SIZE = 4096
 
 RF_CAL_DATA_SIZE = 0x1000
 SYS_PARAMS_SIZE = 0x4000
@@ -166,7 +163,9 @@ MEMORY_FLAGS = -DFS_MAX_OPEN_FILES=5
 
 MGOS_CFLAGS = -DMGOS_APP=\"$(APP)\" \
  -DMGOS_MAX_NUM_UARTS=2 \
- -DC_DISABLE_BUILTIN_SNPRINTF
+ -DC_DISABLE_BUILTIN_SNPRINTF \
+ -DMGOS_ROOT_FS_TYPE='$(MGOS_ROOT_FS_TYPE)' \
+ -DMGOS_ROOT_FS_OPTS='$(MGOS_ROOT_FS_OPTS)'
 
 MGOS_LIB = $(BUILD_DIR)/mongoose-os.a
 MGOS_CONFIG_C = $(GEN_DIR)/mgos_config.c
@@ -253,7 +252,7 @@ BOOT_CONFIG_WRITE_ADDR ?= $(BOOT_CONFIG_ADDR)
 SYS_PARAMS_ADDR = $(shell printf "0x%05x" "$$(($(FLASH_SIZE) - $(SYS_PARAMS_SIZE)))")
 # RF calibration data sector location is configurable, but we also keep it at the end, just above sys params.
 FW_RF_CAL_DATA_ADDR = $(shell printf "0x%05x" "$$(($(FLASH_SIZE) - $(SYS_PARAMS_SIZE) - $(RF_CAL_DATA_SIZE)))")
-MKSPIFFS ?= /usr/local/bin/mkspiffs8
+MGOS_ROOT_FS_TYPE ?= SPIFFS
 
 ifeq ("$(FLASH_SIZE)", "1048576")
 #
@@ -351,7 +350,7 @@ CFLAGS += -DMGOS_ADC_MODE_VDD=$(MGOS_ADC_MODE_VDD)
 FW_PARTS = boot:addr=$(BOOT_LOADER_ADDR),src=$(BOOT_LOADER_BIN),update=$(MGOS_UPDATE_BOOT_LOADER) \
  boot_cfg:addr=$(BOOT_CONFIG_WRITE_ADDR),size=0x1000,fill=0xff \
  fw:addr=$(APP0_ADDR),src=$(APP_BIN) \
- fs:src=$(FS_IMG),type=fs,addr=$(FS0_ADDR),fs_size=$(FS_SIZE),fs_block_size=$(FS_BLOCK_SIZE),fs_page_size=$(FS_PAGE_SIZE),fs_erase_size=$(FS_ERASE_SIZE) \
+ fs:src=$(FS_IMG),type=fs,addr=$(FS0_ADDR),fs_size=$(FS_SIZE) \
  rf_cal_data:addr=$(FW_RF_CAL_DATA_ADDR),size=$(RF_CAL_DATA_SIZE),fill=0xff \
  sys_params:type=sys_params,src=$(SDK_INIT_DATA_PATH)/bin/esp_init_data_default_v08.bin,addr=$(SYS_PARAMS_ADDR) \
  $(APP_EXTRA_FW_PARTS)
@@ -449,8 +448,8 @@ $(MG_BUILD_INFO_C): $(MGOS_OBJS)
 
 # -- Filesystem.
 
-$(FS_IMG): $(APP_FS_DIRS) $(FS_FILES) $(MGOS_CONFIG_C) $(MGOS_RO_VARS_C) $(MKSPIFFS)
-$(call mkspiffs,$(FS_SIZE),$(FS_BLOCK_SIZE),$(FS_PAGE_SIZE),$(FS_ERASE_SIZE))
+$(FS_IMG): $(MKFS) $(APP_FS_DIRS) $(FS_FILES)
+$(call mkfs,$(FS_SIZE),$(MGOS_ROOT_FS_OPTS))
 
 #
 # Auxiliary targets.

platforms/rs14100/Makefile.build

@@ -111,15 +111,6 @@ MGOS_ROOT_DEVTAB ?= qspi0 rsi1x_flash {"cs": 0} | \
  fs0 part {"dev": "qspi0", "offset": $(FLASH_FS0_ADDR), "size": $(MGOS_ROOT_FS_SIZE)}
 MGOS_ROOT_FS_TYPE ?= SPIFFS
 MGOS_ROOT_FS_SIZE ?= 262144
-ifeq "$(MGOS_ROOT_FS_TYPE)" "SPIFFS"
- MKFS ?= /usr/local/bin/mkspiffs8
- MGOS_ROOT_FS_OPTS ?= {"bs": 4096, "ps": 128, "es": 4096}
-else
-ifeq "$(MGOS_ROOT_FS_TYPE)" "LFS"
- MKFS ?= /usr/local/bin/mklfs
- MGOS_ROOT_FS_OPTS ?= {"bs": 4096, "is": 128}
-endif
-endif
 FS_STAGING_DIR = $(BUILD_DIR)/fs
 
 FS_IMG = $(FW_STAGING_DIR)/fs.bin

platforms/stm32/Makefile.build

@@ -121,17 +121,6 @@ MGOS_ROOT_FS_SIZE ?= 0
 MGOS_ROOT_FS_ON_SYS_FLASH ?= 1
 # When FS is not on sys flash, we definitely need to extract.
 MGOS_ROOT_FS_EXTRACT ?= 1-$(MGOS_ROOT_FS_ON_SYS_FLASH)
-# Note: FS options do not correspond to the characteristics of on-board flash,
-# we fake small erases by performing an RMW which is unsafe but works.
-ifeq "$(MGOS_ROOT_FS_TYPE)" "SPIFFS"
- MKFS ?= /usr/local/bin/mkspiffs8
- MGOS_ROOT_FS_OPTS ?= {"bs": 4096, "ps": 128, "es": 4096}
-else
-ifeq "$(MGOS_ROOT_FS_TYPE)" "LFS"
- MKFS ?= /usr/local/bin/mklfs
- MGOS_ROOT_FS_OPTS ?= {"bs": 4096, "is": 128}
-endif
-endif
 FS_STAGING_DIR = $(BUILD_DIR)/fs
 
 FS_IMG = $(FW_STAGING_DIR)/fs.bin

src/mgos_mmap_esp.c

@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+#ifdef CS_MMAP
+
 #include <stdlib.h>
 #include <sys/mman.h>
 #include <unistd.h>
@@ -32,8 +34,6 @@
 #error only esp32 and esp8266 are supported
 #endif
 
-#ifdef CS_MMAP
-
 /*
  * Reads unaligned byte, handles mmapped addresses properly.
  *

src/mgos_mmap_esp_internal.h

@@ -10,9 +10,10 @@
 
 #include "common/platform.h"
 
+#ifdef CS_MMAP
+
 #include "spiffs.h"
 
-#ifdef CS_MMAP
 #if CS_PLATFORM == CS_P_ESP32 || CS_PLATFORM == CS_P_ESP8266
 
 /*

tools/mk/mgos_mkfs.mk

@@ -5,6 +5,16 @@ ifneq "$(APP_FS_FILES)" ""
  FS_FILES += $(foreach m,$(APP_FS_FILES),$(wildcard $(m)))
 endif
 
+ifeq "$(MGOS_ROOT_FS_TYPE)" "SPIFFS"
+ MKFS ?= /usr/local/bin/mkspiffs8
+ MGOS_ROOT_FS_OPTS ?= $(MGOS_ROOT_FS_OPTS_SPIFFS)
+else
+ifeq "$(MGOS_ROOT_FS_TYPE)" "LFS"
+ MKFS ?= /usr/local/bin/mklfs
+ MGOS_ROOT_FS_OPTS ?= $(MGOS_ROOT_FS_OPTS_LFS)
+endif
+endif
+
 # Args: fs_size, block_size, page_size, erase_size.
 define mkspiffs
 $(Q) rm -rf $(FS_STAGING_DIR) && mkdir -p $(FS_STAGING_DIR) $(dir $@)