Skip to content

Commit cd796f8

Browse files
pfalconpfalcon
committed
unix: Unbreak "minimal" target by disabling FatFs.
Was broken since introduction of FatFs support.
1 parent d402bf2 commit cd796f8

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

‎unix/Makefile‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,15 @@ endif
162162
LIB_SRC_C = $(addprefix lib/,\
163163
$(LIB_SRC_C_EXTRA) \
164164
utils/printf.c \
165+
timeutils/timeutils.c \
166+
)
167+
168+
ifeq ($(MICROPY_FATFS),1)
169+
LIB_SRC_C += $(addprefix lib/,\
165170
fatfs/ff.c \
166171
fatfs/option/ccsbcs.c \
167-
timeutils/timeutils.c \
168172
)
173+
endif
169174

170175
OBJ = $(PY_O)
171176
OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
@@ -235,7 +240,7 @@ fast:
235240

236241
# build a minimal interpreter
237242
minimal:
238-
$(MAKE) COPT="-Os -DNDEBUG" CFLAGS_EXTRA='-DMP_CONFIGFILE="<mpconfigport_minimal.h>"' BUILD=build-minimal PROG=micropython_minimal MICROPY_PY_TIME=0 MICROPY_PY_TERMIOS=0 MICROPY_PY_SOCKET=0 MICROPY_PY_FFI=0 MICROPY_USE_READLINE=0
243+
$(MAKE) COPT="-Os -DNDEBUG" CFLAGS_EXTRA='-DMP_CONFIGFILE="<mpconfigport_minimal.h>"' BUILD=build-minimal PROG=micropython_minimal MICROPY_PY_TIME=0 MICROPY_PY_TERMIOS=0 MICROPY_PY_SOCKET=0 MICROPY_PY_FFI=0 MICROPY_USE_READLINE=0 MICROPY_FATFS=0
239244

240245
# build interpreter with nan-boxing as object model
241246
nanbox:

‎unix/mpconfigport.mk‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ MICROPY_FORCE_32BIT = 0
99
# 2 - use GNU readline (causes binary to be licensed under GPL)
1010
MICROPY_USE_READLINE = 1
1111

12+
# Whether to enable FatFs VFS
13+
MICROPY_FATFS = 1
14+
1215
# Subset of CPython time module
1316
MICROPY_PY_TIME = 1
1417

0 commit comments

Comments
 (0)