mirror of https://github.com/ARMmbed/mbed-os.git
				
				
				
			tools: remove usb host from mbed 2 scripts
usb host has dependency on rtos1 that is no longer in the code base.pull/4313/head
							parent
							
								
									8c4258ceb5
								
							
						
					
					
						commit
						2977d0c387
					
				| 
						 | 
				
			
			@ -68,12 +68,6 @@ if __name__ == '__main__':
 | 
			
		|||
                      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 @@ if __name__ == '__main__':
 | 
			
		|||
    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:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -24,7 +24,7 @@ import sys
 | 
			
		|||
 | 
			
		||||
################################################################################
 | 
			
		||||
# 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"] },
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -15,8 +15,8 @@ See the License for the specific language governing permissions and
 | 
			
		|||
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 @@ LIBRARIES = [
 | 
			
		|||
        "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",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -34,7 +34,7 @@ from tools.utils import NotSupportedException
 | 
			
		|||
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 @@ 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 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 @@ if __name__ == '__main__':
 | 
			
		|||
 | 
			
		||||
        # 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)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -65,10 +65,6 @@ DSP_LIBRARIES = join(BUILD_DIR, "dsp")
 | 
			
		|||
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")
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -682,17 +682,7 @@ TESTS = [
 | 
			
		|||
        "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",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue