8000 ports/ameba: Enable VfsFat filesystem. · ambiot/micropython@673c3d1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 673c3d1

Browse files
pi-anlpi-anl
committed
ports/ameba: Enable VfsFat filesystem.
1 parent 80fbd2a commit 673c3d1

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

‎ports/ameba/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ include ../../py/mkenv.mk
44
# declare before py.mk
55
FROZEN_MANIFEST ?= manifest.py
66

7-
MICROPY_VFS_FAT ?= 0 # need to strip fatfs libs out of lib_micropython.a first
7+
MICROPY_VFS_FAT ?= 1
88
MICROPY_VFS_LFS2 ?= 1
99

1010
include $(TOP)/py/py.mk

‎ports/ameba/amebad.mk

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ INC += -I$(TOP)/shared/timeutils
8484
INC += -I$(TOP)/shared/readline
8585
INC += -I$(TOP)/shared/netutils
8686
INC += -I$(TOP)/shared/runtime
87-
#INC += -I$(TOP)/lib/oofatfs
8887
#INC += -I$(TOP)/lib/lwip/src/include/lwip
8988

9089
INC += -Imp_helper
@@ -96,7 +95,7 @@ INC += -Imp_helper/mods/machine
9695
# Micropython Port Source file list
9796
# -------------------------------------------------------------------
9897
UPY_C += pins.c
99-
#UPY_C += mp_helper/diskio.c
98+
UPY_C += mp_helper/diskio.c
10099
# UPY_C += mp_helper/flashbdev.c
101100
UPY_C += mp_helper/exception.c
102101
UPY_C += mp_helper/help.c
@@ -188,7 +187,6 @@ CFLAGS += -Wno-write-strings -Wno-maybe-uninitialized -c -MMD -Wextra
188187
CFLAGS += -Wl,--start-group
189188
CFLAGS += $(INC)
190189
CFLAGS += -Wl,--end-group
191-
# CFLAGS += -DFFCONF_H=\"$(OOFATFS_DIR)/ffconf.h\"
192190
CFLAGS += $(CFLAGS_MOD)
193191

194192

@@ -239,6 +237,9 @@ prerequirement: check_toolchain check_postbuildtools submodules
239237
$(Q)cp -f $(POSTBUILDTOOL_PATH)/$(PICK) $(BUILD)/$(BUILDTOOL_PATH)/$(PICK)
240238
$(Q)cp -f $(POSTBUILDTOOL_PATH)/$(PAD) $(BUILD)/$(BUILDTOOL_PATH)/$(PAD)
241239

240+
$(Q)echo "Delete diskio from the static micropython library."
241+
ar dv $(TOP)/lib/ameba_sdk/MicroPython_RTL8722/ports/rtl8722/amebad_vendor/ARCHIVE_LIB/lib_micropython.a diskio.o 2> /dev/null
242+
242243

243244
.PHONY: check_toolchain
244245
check_toolchain:

‎ports/ameba/mpconfigport.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
#define MICROPY_READER_VFS (MICROPY_VFS)
105105
#define MICROPY_READER_FATFS (MICROPY_VFS_FAT)
106106
#define MICROPY_FATFS_ENABLE_LFN (1)
107-
#define MICROPY_FATFS_LFN_CODE_PAGE (437) /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
107+
#define MICROPY_FATFS_LFN_CODE_PAGE 437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
108108
#define MICROPY_FATFS_VOLUMES (1)
109109
#define MICROPY_FATFS_RPATH (2)
110110
#define MICROPY_FATFS_MAX_SS (512)

0 commit comments

Comments
 (0)
0