Merge pull request #3581 from non-bin/master

Update FatFS to R0.16

1 files changed, 15 insertions, 0 deletions

diff --git a/tools/get_deps.py b/tools/get_deps.py
index 25b85ac3b..23f015c0d 100755
--- a/tools/get_deps.py
+++ b/tools/get_deps.py
@@ -8,6 +8,9 @@ from multiprocessing import Pool
 # Mandatory Dependencies that is always fetched
 # path, url, commit, family (Alphabet sorted by path)
 deps_mandatory = {
+    'lib/fatfs': ['https://github.com/abbrev/fatfs.git',
+                  '30ca13c62615df0d2e9104ab41256985b96590c1',
+                  'all'],
     'lib/FreeRTOS-Kernel': ['https://github.com/FreeRTOS/FreeRTOS-Kernel.git',
                             'cc0e0707c0c748713485b870bb980852b210877f',
                             'all'],
@@ -284,6 +287,11 @@ deps_optional = {
                          'lpc55'],
 }
 
+# Files to remove after cloning to avoid conflicts with TinyUSB's custom versions
+deps_remove_files = {
+    'lib/fatfs': ['source/ffconf.h'],
+}
+
 # combined 2 deps
 deps_all = {**deps_mandatory, **deps_optional}
 
@@ -329,6 +337,13 @@ def get_a_dep(d):
         run_cmd(f"{git_cmd} fetch --depth 1 origin {commit}")
         run_cmd(f"{git_cmd} checkout FETCH_HEAD")
 
+    # Remove files that conflict with TinyUSB's custom versions
+    if d in deps_remove_files:
+        for f in deps_remove_files[d]:
+            fp = p / f
+            if fp.exists():
+                fp.unlink()
+
     return 0