From 2977d0c387ce0390ceca078de1c6ba067fa7e7cd Mon Sep 17 00:00:00 2001
From: Martin Kojtal <0xc0170@gmail.com>
Date: Thu, 4 May 2017 14:59:49 +0100
Subject: [PATCH] tools: remove usb host from mbed 2 scripts

usb host has dependency on rtos1 that is no longer in the
code base.
---
 tools/build.py        | 10 ----------
 tools/build_travis.py |  2 +-
 tools/libraries.py    | 12 ++----------
 tools/make.py         | 11 ++---------
 tools/paths.py        |  4 ----
 tools/tests.py        | 12 +-----------
 6 files changed, 6 insertions(+), 45 deletions(-)

diff --git a/tools/build.py b/tools/build.py
index 51574ed5412..52c034ca132 100644
--- a/tools/build.py
+++ b/tools/build.py
@@ -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",
@@ -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:
diff --git a/tools/build_travis.py b/tools/build_travis.py
index 01663577e13..68a67c48655 100644
--- a/tools/build_travis.py
+++ b/tools/build_travis.py
@@ -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"] },
diff --git a/tools/libraries.py b/tools/libraries.py
index bf1e2997f1d..abd5b852cd2 100644
--- a/tools/libraries.py
+++ b/tools/libraries.py
@@ -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,\
@@ -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",
diff --git a/tools/make.py b/tools/make.py
index 1806158c678..6cc2827e0be 100644
--- a/tools/make.py
+++ b/tools/make.py
@@ -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
@@ -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",
@@ -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)
diff --git a/tools/paths.py b/tools/paths.py
index 17cc82d571d..c8e745b00b6 100644
--- a/tools/paths.py
+++ b/tools/paths.py
@@ -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")
diff --git a/tools/tests.py b/tools/tests.py
index 94c923bfd55..6a1acd1385e 100644
--- a/tools/tests.py
+++ b/tools/tests.py
@@ -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",