Skip to content

Commit

Permalink
tools: remove usb host from mbed 2 scripts
Browse files Browse the repository at this point in the history
usb host has dependency on rtos1 that is no longer in the
code base.
  • Loading branch information
0xc0170 authored and c1728p9 committed May 12, 2017
1 parent 8c4258c commit 2977d0c
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 45 deletions.
10 changes: 0 additions & 10 deletions tools/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,6 @@
default=False,
help="Compile the rpc library")

parser.add_argument("-U", "--usb_host",
action="store_true",
dest="usb_host",
default=False,
help="Compile the USB Host library")

parser.add_argument("-u", "--usb",
action="store_true",
dest="usb",
Expand Down Expand Up @@ -163,14 +157,10 @@
libraries = []

# Additional Libraries
if options.rtos:
libraries.extend(["rtx", "rtos"])
if options.rpc:
libraries.extend(["rpc"])
if options.usb:
libraries.append("usb")
if options.usb_host:
libraries.append("usb_host")
if options.dsp:
libraries.extend(["dsp"])
if options.cpputest_lib:
Expand Down
2 changes: 1 addition & 1 deletion tools/build_travis.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

################################################################################
# Configure builds here
# "libs" can contain "dsp", "usb_host", "usb"
# "libs" can contain "dsp", "usb"

build_list = (
{ "target": "LPC1768", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] },
Expand Down
12 changes: 2 additions & 10 deletions tools/libraries.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
limitations under the License.
"""
from tools.paths import MBED_LIBRARIES,\
MBED_RPC, RPC_LIBRARY, USB, USB_LIBRARIES, USB_HOST,\
USB_HOST_LIBRARIES, DSP_ABSTRACTION, DSP_CMSIS, DSP_LIBRARIES,\
MBED_RPC, RPC_LIBRARY, USB, USB_LIBRARIES, \
DSP_ABSTRACTION, DSP_CMSIS, DSP_LIBRARIES,\
CPPUTEST_SRC,\
CPPUTEST_PLATFORM_SRC, CPPUTEST_TESTRUNNER_SCR, CPPUTEST_LIBRARY,\
CPPUTEST_INC, CPPUTEST_PLATFORM_INC, CPPUTEST_TESTRUNNER_INC,\
Expand All @@ -42,14 +42,6 @@
"dependencies": [MBED_LIBRARIES],
},

# USB Host libraries
{
"id": "usb_host",
"source_dir": USB_HOST,
"build_dir": USB_HOST_LIBRARIES,
"dependencies": [MBED_LIBRARIES, MBED_RTX, RTOS_LIBRARIES],
},

# DSP libraries
{
"id": "dsp",
Expand Down
11 changes: 2 additions & 9 deletions tools/make.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
from tools.paths import BUILD_DIR
from tools.paths import MBED_LIBRARIES
from tools.paths import RPC_LIBRARY
from tools.paths import USB_HOST_LIBRARIES, USB_LIBRARIES
from tools.paths import USB_LIBRARIES
from tools.paths import DSP_LIBRARIES
from tools.tests import TESTS, Test, TEST_MAP
from tools.tests import TEST_MBED_LIB
Expand Down Expand Up @@ -132,17 +132,11 @@
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 usb_host, usb, dsp
# without the usb, dsp
parser.add_argument("--rpc",
action="store_true", dest="rpc",
default=False, help="Link with RPC library")

parser.add_argument("--usb_host",
action="store_true",
dest="usb_host",
default=False,
help="Link with USB Host library")

parser.add_argument("--usb",
action="store_true",
dest="usb",
Expand Down Expand Up @@ -254,7 +248,6 @@

# Linking with extra libraries
if options.rpc: test.dependencies.append(RPC_LIBRARY)
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.testlib: test.dependencies.append(TEST_MBED_LIB)
Expand Down
4 changes: 0 additions & 4 deletions tools/paths.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@
USB = join(LIB_DIR, "USBDevice")
USB_LIBRARIES = join(BUILD_DIR, "usb")

# USB Host
USB_HOST = join(LIB_DIR, "USBHost")
USB_HOST_LIBRARIES = join(BUILD_DIR, "usb_host")

# Export
EXPORT_DIR = join(BUILD_DIR, "export")
EXPORT_WORKSPACE = join(EXPORT_DIR, "workspace")
Expand Down
12 changes: 1 addition & 11 deletions tools/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -682,17 +682,7 @@
"source_dir": join(TEST_DIR, "usb", "device", "audio_cb"),
"dependencies": [MBED_LIBRARIES, USB_LIBRARIES],
},
# USB host test list
{
"id": "USB_10", "description": "MSD",
"source_dir": join(TEST_DIR, "usb", "host", "mass_storage"),
"dependencies": [MBED_LIBRARIES, USB_HOST_LIBRARIES, RTOS],
},
{
"id": "USB_11", "description": "mouse",
"source_dir": join(TEST_DIR, "usb", "host", "mouse"),
"dependencies": [MBED_LIBRARIES, USB_HOST_LIBRARIES, RTOS],
},

# CMSIS DSP
{
"id": "CMSIS_DSP_1", "description": "FIR",
Expand Down

0 comments on commit 2977d0c

Please sign in to comment.