unix: Refactor mpconfigvariant.mk.

All variants (except minimal) enable text compression and fat/lfs, so move
them to the common mpconfigport.mk.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
This commit is contained in:
Jim Mussared 2022-08-16 01:56:25 +10:00 committed by Damien George
parent 3e5b1be8ca
commit 51b054dd66
4 changed files with 10 additions and 11 deletions

View File

@ -38,3 +38,9 @@ MICROPY_PY_JNI = 0
# Avoid using system libraries, use copies bundled with MicroPython # Avoid using system libraries, use copies bundled with MicroPython
# as submodules (currently affects only libffi). # as submodules (currently affects only libffi).
MICROPY_STANDALONE = 0 MICROPY_STANDALONE = 0
MICROPY_ROM_TEXT_COMPRESSION = 1
MICROPY_VFS_FAT = 1
MICROPY_VFS_LFS1 = 1
MICROPY_VFS_LFS2 = 1

View File

@ -12,10 +12,5 @@ LDFLAGS += -fprofile-arcs -ftest-coverage
FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py
USER_C_MODULES = $(TOP)/examples/usercmodule USER_C_MODULES = $(TOP)/examples/usercmodule
MICROPY_ROM_TEXT_COMPRESSION = 1
MICROPY_VFS_FAT = 1
MICROPY_VFS_LFS1 = 1
MICROPY_VFS_LFS2 = 1
SRC_C += coverage.c SRC_C += coverage.c
SRC_CXX += coveragecpp.cpp SRC_CXX += coveragecpp.cpp

View File

@ -2,7 +2,6 @@
FROZEN_MANIFEST = FROZEN_MANIFEST =
MICROPY_ROM_TEXT_COMPRESSION = 1
MICROPY_PY_BTREE = 0 MICROPY_PY_BTREE = 0
MICROPY_PY_FFI = 0 MICROPY_PY_FFI = 0
MICROPY_PY_SOCKET = 0 MICROPY_PY_SOCKET = 0
@ -10,3 +9,7 @@ MICROPY_PY_THREAD = 0
MICROPY_PY_TERMIOS = 0 MICROPY_PY_TERMIOS = 0
MICROPY_PY_USSL = 0 MICROPY_PY_USSL = 0
MICROPY_USE_READLINE = 0 MICROPY_USE_READLINE = 0
MICROPY_VFS_FAT = 0
MICROPY_VFS_LFS1 = 0
MICROPY_VFS_LFS2 = 0

View File

@ -1,8 +1,3 @@
# This is the default variant when you `make` the Unix port. # This is the default variant when you `make` the Unix port.
FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py
MICROPY_ROM_TEXT_COMPRESSION = 1
MICROPY_VFS_FAT ?= 1
MICROPY_VFS_LFS1 ?= 1
MICROPY_VFS_LFS2 ?= 1