Skip to content

Commit d4cd403

Browse files
0xc0170c1728p9
0xc0170
authored and
c1728p9
committed
tools: remove net libraries
Remove any reference to net libraries that are unsupported. As we removed net libraries, these are no longer in the codebase.
1 parent 1c2ebf8 commit d4cd403

File tree

6 files changed

+4
-184
lines changed

6 files changed

+4
-184
lines changed

‎tools/build.py

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

71-
parser.add_argument("-e", "--eth",
72-
action="store_true", dest="eth",
73-
default=False,
74-
help="Compile the ethernet library")
75-
7671
parser.add_argument("-U", "--usb_host",
7772
action="store_true",
7873
dest="usb_host",
@@ -91,12 +86,6 @@
9186
default=False,
9287
help="Compile the DSP library")
9388

94-
parser.add_argument("-b", "--ublox",
95-
action="store_true",
96-
dest="ublox",
97-
default=False,
98-
help="Compile the u-blox library")
99-
10089
parser.add_argument( "--cpputest",
10190
action="store_true",
10291
dest="cpputest_lib",
@@ -178,16 +167,12 @@
178167
libraries.extend(["rtx", "rtos"])
179168
if options.rpc:
180169
libraries.extend(["rpc"])
181-
if options.eth:
182-
libraries.append("eth")
183170
if options.usb:
184171
libraries.append("usb")
185172
if options.usb_host:
186173
libraries.append("usb_host")
187174
if options.dsp:
188175
libraries.extend(["dsp"])
189-
if options.ublox:
190-
libraries.extend(["rtx", "rtos", "usb_host", "ublox"])
191176
if options.cpputest_lib:
192177
libraries.extend(["cpputest"])
193178

‎tools/build_travis.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424

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

2929
build_list = (
30-
{ "target": "LPC1768", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "eth", "usb"] },
30+
{ "target": "LPC1768", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] },
3131
{ "target": "LPC2368", "toolchains": "GCC_ARM", "libs": [] },
3232
{ "target": "LPC2460", "toolchains": "GCC_ARM", "libs": ["rtos", "usb"] },
3333
{ "target": "LPC11U24", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] },
@@ -139,7 +139,6 @@
139139
{"target": "LPC1768",
140140
"toolchains": "GCC_ARM",
141141
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_15", "MBED_16", "MBED_17"],
142-
"eth" : ["NET_1", "NET_2", "NET_3", "NET_4"],
143142
"rtos" : ["RTOS_1", "RTOS_2", "RTOS_3"],
144143
"usb" : ["USB_1", "USB_2" ,"USB_3"],
145144
}

‎tools/libraries.py

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
from tools.paths import MBED_RTX, RTOS, RTOS_LIBRARIES, MBED_LIBRARIES,\
1818
MBED_RPC, RPC_LIBRARY, USB, USB_LIBRARIES, USB_HOST,\
1919
USB_HOST_LIBRARIES, DSP_ABSTRACTION, DSP_CMSIS, DSP_LIBRARIES,\
20-
ETH_SOURCES, LWIP_SOURCES, ETH_LIBRARY, UBLOX_SOURCES,\
21-
UBLOX_LIBRARY, CELLULAR_SOURCES, CELLULAR_USB_SOURCES, CPPUTEST_SRC,\
20+
CPPUTEST_SRC,\
2221
CPPUTEST_PLATFORM_SRC, CPPUTEST_TESTRUNNER_SCR, CPPUTEST_LIBRARY,\
2322
CPPUTEST_INC, CPPUTEST_PLATFORM_INC, CPPUTEST_TESTRUNNER_INC,\
2423
CPPUTEST_INC_EXT
@@ -73,22 +72,6 @@
7372
"dependencies": [MBED_LIBRARIES]
7473
},
7574

76-
# Network libraries
77-
{
78-
"id": "eth",
79-
"source_dir": [ETH_SOURCES, LWIP_SOURCES],
80-
"build_dir": ETH_LIBRARY,
81-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES]
82-
},
83-
84-
{
85-
"id": "ublox",
86-
"source_dir": [UBLOX_SOURCES, CELLULAR_SOURCES, CELLULAR_USB_SOURCES,
87-
LWIP_SOURCES],
88-
"build_dir": UBLOX_LIBRARY,
89-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, USB_HOST_LIBRARIES],
90-
},
91-
9275
# Unit Testing library
9376
{
9477
"id": "cpputest",

‎tools/make.py

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,8 @@
3535
from tools.paths import MBED_LIBRARIES
3636
from tools.paths import RTOS_LIBRARIES
3737
from tools.paths import RPC_LIBRARY
38-
from tools.paths import ETH_LIBRARY
3938
from tools.paths import USB_HOST_LIBRARIES, USB_LIBRARIES
4039
from tools.paths import DSP_LIBRARIES
41-
from tools.paths import UBLOX_LIBRARY
4240
from tools.tests import TESTS, Test, TEST_MAP
4341
from tools.tests import TEST_MBED_LIB
4442
from tools.tests import test_known, test_name_known
@@ -135,7 +133,7 @@
135133
default=False, help="List available tests in order and exit")
136134

