ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

STORAGE: PR 3762 fix to remove FAT_FS, SD_FS, FS_LIBRARY from tools scripts.

pull/3762/head
Simon Hughes 2017-02-22 16:10:25 +00:00
parent e43f667174
commit 5a977eff30
3 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/build.py
View File

@ -92,12 +92,6 @@ if __name__ == '__main__':
default=False, default=False,
help="Compile the DSP library") 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", parser.add_argument("-b", "--ublox",
action="store_true", action="store_true",
dest="ublox", dest="ublox",
@ -199,8 +193,6 @@ if __name__ == '__main__':
libraries.append("usb_host") libraries.append("usb_host")
if options.dsp: if options.dsp:
libraries.extend(["dsp"]) libraries.extend(["dsp"])
if options.fat:
libraries.extend(["fat"])
if options.ublox: if options.ublox:
libraries.extend(["rtx", "rtos", "usb_host", "ublox"]) libraries.extend(["rtx", "rtos", "usb_host", "ublox"])
if options.cpputest_lib: if options.cpputest_lib:

4
tools/build_travis.py
View File

@ -24,7 +24,7 @@ import sys
################################################################################ ################################################################################
# Configure builds here # 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 = ( build_list = (
{ "target": "LPC1768", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "eth", "usb"] }, { "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 = [ linking_list = [
{"target": "LPC1768", {"target": "LPC1768",

10
tools/make.py
View File

@ -37,7 +37,6 @@ from tools.paths import RPC_LIBRARY
from tools.paths import ETH_LIBRARY from tools.paths import ETH_LIBRARY
from tools.paths import USB_HOST_LIBRARIES, USB_LIBRARIES from tools.paths import USB_HOST_LIBRARIES, USB_LIBRARIES
from tools.paths import DSP_LIBRARIES from tools.paths import DSP_LIBRARIES
from tools.paths import FS_LIBRARY
from tools.paths import UBLOX_LIBRARY from tools.paths import UBLOX_LIBRARY
from tools.tests import TESTS, Test, TEST_MAP from tools.tests import TESTS, Test, TEST_MAP
from tools.tests import TEST_MBED_LIB from tools.tests import TEST_MBED_LIB
@ -130,7 +129,7 @@ if __name__ == '__main__':
default=False, help="List available tests in order and exit") default=False, help="List available tests in order and exit")
# Ideally, all the tests with a single "main" thread can be run with, or # 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", parser.add_argument("--rtos",
action="store_true", dest="rtos", action="store_true", dest="rtos",
default=False, help="Link with RTOS library") default=False, help="Link with RTOS library")
@ -162,12 +161,6 @@ if __name__ == '__main__':
default=False, default=False,
help="Link with DSP library") 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", parser.add_argument("--ublox",
action="store_true", action="store_true",
dest="ublox", dest="ublox",
@ -263,7 +256,6 @@ if __name__ == '__main__':
if options.usb_host: test.dependencies.append(USB_HOST_LIBRARIES) if options.usb_host: test.dependencies.append(USB_HOST_LIBRARIES)
if options.usb: test.dependencies.append(USB_LIBRARIES) if options.usb: test.dependencies.append(USB_LIBRARIES)
if options.dsp: test.dependencies.append(DSP_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.ublox: test.dependencies.append(UBLOX_LIBRARY)
if options.testlib: test.dependencies.append(TEST_MBED_LIB) if options.testlib: test.dependencies.append(TEST_MBED_LIB)