djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unix: Unbreak "minimal" target by disabling FatFs.

Browse Source 
Was broken since introduction of FatFs support.
This commit is contained in:
Paul Sokolovsky 2016-06-16 00:03:24 +03:00
parent d402bf299d
commit cd796f85af
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
unix/Makefile
View File

@ -162,11 +162,16 @@ endif
LIB_SRC_C = $(addprefix lib/,\ LIB_SRC_C = $(addprefix lib/,\
$(LIB_SRC_C_EXTRA) \ $(LIB_SRC_C_EXTRA) \
utils/printf.c \ utils/printf.c \
fatfs/ff.c \
fatfs/option/ccsbcs.c \
timeutils/timeutils.c \ timeutils/timeutils.c \
) )
ifeq ($(MICROPY_FATFS),1)
LIB_SRC_C += $(addprefix lib/,\
fatfs/ff.c \
fatfs/option/ccsbcs.c \
)
endif
OBJ = $(PY_O) OBJ = $(PY_O)
OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o)) OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o)) OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
@ -235,7 +240,7 @@ fast:
# build a minimal interpreter # build a minimal interpreter
minimal: minimal:
$(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 $(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
# build interpreter with nan-boxing as object model # build interpreter with nan-boxing as object model
nanbox: nanbox:

3
unix/mpconfigport.mk
View File

@ -9,6 +9,9 @@ MICROPY_FORCE_32BIT = 0
# 2 - use GNU readline (causes binary to be licensed under GPL) # 2 - use GNU readline (causes binary to be licensed under GPL)
MICROPY_USE_READLINE = 1 MICROPY_USE_READLINE = 1
# Whether to enable FatFs VFS
MICROPY_FATFS = 1
# Subset of CPython time module # Subset of CPython time module
MICROPY_PY_TIME = 1 MICROPY_PY_TIME = 1