Skip to content

Commit e7d95f5

Browse files
authored
Merge pull request #11536 from jeromecoutant/PR_STM32_EMAC
STM32 EMAC configuration update
2 parents a7d95dd + af8ab49 commit e7d95f5

File tree

32 files changed

+17
-24
lines changed

32 files changed

+17
-24
lines changed

features/netsocket/emac-drivers/TARGET_STM_EMAC/stm32xx_emac.cpp renamed to features/netsocket/emac-drivers/TARGET_STM/stm32xx_emac.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
/* Copyright (c) 2017 ARM Limited
1+
/* Copyright (c) 2017-2019 ARM Limited
2+
* Copyright (c) 2017-2019 STMicroelectronics
23
* SPDX-License-Identifier: Apache-2.0
34
*
45
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +15,8 @@
1415
* limitations under the License.
1516
*/
1617

18+
#if DEVICE_EMAC
19+
1720
#include <stdlib.h>
1821

1922
#include "cmsis_os.h"
@@ -1035,3 +1038,5 @@ void HAL_ETH_MACErrorCallback(ETH_HandleTypeDef *heth)
10351038
"Error from ethernet HAL (HAL_ETH_MACErrorCallback)\n");
10361039
}
10371040
#endif // ETH_IP_VERSION_V2
1041+
1042+
#endif /* DEVICE_EMAC */

targets/targets.json

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2379,7 +2379,7 @@
23792379
"components_add": ["FLASHIAP"],
23802380
"supported_form_factors": ["ARDUINO", "MORPHO"],
23812381
"core": "Cortex-M3",
2382-
"extra_labels_add": ["STM32F2", "STM32F207ZG", "STM_EMAC"],
2382+
"extra_labels_add": ["STM32F2", "STM32F207ZG"],
23832383
"config": {
23842384
"d11_configuration": {
23852385
"help": "Value: PA_7 for the default board configuration, PB_5 in case of solder bridge update (SB121 off/ SB122 on)",
@@ -2860,7 +2860,6 @@
28602860
"STM32F429ZI",
28612861
"STM32F429xx",
28622862
"STM32F429xI",
2863-
"STM_EMAC",
28642863
"PSA"
28652864
],
28662865
"components_add": ["FLASHIAP"],
@@ -2934,8 +2933,7 @@
29342933
"STM32F439",
29352934
"STM32F439ZI",
29362935
"STM32F439xx",
2937-
"STM32F439xI",
2938-
"STM_EMAC"
2936+
"STM32F439xI"
29392937
],
29402938
"macros_add": [
29412939
"MBEDTLS_CONFIG_HW_SUPPORT",
@@ -3068,8 +3066,7 @@
30683066
"STM32F7",
30693067
"STM32F746",
30703068
"STM32F746xG",
3071-
"STM32F746ZG",
3072-
"STM_EMAC"
3069+
"STM32F746ZG"
30733070
],
30743071
"config": {
30753072
"d11_configuration": {
@@ -3120,8 +3117,7 @@
31203117
"STM32F7",
31213118
"STM32F756",
31223119
"STM32F756xG",
3123-
"STM32F756ZG",
3124-
"STM_EMAC"
3120+
"STM32F756ZG"
31253121
],
31263122
"config": {
31273123
"d11_configuration": {
@@ -3173,8 +3169,7 @@
31733169
"STM32F7",
31743170
"STM32F767",
31753171
"STM32F767xI",
3176-
"STM32F767ZI",
3177-
"STM_EMAC"
3172+
"STM32F767ZI"
31783173
],
31793174
"config": {
31803175
"flash_dual_bank": {
@@ -3227,8 +3222,7 @@
32273222
"core": "Cortex-M7FD",
32283223
"extra_labels_add": [
32293224
"STM32H7",
3230-
"STM32H743xI",
3231-
"STM_EMAC"
3225+
"STM32H743xI"
32323226
],
32333227
"config": {
32343228
"d11_configuration": {
@@ -3280,8 +3274,7 @@
32803274
"core": "Cortex-M7FD",
32813275
"extra_labels_add": [
32823276
"STM32H7",
3283-
"STM32H743xI",
3284-
"STM_EMAC"
3277+
"STM32H743xI"
32853278
],
32863279
"config": {
32873280
"d11_configuration": {
@@ -3844,8 +3837,7 @@
38443837
"STM32F407",
38453838
"STM32F407xx",
38463839
"STM32F407xE",
3847-
"STM32F407VE",
3848-
"STM_EMAC"
3840+
"STM32F407VE"
38493841
],
38503842
"device_has_add": ["ANALOGOUT", "TRNG", "FLASH", "EMAC", "MPU"],
38513843
"device_has_remove": [
@@ -4306,8 +4298,7 @@
43064298
"STM32F7",
43074299
"STM32F746",
43084300
"STM32F746xG",
4309-
"STM32F746NG",
4310-
"STM_EMAC"
4301+
"STM32F746NG"
43114302
],
43124303
"components_add": ["QSPIF", "FLASHIAP"],
43134304
"supported_form_factors": ["ARDUINO"],
@@ -4361,8 +4352,7 @@
43614352
"STM32F7",
43624353
"STM32F769",
43634354
"STM32F769xI",
4364-
"STM32F769NI",
4365-
"STM_EMAC"
4355+
"STM32F769NI"
43664356
],
43674357
"components_add": ["QSPIF"],
43684358
"supported_form_factors": ["ARDUINO"],
@@ -4864,7 +4854,6 @@
48644854
"STM32F439ZI",
48654855
"STM32F439xx",
48664856
"STM32F439xI",
4867-
"STM_EMAC",
48684857
"CORDIO",
48694858
"CORDIO_ODIN_W2"
48704859
],
@@ -4968,8 +4957,7 @@
49684957
"STM32F437",
49694958
"STM32F437VG",
49704959
"STM32F437xx",
4971-
"STM32F437xG",
4972-
"STM_EMAC"
4960+
"STM32F437xG"
49734961
],
49744962
"config": {
49754963
"modem_is_on_board": {

0 commit comments

Comments
 (0)