samd: Harmonize the flash driver interfaces.

robert-hh · robert-hh · commit e8b4b3a44adf · 2023-01-31T10:15:43.000+01:00
- Move the block device API out of samd_flash.c
- Rename the internal functions and objects to ...samd_mcuflash_....
- Use the internal flash for the file system only if no external flash
  is defined.
- Change _boot.py accordingly.
- Set the respective flag in mpconfigboard.h where needed.

Saves about 300 bytes of code.
diff --git a/ports/samd/Makefile b/ports/samd/Makefile
@@ -100,8 +100,8 @@ SRC_C += \
 	mphalport.c \
 	pendsv.c \
 	pin_af.c \
-	samd_flash.c \
 	samd_isr.c \
+	samd_mcuflash.c \
 	samd_qspiflash.c \
 	samd_soc.c \
 	spiflash.c \
diff --git a/ports/samd/modsamd.c b/ports/samd/modsamd.c
@@ -32,7 +32,7 @@
 #include "pin_af.h"
 #include "samd_soc.h"
 
-extern const mp_obj_type_t samd_flash_type;
+extern const mp_obj_type_t samd_mcuflash_type;
 #ifdef MICROPY_HW_QSPIFLASH
 extern const mp_obj_type_t samd_qspiflash_type;
 #endif
@@ -76,8 +76,10 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(samd_pininfo_obj, samd_pininfo);
 
 STATIC const mp_rom_map_elem_t samd_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_samd) },
-    { MP_ROM_QSTR(MP_QSTR_Flash),    MP_ROM_PTR(&samd_flash_type) },
     { MP_ROM_QSTR(MP_QSTR_pininfo),  MP_ROM_PTR(&samd_pininfo_obj) },
+    #if MICROPY_HW_MCUFLASH
+    { MP_ROM_QSTR(MP_QSTR_MCUflash), MP_ROM_PTR(&samd_mcuflash_type) },
+    #endif
     #ifdef MICROPY_HW_QSPIFLASH
     { MP_ROM_QSTR(MP_QSTR_QSPIflash), MP_ROM_PTR(&samd_qspiflash_type) },
     #endif
diff --git a/ports/samd/modules/_boot.py b/ports/samd/modules/_boot.py
@@ -20,23 +20,25 @@
         progsize = 256
         flashfs = True
         del SPI, Pin, spi
+    elif hasattr(samd, "MCUflash"):
+        bdev = FlashBdev(samd.MCUflash())
+        progsize = 32  # which is the default
+        flashfs = True
 except:
     pass
 
-if not flashfs:
-    bdev = FlashBdev(samd.MCUflash())
-    progsize = 32  # which is the default
 
 # Try to mount the filesystem, and format the flash if it doesn't exist.
-fs_type = uos.VfsLfs2 if hasattr(uos, "VfsLfs2") else uos.VfsLfs1
+if flashfs:
+    fs_type = uos.VfsLfs2 if hasattr(uos, "VfsLfs2") else uos.VfsLfs1
 
-try:
-    vfs = fs_type(bdev, progsize=progsize)
-except:
-    fs_type.mkfs(bdev, progsize=progsize)
-    vfs = fs_type(bdev, progsize=progsize)
-uos.mount(vfs, "/")
-del vfs, fs_type
+    try:
+        vfs = fs_type(bdev, progsize=progsize)
+    except:
+        fs_type.mkfs(bdev, progsize=progsize)
+        vfs = fs_type(bdev, progsize=progsize)
+    uos.mount(vfs, "/")
+    del vfs, fs_type, progsize, bdev, flashfs
 
+del uos, gc, samd, FlashBdev
 gc.collect()
-del uos, gc, samd, progsize, bdev, FlashBdev, flashfs
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
@@ -109,6 +109,11 @@
 
 #define MP_STATE_PORT MP_STATE_VM
 
+// Use internal flash for the file system if external flash is not used for it.
+#if !defined(MICROPY_HW_QSPIFLASH) && !(defined(MICROPY_HW_SPIFLASH) && defined(MICROPY_HW_SPIFLASH_ID))
+#define MICROPY_HW_MCUFLASH                 (1)
+#endif
+
 // Miscellaneous settings
 __attribute__((always_inline)) static inline void enable_irq(uint32_t state) {
     __set_PRIMASK(state);
diff --git a/ports/samd/samd_flash.c b/ports/samd/samd_flash.c
diff --git a/ports/samd/samd_mcuflash.c b/ports/samd/samd_mcuflash.c
