makefile: nvs, fs and flash command support

1.  <make nvs> generate the nvs partition binary file
2.  <make fs> pack the fs folder into fs.bin binary file
3.  <make flash> flash the whole firmware file(nvs + app + fs)

Author: imliubo

m5stack/Makefile

@@ -4,6 +4,7 @@
 
 # Select the board to build for, defaulting to GENERIC.
 BOARD ?= m5stack
+CHIP ?= esp32
 
 # If the build directory is not given, make it reflect the board name.
 BUILD ?= build-$(BOARD)
@@ -17,7 +18,7 @@ PYTHON ?= python3
 
 GIT_SUBMODULES = lib/berkeley-db-1.xx
 
-.PHONY: all clean deploy erase mpy-cross submodules FORCE
+.PHONY: all clean deploy erase mpy-cross submodules fs nvs FORCE
 
 MAKEFILE_DIR:=$(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
@@ -35,14 +36,18 @@ ifdef FROZEN_MANIFEST
        IDFPY_FLAGS += -D MICROPY_FROZEN_MANIFEST=$(FROZEN_MANIFEST)
 endif
 
-all:
+GIT_VERSION := $(shell git describe --abbrev=7 --dirty --always --tags)
+
+all: fs nvs
 	idf.py $(IDFPY_FLAGS) build
 	@$(PYTHON) makeimg.py \
 		$(BUILD)/sdkconfig \
 		$(BUILD)/bootloader/bootloader.bin \
 		$(BUILD)/partition_table/partition-table.bin \
-    		$(BUILD)/micropython.bin \
-    		$(BUILD)/firmware.bin
+		$(BUILD)/nvs.bin \
+		$(BUILD)/micropython.bin \
+		$(BUILD)/fs.bin \
+		$(BUILD)/uiflow-$(GIT_VERSION).bin
 
 $(BUILD)/bootloader/bootloader.bin $(BUILD)/partition_table/partition-table.bin $(BUILD)/micropython.bin: FORCE
 
@@ -58,6 +63,18 @@ monitor:
 erase:
 	idf.py $(IDFPY_FLAGS) -p $(PORT) -b $(BAUD) erase_flash
 
+flash: all
+	esptool.py --chip $(CHIP) --port $(PORT) --baud $(BAUD) \
+	write_flash 0x1000 $(BUILD)/uiflow-$(GIT_VERSION).bin
+
+fs:
+	./../tools/littlefs/prebuilt/linux/littlefs2 -c -v -i ./fs \
+	-o $(BUILD)/fs.bin -s 0x14e000 # defined in partitions.csv
+
+nvs:
+	python ./../tools/nvs_partition_gen.py generate partition_nvs.csv \
+	$(BUILD)/nvs.bin 0x6000 # defined in partitions.csv
+
 mpy-cross:
 	make -C ../micropython/mpy-cross
 
@@ -66,4 +83,4 @@ mpy-cross:
 # berkeley-db-1.xx submodule belong to micropython submodule
 submodules:
 	git submodule update --init ../micropython
-	cd ./../micropython	&& git submodule update --init $(addprefix ./,$(GIT_SUBMODULES)) && cd -
+	cd ./../micropython && git submodule update --init $(addprefix ./,$(GIT_SUBMODULES)) && cd -	

m5stack/makeimg.py

@@ -28,8 +28,10 @@ def load_partition_table(filename):
 arg_sdkconfig = sys.argv[1]
 arg_bootloader_bin = sys.argv[2]
 arg_partitions_bin = sys.argv[3]
-arg_application_bin = sys.argv[4]
-arg_output_bin = sys.argv[5]
+arg_nvs_bin = sys.argv[4]
+arg_application_bin = sys.argv[5]
+arg_filesystem_bin = sys.argv[6]
+arg_output_bin = sys.argv[7]
 
 # Load required sdkconfig values.
 offset_bootloader = load_sdkconfig_hex_value(
@@ -44,22 +46,34 @@ def load_partition_table(filename):
 
 max_size_bootloader = offset_partitions - offset_bootloader
 max_size_partitions = 0
+offset_nvs = 0
+max_size_nvs = 0
 offset_application = 0
 max_size_application = 0
+offset_filesystem = 0
+max_size_filesystem = 0
 
 # Inspect the partition table to find offsets and maximum sizes.
 for part in partition_table:
     if part.name == "nvs":
         max_size_partitions = part.offset - offset_partitions
+        offset_nvs = part.offset
+        max_size_nvs = part.size
     elif part.type == gen_esp32part.APP_TYPE and offset_application == 0:
         offset_application = part.offset
         max_size_application = part.size
+    elif part.type == gen_esp32part.DATA_TYPE and part.name == "vfs":
+        offset_filesystem = part.offset
+        max_size_filesystem = part.size
+
 
 # Define the input files, their location and maximum size.
 files_in = [
     ("bootloader", offset_bootloader, max_size_bootloader, arg_bootloader_bin),
     ("partitions", offset_partitions, max_size_partitions, arg_partitions_bin),
+    ("nvs", offset_nvs, max_size_nvs, arg_nvs_bin),
     ("application", offset_application, max_size_application, arg_application_bin),
+    ("filesystem", offset_filesystem, max_size_filesystem, arg_filesystem_bin),
 ]
 file_out = arg_output_bin