Skip to content

Commit 2977d0c

Browse files
0xc0170c1728p9
authored andcommitted
tools: remove usb host from mbed 2 scripts
usb host has dependency on rtos1 that is no longer in the code base.
1 parent 8c4258c commit 2977d0c

File tree

6 files changed

+6
-45
lines changed

6 files changed

+6
-45
lines changed

tools/build.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,6 @@
6868
default=False,
6969
help="Compile the rpc library")
7070

71-
parser.add_argument("-U", "--usb_host",
72-
action="store_true",
73-
dest="usb_host",
74-
default=False,
75-
help="Compile the USB Host library")
76-
7771
parser.add_argument("-u", "--usb",
7872
action="store_true",
7973
dest="usb",
@@ -163,14 +157,10 @@
163157
libraries = []
164158

165159
# Additional Libraries
166-
if options.rtos:
167-
libraries.extend(["rtx", "rtos"])
168160
if options.rpc:
169161
libraries.extend(["rpc"])
170162
if options.usb:
171163
libraries.append("usb")
172-
if options.usb_host:
173-
libraries.append("usb_host")
174164
if options.dsp:
175165
libraries.extend(["dsp"])
176166
if options.cpputest_lib:

tools/build_travis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
################################################################################
2626
# Configure builds here
27-
# "libs" can contain "dsp", "usb_host", "usb"
27+
# "libs" can contain "dsp", "usb"
2828

2929
build_list = (
3030
{ "target": "LPC1768", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] },

tools/libraries.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
limitations under the License.
1616
"""
1717
from tools.paths import MBED_LIBRARIES,\
18-
MBED_RPC, RPC_LIBRARY, USB, USB_LIBRARIES, USB_HOST,\
19-
USB_HOST_LIBRARIES, DSP_ABSTRACTION, DSP_CMSIS, DSP_LIBRARIES,\
18+
MBED_RPC, RPC_LIBRARY, USB, USB_LIBRARIES, \
19+
DSP_ABSTRACTION, DSP_CMSIS, DSP_LIBRARIES,\
2020
CPPUTEST_SRC,\
2121
CPPUTEST_PLATFORM_SRC, CPPUTEST_TESTRUNNER_SCR, CPPUTEST_LIBRARY,\
2222
CPPUTEST_INC, CPPUTEST_PLATFORM_INC, CPPUTEST_TESTRUNNER_INC,\
@@ -42,14 +42,6 @@
4242
"dependencies": [MBED_LIBRARIES],
4343
},
4444

45-
# USB Host libraries
46-
{
47-
"id": "usb_host",
48-
"source_dir": USB_HOST,
49-
"build_dir": USB_HOST_LIBRARIES,
50-
"dependencies": [MBED_LIBRARIES, MBED_RTX, RTOS_LIBRARIES],
51-
},
52-
5345
# DSP libraries
5446
{
5547
"id": "dsp",

tools/make.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
from tools.paths import BUILD_DIR
3535
from tools.paths import MBED_LIBRARIES
3636
from tools.paths import RPC_LIBRARY
37-
from tools.paths import USB_HOST_LIBRARIES, USB_LIBRARIES
37+
from tools.paths import USB_LIBRARIES
3838
from tools.paths import DSP_LIBRARIES
3939
from tools.tests import TESTS, Test, TEST_MAP
4040
from tools.tests import TEST_MBED_LIB
@@ -132,17 +132,11 @@
132132
default=False, help="List available tests in order and exit")
133133

134134
# Ideally, all the tests with a single "main" thread can be run with, or
135-
# without the usb_host, usb, dsp
135+
# without the usb, dsp
136136
parser.add_argument("--rpc",
137137
action="store_true", dest="rpc",
138138
default=False, help="Link with RPC library")
139139

140-
parser.add_argument("--usb_host",
141-
action="store_true",
142-
dest="usb_host",
143-
default=False,
144-
help="Link with USB Host library")
145-
146140
parser.add_argument("--usb",
147141
action="store_true",
148142
dest="usb",
@@ -254,7 +248,6 @@
254248

255249
# Linking with extra libraries
256250
if options.rpc: test.dependencies.append(RPC_LIBRARY)
257-
if options.usb_host: test.dependencies.append(USB_HOST_LIBRARIES)
258251
if options.usb: test.dependencies.append(USB_LIBRARIES)
259252
if options.dsp: test.dependencies.append(DSP_LIBRARIES)
260253
if options.testlib: test.dependencies.append(TEST_MBED_LIB)

tools/paths.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,6 @@
6565
USB = join(LIB_DIR, "USBDevice")
6666
USB_LIBRARIES = join(BUILD_DIR, "usb")
6767

68-
# USB Host
69-
USB_HOST = join(LIB_DIR, "USBHost")
70-
USB_HOST_LIBRARIES = join(BUILD_DIR, "usb_host")
71-
7268
# Export
7369
EXPORT_DIR = join(BUILD_DIR, "export")
7470
EXPORT_WORKSPACE = join(EXPORT_DIR, "workspace")

tools/tests.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -682,17 +682,7 @@
682682
"source_dir": join(TEST_DIR, "usb", "device", "audio_cb"),
683683
"dependencies": [MBED_LIBRARIES, USB_LIBRARIES],
684684
},
685-
# USB host test list
686-
{
687-
"id": "USB_10", "description": "MSD",
688-
"source_dir": join(TEST_DIR, "usb", "host", "mass_storage"),
689-
"dependencies": [MBED_LIBRARIES, USB_HOST_LIBRARIES, RTOS],
690-
},
691-
{
692-
"id": "USB_11", "description": "mouse",
693-
"source_dir": join(TEST_DIR, "usb", "host", "mouse"),
694-
"dependencies": [MBED_LIBRARIES, USB_HOST_LIBRARIES, RTOS],
695-
},
685+
696686
# CMSIS DSP
697687
{
698688
"id": "CMSIS_DSP_1", "description": "FIR",

0 commit comments

Comments
 (0)