diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2016-06-16 00:03:24 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2016-06-16 00:03:24 +0300 |
| commit | cd796f85aff18013d8024b034055f58044649d91 (patch) | |
| tree | 97889c2837ad09447c702f89cd2ed83f3f1946f5 | |
| parent | d402bf299d8ac2974df0c3015377196de8721cad (diff) | |
| download | micropython-cd796f85aff18013d8024b034055f58044649d91.tar.gz micropython-cd796f85aff18013d8024b034055f58044649d91.zip | |
unix: Unbreak "minimal" target by disabling FatFs.
Was broken since introduction of FatFs support.
| -rw-r--r-- | unix/Makefile | 9 | ||||
| -rw-r--r-- | unix/mpconfigport.mk | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/unix/Makefile b/unix/Makefile index 90653e88e8..96a8df21b6 100644 --- a/unix/Makefile +++ b/unix/Makefile @@ -162,10 +162,15 @@ endif LIB_SRC_C = $(addprefix lib/,\ $(LIB_SRC_C_EXTRA) \ utils/printf.c \ + timeutils/timeutils.c \ + ) + +ifeq ($(MICROPY_FATFS),1) +LIB_SRC_C += $(addprefix lib/,\ fatfs/ff.c \ fatfs/option/ccsbcs.c \ - timeutils/timeutils.c \ ) +endif OBJ = $(PY_O) OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o)) @@ -235,7 +240,7 @@ fast: # build a minimal interpreter 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 nanbox: diff --git a/unix/mpconfigport.mk b/unix/mpconfigport.mk index 88bd749a71..ba0341f20e 100644 --- a/unix/mpconfigport.mk +++ b/unix/mpconfigport.mk @@ -9,6 +9,9 @@ MICROPY_FORCE_32BIT = 0 # 2 - use GNU readline (causes binary to be licensed under GPL) MICROPY_USE_READLINE = 1 +# Whether to enable FatFs VFS +MICROPY_FATFS = 1 + # Subset of CPython time module MICROPY_PY_TIME = 1 |