137135
# Ideally, all the tests with a single "main" thread can be run with, or
138-
# without the rtos, eth, usb_host, usb, dsp, ublox
136+
# without the rtos, usb_host, usb, dsp
139137
parser.add_argument("--rtos",
140138
action="store_true", dest="rtos",
141139
default=False, help="Link with RTOS library")
@@ -144,11 +142,6 @@
144142
action="store_true", dest="rpc",
145143
default=False, help="Link with RPC library")
146144

147-
parser.add_argument("--eth",
148-
action="store_true", dest="eth",
149-
default=False,
150-
help="Link with Ethernet library")
151-
152145
parser.add_argument("--usb_host",
153146
action="store_true",
154147
dest="usb_host",
@@ -167,12 +160,6 @@
167160
default=False,
168161
help="Link with DSP library")
169162

170-
parser.add_argument("--ublox",
171-
action="store_true",
172-
dest="ublox",
173-
default=False,
174-
help="Link with U-Blox library")
175-
176163
parser.add_argument("--testlib",
177164
action="store_true",
178165
dest="testlib",
@@ -273,11 +260,9 @@
273260
# Linking with extra libraries
274261
if options.rtos: test.dependencies.append(RTOS_LIBRARIES)
275262
if options.rpc: test.dependencies.append(RPC_LIBRARY)
276-
if options.eth: test.dependencies.append(ETH_LIBRARY)
277263
if options.usb_host: test.dependencies.append(USB_HOST_LIBRARIES)
278264
if options.usb: test.dependencies.append(USB_LIBRARIES)
279265
if options.dsp: test.dependencies.append(DSP_LIBRARIES)
280-
if options.ublox: test.dependencies.append(UBLOX_LIBRARY)
281266
if options.testlib: test.dependencies.append(TEST_MBED_LIB)
282267

283268
build_dir = join(BUILD_DIR, "test", mcu, toolchain, test.id)

‎tools/paths.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,21 +61,6 @@
6161

6262
RTOS_LIBRARIES = join(BUILD_DIR, "rtos")
6363

64-
# TCP/IP
65-
NET = join(LIB_DIR, "net")
66-
67-
ETH_SOURCES = join(NET, "eth")
68-
LWIP_SOURCES = join(NET, "lwip")
69-
VODAFONE_SOURCES = join(NET, "VodafoneUSBModem")
70-
CELLULAR_SOURCES = join(NET, "cellular", "CellularModem")
71-
CELLULAR_USB_SOURCES = join(NET, "cellular", "CellularUSBModem")
72-
UBLOX_SOURCES = join(NET, "cellular", "UbloxUSBModem")
73-
74-
NET_LIBRARIES = join(BUILD_DIR, "net")
75-
ETH_LIBRARY = join(NET_LIBRARIES, "eth")
76-
VODAFONE_LIBRARY = join(NET_LIBRARIES, "VodafoneUSBModem")
77-
UBLOX_LIBRARY = join(NET_LIBRARIES, "UbloxUSBModem")
78-
7964
# DSP
8065
DSP = join(LIB_DIR, "dsp")
8166
DSP_CMSIS = join(DSP, "cmsis_dsp")

‎tools/tests.py

Lines changed: 0 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -815,122 +815,6 @@
815815
"NRF51822", "NRF51_DK", "SEEED_TINY_BLE", "ARM_BEETLE_SOC", "NUCLEO_F767ZI", "DISCO_F769NI"],
816816
},
817817

