From 799b6d1e0c5bfb2392b7978f549ab2c7d2e0cc29 Mon Sep 17 00:00:00 2001
From: Damien George
Date: Thu, 7 Nov 2019 18:27:51 +1100
Subject: extmod: Consolidate FAT FS config to MICROPY_VFS_FAT across all
 ports.

This commit removes the Makefile-level MICROPY_FATFS config and moves the
MICROPY_VFS_FAT config to the Makefile level to replace it.  It also moves
the include of the oofatfs source files in the build from each port to a
central place in extmod/extmod.mk.

For a port to enabled VFS FAT support it should now set MICROPY_VFS_FAT=1
at the level of the Makefile.  This will include the relevant oofatfs files
in the build and set MICROPY_VFS_FAT=1 at the C (preprocessor) level.
---
 extmod/extmod.mk | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'extmod')

diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index e714b6028..69d8cfad3 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -1,7 +1,20 @@
 # This makefile fragment provides rules to build 3rd-party components for extmod modules
 
+################################################################################
+# VFS FAT FS
+
+OOFATFS_DIR = lib/oofatfs
+
 # this sets the config file for FatFs
-CFLAGS_MOD += -DFFCONF_H=\"lib/oofatfs/ffconf.h\"
+CFLAGS_MOD += -DFFCONF_H=\"$(OOFATFS_DIR)/ffconf.h\"
+
+ifeq ($(MICROPY_VFS_FAT),1)
+CFLAGS_MOD += -DMICROPY_VFS_FAT=1
+SRC_MOD += $(addprefix $(OOFATFS_DIR)/,\
+	ff.c \
+	ffunicode.c \
+	)
+endif
 
 ################################################################################
 # VFS littlefs
-- 
cgit v1.2.3