From 5a977eff301bfc588a5ae27e202e6cea6e866714 Mon Sep 17 00:00:00 2001 From: Simon Hughes Date: Wed, 22 Feb 2017 16:10:25 +0000 Subject: [PATCH] STORAGE: PR 3762 fix to remove FAT_FS, SD_FS, FS_LIBRARY from tools scripts. --- tools/build.py | 8 -------- tools/build_travis.py | 4 ++-- tools/make.py | 10 +--------- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/tools/build.py b/tools/build.py index 68c2d08962..e05120293f 100644 --- a/tools/build.py +++ b/tools/build.py @@ -92,12 +92,6 @@ if __name__ == '__main__': default=False, help="Compile the DSP library") - parser.add_argument("-F", "--fat", - action="store_true", - dest="fat", - default=False, - help="Compile FS and SD card file system library") - parser.add_argument("-b", "--ublox", action="store_true", dest="ublox", @@ -199,8 +193,6 @@ if __name__ == '__main__': libraries.append("usb_host") if options.dsp: libraries.extend(["dsp"]) - if options.fat: - libraries.extend(["fat"]) if options.ublox: libraries.extend(["rtx", "rtos", "usb_host", "ublox"]) if options.cpputest_lib: diff --git a/tools/build_travis.py b/tools/build_travis.py index 994615b616..d40404d9af 100644 --- a/tools/build_travis.py +++ b/tools/build_travis.py @@ -24,7 +24,7 @@ import sys ################################################################################ # Configure builds here -# "libs" can contain "dsp", "rtos", "eth", "usb_host", "usb", "ublox", "fat" +# "libs" can contain "dsp", "rtos", "eth", "usb_host", "usb", "ublox" build_list = ( { "target": "LPC1768", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "eth", "usb"] }, @@ -133,7 +133,7 @@ build_list = ( ) ################################################################################ -# Configure example test building (linking against external mbed SDK libraries liek fat or rtos) +# Configure example test building (linking against external mbed SDK libraries like rtos) linking_list = [ {"target": "LPC1768", diff --git a/tools/make.py b/tools/make.py index 0f84ebc32f..e4a6d5fca0 100644 --- a/tools/make.py +++ b/tools/make.py @@ -37,7 +37,6 @@ from tools.paths import RPC_LIBRARY from tools.paths import ETH_LIBRARY from tools.paths import USB_HOST_LIBRARIES, USB_LIBRARIES from tools.paths import DSP_LIBRARIES -from tools.paths import FS_LIBRARY from tools.paths import UBLOX_LIBRARY from tools.tests import TESTS, Test, TEST_MAP from tools.tests import TEST_MBED_LIB @@ -130,7 +129,7 @@ if __name__ == '__main__': default=False, help="List available tests in order and exit") # Ideally, all the tests with a single "main" thread can be run with, or - # without the rtos, eth, usb_host, usb, dsp, fat, ublox + # without the rtos, eth, usb_host, usb, dsp, ublox parser.add_argument("--rtos", action="store_true", dest="rtos", default=False, help="Link with RTOS library") @@ -162,12 +161,6 @@ if __name__ == '__main__': default=False, help="Link with DSP library") - parser.add_argument("--fat", - action="store_true", - dest="fat", - default=False, - help="Link with FS ad SD card file system library") - parser.add_argument("--ublox", action="store_true", dest="ublox", @@ -263,7 +256,6 @@ if __name__ == '__main__': if options.usb_host: test.dependencies.append(USB_HOST_LIBRARIES) if options.usb: test.dependencies.append(USB_LIBRARIES) if options.dsp: test.dependencies.append(DSP_LIBRARIES) - if options.fat: test.dependencies.append(FS_LIBRARY) if options.ublox: test.dependencies.append(UBLOX_LIBRARY) if options.testlib: test.dependencies.append(TEST_MBED_LIB)