Skip to content

Commit ea282b1

Browse files
committed
merge upstream
2 parents 91d1cb8 + c299c8b commit ea282b1

File tree

382 files changed

+226630
-1995
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

382 files changed

+226630
-1995
lines changed

.github/workflows/basic_checks.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ jobs:
2626
name: install dependencies
2727
shell: bash
2828
run: |
29-
pip install -U scancode-toolkit click gemfileparser
29+
pip install -U scancode-toolkit "click>=7,<8" gemfileparser
30+
3031
3132
-
3233
name: license check

connectivity/drivers/emac/TARGET_NUVOTON_EMAC/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ if("M480" IN_LIST MBED_TARGET_LABELS)
55
add_subdirectory(TARGET_M480)
66
elseif("NUC472" IN_LIST MBED_TARGET_LABELS)
77
add_subdirectory(TARGET_NUC472)
8+
elseif("M460" IN_LIST MBED_TARGET_LABELS)
9+
add_subdirectory(TARGET_M460)
810
endif()
911

1012
target_include_directories(mbed-emac
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Copyright (c) 2020 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
target_include_directories(mbed-emac
5+
INTERFACE
6+
.
7+
)
8+
9+
target_sources(mbed-emac
10+
INTERFACE
11+
m460_eth.c
12+
synopGMAC_Dev.c
13+
synopGMAC_network_interface.c
14+
)

0 commit comments

Comments
 (0)