Correction for flashing via "make flash"

Author: geza-pycom

esp32/application.mk

@@ -685,8 +685,8 @@ ESPTOOLPY_ERASE_FLASH  = $(ESPTOOLPY_SERIAL) erase_flash
 
 ESP_UPDATER_PY_WRITE_FLASH  = $(ESP_UPDATER_PY_SERIAL) flash
 ESP_UPDATER_PY_ERASE_FLASH  = $(ESP_UPDATER_PY_SERIAL) erase_all
-ESP_UPDATER_ALL_FLASH_ARGS = -t $(BUILD_DIR)/$(BOARD_L)-$(SW_VERSION).tar.gz --sff_enable $(SMALL_FACTORY_FW_ENABLED)
-ESP_UPDATER_ALL_FLASH_ARGS_ENC = -t $(BUILD_DIR)/$(BOARD_L)-$(SW_VERSION)_ENC.tar.gz --secureboot --sff_enable $(SMALL_FACTORY_FW_ENABLED)
+ESP_UPDATER_ALL_FLASH_ARGS = -t $(BUILD_DIR)/$(BOARD_L)-$(SW_VERSION).tar.gz
+ESP_UPDATER_ALL_FLASH_ARGS_ENC = -t $(BUILD_DIR)/$(BOARD_L)-$(SW_VERSION)_ENC.tar.gz --secureboot
 
 ESPSECUREPY = $(PYTHON) $(IDF_PATH)/components/esptool_py/esptool/espsecure.py
 ESPEFUSE = $(PYTHON) $(IDF_PATH)/components/esptool_py/esptool/espefuse.py --port $(ESPPORT)

esp32/tools/fw_updater/updater.py

@@ -146,7 +146,7 @@ class Args(object):
     pass
 
 
-def load_tar(fileobj, prog, secure=False, sff_enable=True):
+def load_tar(fileobj, prog, secure=False):
     script = None
     legacy = False
     try:
@@ -159,15 +159,9 @@ def load_tar(fileobj, prog, secure=False, sff_enable=True):
         if fsize == 0x800000:
             try:
                 if secure:
-                    if sff_enable:
-                        script_file = json.loads(tar.extractfile("script_8MB_small_factory_fw_enc").read().decode('UTF-8'))
-                    else:
-                        script_file = json.loads(tar.extractfile("script_8MB_normal_factory_fw_enc").read().decode('UTF-8'))
+                    script_file = json.loads(tar.extractfile("script_8MB_enc").read().decode('UTF-8'))
                 else:
-                    if sff_enable:
-                        script_file = json.loads(tar.extractfile("script_8MB_small_factory_fw").read().decode('UTF-8'))
-                    else:
-                        script_file = json.loads(tar.extractfile("script_8MB_normal_factory_fw").read().decode('UTF-8'))
+                    script_file = json.loads(tar.extractfile("script_8MB").read().decode('UTF-8'))
             except:
                 print_debug("Error Loading script_8MB ... defaulting to legacy script2!", True)
                 legacy = True
@@ -1025,7 +1019,6 @@ def process_arguments():
     cmd_parser_flash.add_argument('-p', '--partition', default=None, help=help_msg[:-2] + ')')
     # cmd_parser_flash.add_argument('-d', '--directory', default=None, help='directory to look for files when using -s / --script')
     # cmd_parser_flash.add_argument('-s', '--script', default=None, help='script file to execute')
-    cmd_parser_flash.add_argument('-sff', '--sff_enable', default=True, type=str2bool, nargs='?', const=True, help="Select whether Small Factory Firmware mode is supported")
     cmd_parser_copy = subparsers.add_parser('copy', help='Read/Write flash memory partition')
     help_msg = 'The partition to read/write ('
     for partition in PARTITIONS.keys():
@@ -1214,7 +1207,7 @@ def progress_fs(msg):
             if args.tar is not None:
                 try:
                     tar_file = open(args.tar, "rb")
-                    script = load_tar(tar_file, nPy, args.secureboot, args.sff_enable)
+                    script = load_tar(tar_file, nPy, args.secureboot)
                     if not args.quiet:
                         # sys.stdout = old_stdout
                         sys.stderr.flush()

esp32/tools/makepkg.sh

@@ -58,7 +58,7 @@ PKG_TMP_DIR="${BUILD_DIR}/firmware_package"
 mkdir -p ${PKG_TMP_DIR}
 
 PART_FILE_8MB=''
-SCRIPT_FILE_8MB='script_8MB'
+SCRIPT_FILE_8MB=''
 
 if [ $4 -eq 1 ]; then
     BOOT_FILE='bootloader-reflash-digest.bin_enc'
@@ -80,12 +80,14 @@ cp ${BUILD_DIR}/bootloader/${BOOT_FILE} ${PKG_TMP_DIR}
 cp ${BUILD_DIR}/${APP_FILE} ${PKG_TMP_DIR}
 
 if [ $4 -eq 1 ]; then
+    SCRIPT_FILE_8MB='script_8MB_enc'
     if [ $5 -eq 1 ]; then
         PART_FILE_8MB='partitions_8MB_small_factory_fw.bin_enc'
     else
         PART_FILE_8MB='partitions_8MB_normal_factory_fw.bin_enc'
     fi
 else
+    SCRIPT_FILE_8MB='script_8MB'
     if [ $5 -eq 1 ]; then
         PART_FILE_8MB='partitions_8MB_small_factory_fw.bin'
     else