Skip to content

Commit 7915d17

Browse files
Fix trying to build emac test on baremetal
1 parent 606e650 commit 7915d17

File tree

11 files changed

+51
-14
lines changed

11 files changed

+51
-14
lines changed

connectivity/drivers/emac/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ if(NOT "DEVICE_EMAC=1" IN_LIST MBED_TARGET_DEFINITIONS)
55
return()
66
endif()
77

8+
# EMAC needs the RTOS
9+
if(APPLICATION_PROFILE_CONFIG_BAREMETAL)
10+
return()
11+
endif()
12+
13+
814
add_library(mbed-emac STATIC EXCLUDE_FROM_ALL
915
sources/CompositeEMAC.cpp
1016
sources/GenericEthPhy.cpp

connectivity/lwipstack/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# Copyright (c) 2020 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
# LwIP needs the RTOS
5+
if(APPLICATION_PROFILE_CONFIG_BAREMETAL)
6+
return()
7+
endif()
8+
49
add_library(mbed-lwipstack STATIC EXCLUDE_FROM_ALL)
510

611
target_include_directories(mbed-lwipstack

connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# Copyright (c) 2020 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
# This lib needs the RTOS
5+
if(APPLICATION_PROFILE_CONFIG_BAREMETAL)
6+
return()
7+
endif()
8+
49
add_library(mbed-nanostack-hal_mbed_cmsis_rtos STATIC EXCLUDE_FROM_ALL)
510

611
target_include_directories(mbed-nanostack-hal_mbed_cmsis_rtos

connectivity/netsocket/tests/TESTS/network/emac/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ list(
2020
emac_test_unicast_long.cpp
2121
)
2222

23+
if(APPLICATION_PROFILE_CONFIG_BAREMETAL)
24+
set(TEST_SKIPPED "This test requires an RTOS!")
25+
endif()
26+
2327
mbed_greentea_add_test(
2428
TEST_NAME
2529
mbed-connectivity-network-emac

tools/python/mbed_tools/build/_internal/config/assemble_build_config.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88

99
import logging
1010
from dataclasses import dataclass
11-
from pathlib import Path
12-
from typing import Iterable, List, Optional, Set
11+
from typing import TYPE_CHECKING, Iterable, List, Optional, Set
1312

1413
import pydantic
1514

@@ -18,7 +17,11 @@
1817
from mbed_tools.build._internal.config.schemas import MbedAppJSON
1918
from mbed_tools.build._internal.find_files import LabelFilter, filter_files, find_files
2019
from mbed_tools.lib.json_helpers import decode_json_file
21-
from mbed_tools.project import MbedProgram
20+
21+
if TYPE_CHECKING:
22+
from pathlib import Path
23+
24+
from mbed_tools.project import MbedProgram
2225

2326
logger = logging.getLogger(__name__)
2427

tools/python/mbed_tools/build/_internal/config/schemas.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,9 @@ class TargetJSON(BaseJSONConfig):
487487

488488
supported_c_libs: dict[Literal["gcc_arm"], list[str]] = Field(default_factory=dict)
489489
"""
490-
C libraries that this target supports on each toolchain. This gives the valid values for the "c_lib" setting.
490+
Map of toolchain name to the C libraries that this target supports for it.
491+
492+
This gives the valid values for the "c_lib" setting.
491493
492494
This is an overriding attribute.
493495
"""

tools/python/mbed_tools/build/_internal/config/source.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from __future__ import annotations
88

99
import logging
10-
import pathlib
1110
import typing
1211
from dataclasses import dataclass
1312
from typing import Any, Iterable, List, Literal, Optional, Union
@@ -21,6 +20,9 @@
2120
from . import schemas
2221
from .schemas import ConfigSettingValue
2322

23+
if typing.TYPE_CHECKING:
24+
import pathlib
25+
2426
logger = logging.getLogger(__name__)
2527

2628

tools/python/mbed_tools/build/config.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,26 @@
88

99
import json
1010
import logging
11-
import pathlib
12-
from typing import Tuple
11+
from typing import TYPE_CHECKING, Tuple
1312

1413
import pydantic
1514

1615
from mbed_tools.build._internal.cmake_file import render_mbed_config_cmake_template
1716
from mbed_tools.build._internal.config.assemble_build_config import assemble_config
18-
from mbed_tools.build._internal.config.config import Config
1917
from mbed_tools.build._internal.config.schemas import TargetJSON
2018
from mbed_tools.build._internal.config.source import check_and_transform_config_name
2119
from mbed_tools.build._internal.memory_banks import incorporate_memory_bank_data_from_cmsis, process_memory_banks
2220
from mbed_tools.build._internal.write_files import write_file
2321
from mbed_tools.build.exceptions import MbedBuildError
2422
from mbed_tools.lib.json_helpers import decode_json_file
25-
from mbed_tools.project import MbedProgram
2623
from mbed_tools.targets import get_target_by_name
2724

25+
if TYPE_CHECKING:
26+
import pathlib
27+
28+
from mbed_tools.build._internal.config.config import Config
29+
from mbed_tools.project import MbedProgram
30+
2831
logger = logging.getLogger(__name__)
2932

3033
CMAKE_CONFIG_FILE = "mbed_config.cmake"

tools/python/mbed_tools/targets/_internal/targets_json_parsers/accumulating_attribute_parser.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414

1515
import itertools
1616
from collections import deque
17-
from typing import Any, Deque, Dict, List
17+
from typing import TYPE_CHECKING, Any, Deque, Dict, List
1818

19-
from mbed_tools.build._internal.config.schemas import TargetJSON
19+
if TYPE_CHECKING:
20+
from mbed_tools.build._internal.config.schemas import TargetJSON
2021

2122
ACCUMULATING_ATTRIBUTES = ("extra_labels", "macros", "device_has", "features", "components")
2223
MODIFIERS = ("add", "remove")

tools/python/mbed_tools/targets/_internal/targets_json_parsers/overriding_attribute_parser.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@
2424

2525
from collections import deque
2626
from functools import reduce
27-
from typing import Any, Deque, Dict, List, Set
27+
from typing import TYPE_CHECKING, Any, Deque, Dict, List, Set
2828

29-
from mbed_tools.build._internal.config.schemas import TargetJSON
3029
from mbed_tools.targets._internal.targets_json_parsers.accumulating_attribute_parser import ALL_ACCUMULATING_ATTRIBUTES
3130

31+
if TYPE_CHECKING:
32+
from mbed_tools.build._internal.config.schemas import TargetJSON
33+
3234
MERGING_ATTRIBUTES = ("config", "overrides", "memory_banks", "memory_overrides")
3335
NON_INHERITED_ATTRIBUTES = ("public", "inherits", "is_mcu_family_target")
3436
NON_OVERRIDING_ATTRIBUTES = ALL_ACCUMULATING_ATTRIBUTES + NON_INHERITED_ATTRIBUTES

0 commit comments

Comments
 (0)