Merge pull request #10607 from dhalbert/cardputer-keyboard-fix

Fix cardputer boot loop, and do some cleanup

Author: tannewt

lib/littlefs/lfs1.c

@@ -2141,7 +2141,7 @@ int lfs1_format(lfs1_t *lfs1, const struct lfs1_config *cfg) {
             .d.elen = sizeof(superblock.d) - sizeof(superblock.d.magic) - 4,
             .d.nlen = sizeof(superblock.d.magic),
             .d.version = LFS1_DISK_VERSION,
-            .d.magic = {"littlefs"},
+            .d.magic = {'l', 'i', 't', 't', 'l', 'e', 'f', 's'},
             .d.block_size  = lfs1->cfg->block_size,
             .d.block_count = lfs1->cfg->block_count,
             .d.root = {lfs1->root[0], lfs1->root[1]},

main.c

@@ -1179,10 +1179,6 @@ void gc_collect(void) {
     gc_collect_end();
 }
 
-// Ports may provide an implementation of this function if it is needed
-MP_WEAK void port_gc_collect(void) {
-}
-
 size_t gc_get_max_new_split(void) {
     return port_heap_get_largest_free_size();
 }

ports/espressif/boards/m5stack_cardputer/mpconfigboard.mk

@@ -13,4 +13,4 @@ CIRCUITPY_ESP_FLASH_SIZE = 8MB
 CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_MAX3421E = 0
 
-SRC_C += boards/$(BOARD)/cardputer_keyboard.c
+SRC_C += module/cardputer_keyboard.c