aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Ruben Bakke <glennbakke@gmail.com>2018-06-19 19:06:15 +0200
committerDamien George <damien.p.george@gmail.com>2018-07-18 17:12:26 +1000
commit14d257c66bdbb7af6f085eacda9b3a01b6fd3115 (patch)
tree3027c1e06ac4b9694251433e7e8e8450a0d18578
parent50ee908896e44c537dfa86be693e9b78d615f24f (diff)
nrf: Add explicit make flag for oofatfs
Adding MICROPY_FATFS as makefile flag in order to explicitly include oofatfs files to be compiled into the build. The flag is set to 0 by default. Must be set in addition to MICROPY_VFS and MICROPY_VFS_FAT in mpconfigport.h.
-rw-r--r--ports/nrf/Makefile12
-rw-r--r--ports/nrf/README.md7
2 files changed, 16 insertions, 3 deletions
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index e331c95ad..3705409bc 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -41,7 +41,7 @@ QSTR_DEFS = qstrdefsport.h $(BUILD)/pins_qstr.h
# include py core make definitions
include ../../py/py.mk
-
+MICROPY_FATFS ?= 0
FATFS_DIR = lib/oofatfs
MPY_CROSS = ../../mpy-cross/mpy-cross
MPY_TOOL = ../../tools/mpy-tool.py
@@ -158,10 +158,16 @@ SRC_LIB += $(addprefix lib/,\
utils/pyexec.c \
utils/interrupt_char.c \
timeutils/timeutils.c \
- oofatfs/ff.c \
- oofatfs/option/unicode.c \
)
+ifeq ($(MICROPY_FATFS), 1)
+SRC_LIB += $(addprefix lib/,\
+ oofatfs/ff.c \
+ oofatfs/option/unicode.c \
+ )
+endif
+
+
SRC_NRFX += $(addprefix lib/nrfx/drivers/src/,\
prs/nrfx_prs.c \
nrfx_uart.c \
diff --git a/ports/nrf/README.md b/ports/nrf/README.md
index b797f3eb7..1e7536d1e 100644
--- a/ports/nrf/README.md
+++ b/ports/nrf/README.md
@@ -86,6 +86,13 @@ To use frozen modules, put them in a directory (e.g. `freeze/`) and supply
make BOARD=pca10040 FROZEN_MPY_DIR=freeze
+## Enable MICROPY_FATFS
+As the `oofatfs` module is not having header guards that can exclude the implementation compile time, this port provides a flag to enable it explicitly. The MICROPY_FATFS is by default set to 0 and has to be set to 1 if `oofatfs` files should be compiled. This will be in addition of setting `MICROPY_VFS` and `MICROPY_VFS_FAT` in mpconfigport.h.
+
+For example:
+
+ make BOARD=pca10040 MICROPY_FATFS=1
+
## Target Boards and Make Flags
Target Board (BOARD) | Bluetooth Stack (SD) | Bluetooth Support | Flash Util