ports/ameba: Enable VfsFat filesystem.

pi-anl · pi-anl · commit 673c3d1857d1 · 2022-04-14T16:16:52.000+10:00
diff --git a/ports/ameba/Makefile b/ports/ameba/Makefile
@@ -4,7 +4,7 @@ include ../../py/mkenv.mk
 # declare before py.mk
 FROZEN_MANIFEST ?= manifest.py
 
-MICROPY_VFS_FAT ?= 0  # need to strip fatfs libs out of lib_micropython.a first 
+MICROPY_VFS_FAT ?= 1
 MICROPY_VFS_LFS2 ?= 1
 
 include $(TOP)/py/py.mk
diff --git a/ports/ameba/amebad.mk b/ports/ameba/amebad.mk
@@ -84,7 +84,6 @@ INC += -I$(TOP)/shared/timeutils
 INC += -I$(TOP)/shared/readline
 INC += -I$(TOP)/shared/netutils
 INC += -I$(TOP)/shared/runtime
-#INC += -I$(TOP)/lib/oofatfs
 #INC += -I$(TOP)/lib/lwip/src/include/lwip
 
 INC += -Imp_helper
@@ -96,7 +95,7 @@ INC += -Imp_helper/mods/machine
 # Micropython Port Source file list
 # -------------------------------------------------------------------
 UPY_C += pins.c
-#UPY_C += mp_helper/diskio.c
+UPY_C += mp_helper/diskio.c
 # UPY_C += mp_helper/flashbdev.c
 UPY_C += mp_helper/exception.c
 UPY_C += mp_helper/help.c
@@ -188,7 +187,6 @@ CFLAGS += -Wno-write-strings -Wno-maybe-uninitialized -c -MMD -Wextra
 CFLAGS += -Wl,--start-group
 CFLAGS += $(INC)
 CFLAGS += -Wl,--end-group
-# CFLAGS += -DFFCONF_H=\"$(OOFATFS_DIR)/ffconf.h\"
 CFLAGS += $(CFLAGS_MOD)
 
 
@@ -239,6 +237,9 @@ prerequirement: check_toolchain check_postbuildtools submodules
 	$(Q)cp -f $(POSTBUILDTOOL_PATH)/$(PICK) $(BUILD)/$(BUILDTOOL_PATH)/$(PICK)
 	$(Q)cp -f $(POSTBUILDTOOL_PATH)/$(PAD) $(BUILD)/$(BUILDTOOL_PATH)/$(PAD)
 
+	$(Q)echo "Delete diskio from the static micropython library."
+	ar dv $(TOP)/lib/ameba_sdk/MicroPython_RTL8722/ports/rtl8722/amebad_vendor/ARCHIVE_LIB/lib_micropython.a diskio.o 2> /dev/null
+
 
 .PHONY: check_toolchain
 check_toolchain:
diff --git a/ports/ameba/mpconfigport.h b/ports/ameba/mpconfigport.h
@@ -104,7 +104,7 @@
 #define MICROPY_READER_VFS                      (MICROPY_VFS)
 #define MICROPY_READER_FATFS                    (MICROPY_VFS_FAT)
 #define MICROPY_FATFS_ENABLE_LFN                (1)
-#define MICROPY_FATFS_LFN_CODE_PAGE             (437) /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
+#define MICROPY_FATFS_LFN_CODE_PAGE             437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
 #define MICROPY_FATFS_VOLUMES                   (1)
 #define MICROPY_FATFS_RPATH                     (2)
 #define MICROPY_FATFS_MAX_SS                    (512)