818-
# Networking Tests
819-
{
820-
"id": "NET_1", "description": "TCP client hello world",
821-
"source_dir": join(TEST_DIR, "net", "helloworld", "tcpclient"),
822-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY, TEST_MBED_LIB],
823-
"automated": True,
824-
"peripherals": ["ethernet"],
825-
},
826-
{
827-
"id": "NET_2", "description": "NIST Internet Time Service",
828-
"source_dir": join(TEST_DIR, "net", "helloworld", "udpclient"),
829-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY, TEST_MBED_LIB],
830-
"automated": True,
831-
"peripherals": ["ethernet"],
832-
},
833-
{
834-
"id": "NET_3", "description": "TCP echo server",
835-
"source_dir": join(TEST_DIR, "net", "echo", "tcp_server"),
836-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY, TEST_MBED_LIB],
837-
"automated": True,
838-
#"host_test" : "tcpecho_server_auto",
839-
"peripherals": ["ethernet"],
840-
},
841-
{
842-
"id": "NET_4", "description": "TCP echo client",
843-
"source_dir": join(TEST_DIR, "net", "echo", "tcp_client"),
844-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY, TEST_MBED_LIB],
845-
"automated": True,
846-
#"host_test": "tcpecho_client_auto",
847-
"peripherals": ["ethernet"]
848-
},
849-
{
850-
"id": "NET_5", "description": "UDP echo server",
851-
"source_dir": join(TEST_DIR, "net", "echo", "udp_server"),
852-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY, TEST_MBED_LIB],
853-
"automated": True,
854-
#"host_test" : "udpecho_server_auto",
855-
"peripherals": ["ethernet"]
856-
},
857-
{
858-
"id": "NET_6", "description": "UDP echo client",
859-
"source_dir": join(TEST_DIR, "net", "echo", "udp_client"),
860-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY, TEST_MBED_LIB],
861-
"automated": True,
862-
#"host_test" : "udpecho_client_auto",
863-
"peripherals": ["ethernet"],
864-
},
865-
{
866-
"id": "NET_7", "description": "HTTP client hello world",
867-
"source_dir": join(TEST_DIR, "net", "protocols", "HTTPClient_HelloWorld"),
868-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY, TEST_MBED_LIB],
869-
"automated": True,
870-
"peripherals": ["ethernet"],
871-
},
872-
{
873-
"id": "NET_8", "description": "NTP client",
874-
"source_dir": join(TEST_DIR, "net", "protocols", "NTPClient_HelloWorld"),
875-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY, TEST_MBED_LIB],
876-
"automated": True,
877-
"peripherals": ["ethernet"],
878-
},
879-
{
880-
"id": "NET_9", "description": "Multicast Send",
881-
"source_dir": join(TEST_DIR, "net", "helloworld", "multicast_send"),
882-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY],
883-
"peripherals": ["ethernet"],
884-
},
885-
{
886-
"id": "NET_10", "description": "Multicast Receive",
887-
"source_dir": join(TEST_DIR, "net", "helloworld", "multicast_receive"),
888-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY],
889-
"peripherals": ["ethernet"],
890-
},
891-
{
892-
"id": "NET_11", "description": "Broadcast Send",
893-
"source_dir": join(TEST_DIR, "net", "helloworld", "broadcast_send"),
894-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY],
895-
"peripherals": ["ethernet"],
896-
},
897-
{
898-
"id": "NET_12", "description": "Broadcast Receive",
899-
"source_dir": join(TEST_DIR, "net", "helloworld", "broadcast_receive"),
900-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY],
901-
"peripherals": ["ethernet"],
902-
},
903-
{
904-
"id": "NET_13", "description": "TCP client echo loop",
905-
"source_dir": join(TEST_DIR, "net", "echo", "tcp_client_loop"),
906-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY, TEST_MBED_LIB],
907-
"automated": True,
908-
#"host_test": "tcpecho_client_auto",
909-
"peripherals": ["ethernet"],
910-
},
911-
{
912-
"id": "NET_14", "description": "UDP PHY/Data link layer",
913-
"source_dir": join(TEST_DIR, "net", "echo", "udp_link_layer"),
914-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, ETH_LIBRARY],
915-
"automated": False,
916-
"host_test": "udp_link_layer_auto",
917-
"peripherals": ["ethernet"],
918-
},
919-
920-
# u-blox tests
921-
{
922-
"id": "UB_1", "description": "u-blox USB modem: HTTP client",
923-
"source_dir": [join(TEST_DIR, "net", "cellular", "http", "ubloxusb"), join(TEST_DIR, "net", "cellular", "http", "common")],
924-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, USB_HOST_LIBRARIES, UBLOX_LIBRARY],
925-
"supported": CORTEX_ARM_SUPPORT,
926-
},
927-
{
928-
"id": "UB_2", "description": "u-blox USB modem: SMS test",
929-
"source_dir": [join(TEST_DIR, "net", "cellular", "sms", "ubloxusb"), join(TEST_DIR, "net", "cellular", "sms", "common")],
930-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, USB_HOST_LIBRARIES, UBLOX_LIBRARY],
931-
"supported": CORTEX_ARM_SUPPORT,
932-
},
933-
934818
# USB Tests
935819
# USB device test list
936820
{
@@ -1123,7 +1007,6 @@
11231007
"spi": ["MBED_A12"],
11241008
}
11251009
GROUPS["rtos"] = [test["id"] for test in TESTS if test["id"].startswith("RTOS_")]
1126-
GROUPS["net"] = [test["id"] for test in TESTS if test["id"].startswith("NET_")]
11271010
GROUPS["automated"] = [test["id"] for test in TESTS if test.get("automated", False)]
11281011
# Look for 'TEST_GROUPS' in mbed_settings.py and update the GROUPS dictionary
11291012
# with the information in test_groups if found

0 commit comments

Comments
 (0)