Skip to content

Commit b1abb36

Browse files
committed
STM32 EMAC configuration update
- TARGET_STM_EMAC directory renamed to TARGET_STM (which doesn't need any specific extra label addition) - network-default-interface-type is set in stm32-emac mbed_lib json file
1 parent 1afece7 commit b1abb36

File tree

32 files changed

+33
-55
lines changed

32 files changed

+33
-55
lines changed

features/netsocket/emac-drivers/TARGET_STM_EMAC/mbed_lib.json renamed to features/netsocket/emac-drivers/TARGET_STM/mbed_lib.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
"eth-txbufnb": 4
66
},
77
"target_overrides": {
8+
"*": {
9+
"target.network-default-interface-type": "ETHERNET"
10+
},
11+
"MODULE_UBLOX_ODIN_W2": {
12+
"target.network-default-interface-type": "WIFI"
13+
},
814
"NUCLEO_F207ZG": {
915
"eth-rxbufnb": 2,
1016
"eth-txbufnb": 4

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17+
#if DEVICE_EMAC
18+
1719
#include <stdlib.h>
1820

1921
#include "cmsis_os.h"
@@ -1035,3 +1037,5 @@ void HAL_ETH_MACErrorCallback(ETH_HandleTypeDef *heth)
10351037
"Error from ethernet HAL (HAL_ETH_MACErrorCallback)\n");
10361038
}
10371039
#endif // ETH_IP_VERSION_V2
1040+
1041+
#endif /* DEVICE_EMAC */

targets/targets.json

Lines changed: 23 additions & 55 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)",
@@ -2407,10 +2407,7 @@
24072407
"device_has_remove": ["LPTICKER"],
24082408
"release_versions": ["2", "5"],
24092409
"device_name": "STM32F207ZG",
2410-
"bootloader_supported": true,
2411-
"overrides": {
2412-
"network-default-interface-type": "ETHERNET"
2413-
}
2410+
"bootloader_supported": true
24142411
},
24152412
"NUCLEO_F302R8": {
24162413
"inherits": ["FAMILY_STM32"],
@@ -2859,7 +2856,6 @@
28592856
"STM32F429ZI",
28602857
"STM32F429xx",
28612858
"STM32F429xI",
2862-
"STM_EMAC",
28632859
"PSA"
28642860
],
28652861
"components_add": ["FLASHIAP"],
@@ -2880,10 +2876,7 @@
28802876
"detect_code": ["0796"],
28812877
"release_versions": ["2", "5"],
28822878
"device_name": "STM32F429ZI",
2883-
"bootloader_supported": true,
2884-
"overrides": {
2885-
"network-default-interface-type": "ETHERNET"
2886-
}
2879+
"bootloader_supported": true
28872880
},
28882881
"MTB_STM_S2LP": {
28892882
"inherits": ["FAMILY_STM32"],
@@ -2933,8 +2926,7 @@
29332926
"STM32F439",
29342927
"STM32F439ZI",
29352928
"STM32F439xx",
2936-
"STM32F439xI",
2937-
"STM_EMAC"
2929+
"STM32F439xI"
29382930
],
29392931
"macros_add": [
29402932
"MBEDTLS_CONFIG_HW_SUPPORT",
@@ -2953,10 +2945,7 @@
29532945
"detect_code": ["0797"],
29542946
"release_versions": ["2", "5"],
29552947
"device_name": "STM32F439ZI",
2956-
"bootloader_supported": true,
2957-
"overrides": {
2958-
"network-default-interface-type": "ETHERNET"
2959-
}
2948+
"bootloader_supported": true
29602949
},
29612950
"MTB_STM32_F439" : {
29622951
"inherits": ["FAMILY_STM32"],
@@ -3067,8 +3056,7 @@
30673056
"STM32F7",
30683057
"STM32F746",
30693058
"STM32F746xG",
3070-
"STM32F746ZG",
3071-
"STM_EMAC"
3059+
"STM32F746ZG"
30723060
],
30733061
"config": {
30743062
"d11_configuration": {
@@ -3108,8 +3096,7 @@
31083096
"device_name": "STM32F746ZG",
31093097
"bootloader_supported": true,
31103098
"overrides": {
3111-
"lpticker_delay_ticks": 0,
3112-
"network-default-interface-type": "ETHERNET"
3099+
"lpticker_delay_ticks": 0
31133100
}
31143101
},
31153102
"NUCLEO_F756ZG": {
@@ -3119,8 +3106,7 @@
31193106
"STM32F7",
31203107
"STM32F756",
31213108
"STM32F756xG",
3122-
"STM32F756ZG",
3123-
"STM_EMAC"
3109+
"STM32F756ZG"
31243110
],
31253111
"config": {
31263112
"d11_configuration": {
@@ -3160,8 +3146,7 @@
31603146
"release_versions": ["2", "5"],
31613147
"device_name": "STM32F756ZG",
31623148
"overrides": {
3163-
"lpticker_delay_ticks": 0,
3164-
"network-default-interface-type": "ETHERNET"
3149+
"lpticker_delay_ticks": 0
31653150
}
31663151
},
31673152
"NUCLEO_F767ZI": {
@@ -3172,8 +3157,7 @@
31723157
"STM32F7",
31733158
"STM32F767",
31743159
"STM32F767xI",
3175-
"STM32F767ZI",
3176-
"STM_EMAC"
3160+
"STM32F767ZI"
31773161
],
31783162
"config": {
31793163
"flash_dual_bank": {
@@ -3217,17 +3201,15 @@
32173201
"device_name": "STM32F767ZI",
32183202
"bootloader_supported": true,
32193203
"overrides": {
3220-
"lpticker_delay_ticks": 0,
3221-
"network-default-interface-type": "ETHERNET"
3204+
"lpticker_delay_ticks": 0
32223205
}
32233206
},
32243207
"NUCLEO_H743ZI": {
32253208
"inherits": ["FAMILY_STM32"],
32263209
"core": "Cortex-M7FD",
32273210
"extra_labels_add": [
32283211
"STM32H7",
3229-
"STM32H743xI",
3230-
"STM_EMAC"
3212+
"STM32H743xI"
32313213
],
32323214
"config": {
32333215
"d11_configuration": {
@@ -3256,8 +3238,7 @@
32563238
"MBED_TICKLESS"
32573239
],
32583240
"overrides": {
3259-
"lpticker_delay_ticks": 0,
3260-
"network-default-interface-type": "ETHERNET"
3241+
"lpticker_delay_ticks": 0
32613242
},
32623243
"supported_form_factors": ["ARDUINO"],
32633244
"detect_code": ["0813"],
@@ -3279,8 +3260,7 @@
32793260
"core": "Cortex-M7FD",
32803261
"extra_labels_add": [
32813262
"STM32H7",
3282-
"STM32H743xI",
3283-
"STM_EMAC"
3263+
"STM32H743xI"
32843264
],
32853265
"config": {
32863266
"d11_configuration": {
@@ -3309,8 +3289,7 @@
33093289
"MBED_TICKLESS"
33103290
],
33113291
"overrides": {
3312-
"lpticker_delay_ticks": 0,
3313-
"network-default-interface-type": "ETHERNET"
3292+
"lpticker_delay_ticks": 0
33143293
},
33153294
"supported_form_factors": ["ARDUINO"],
33163295
"detect_code": ["0836"],
@@ -3813,8 +3792,7 @@
38133792
"STM32F407",
38143793
"STM32F407xx",
38153794
"STM32F407xE",
3816-
"STM32F407VE",
3817-
"STM_EMAC"
3795+
"STM32F407VE"
38183796
],
38193797
"device_has_add": ["ANALOGOUT", "TRNG", "FLASH", "EMAC", "MPU"],
38203798
"device_has_remove": [
@@ -3831,10 +3809,7 @@
38313809
},
38323810
"release_versions": ["2", "5"],
38333811
"overrides": {"lse_available": 0},
3834-
"device_name": "STM32F407VETx",
3835-
"overrides": {
3836-
"network-default-interface-type": "ETHERNET"
3837-
}
3812+
"device_name": "STM32F407VETx"
38383813
},
38393814
"WIO_3G": {
38403815
"inherits": ["FAMILY_STM32"],
@@ -4236,8 +4211,7 @@
42364211
"STM32F7",
42374212
"STM32F746",
42384213
"STM32F746xG",
4239-
"STM32F746NG",
4240-
"STM_EMAC"
4214+
"STM32F746NG"
42414215
],
42424216
"components_add": ["QSPIF", "FLASHIAP"],
42434217
"supported_form_factors": ["ARDUINO"],
@@ -4279,8 +4253,7 @@
42794253
"device_name": "STM32F746NG",
42804254
"bootloader_supported": true,
42814255
"overrides": {
4282-
"lpticker_delay_ticks": 0,
4283-
"network-default-interface-type": "ETHERNET"
4256+
"lpticker_delay_ticks": 0
42844257
}
42854258
},
42864259
"DISCO_F769NI": {
@@ -4290,8 +4263,7 @@
42904263
"STM32F7",
42914264
"STM32F769",
42924265
"STM32F769xI",
4293-
"STM32F769NI",
4294-
"STM_EMAC"
4266+
"STM32F769NI"
42954267
],
42964268
"components_add": ["QSPIF"],
42974269
"supported_form_factors": ["ARDUINO"],
@@ -4333,8 +4305,7 @@
43334305
"release_versions": ["2", "5"],
43344306
"device_name": "STM32F769NI",
43354307
"overrides": {
4336-
"lpticker_delay_ticks": 0,
4337-
"network-default-interface-type": "ETHERNET"
4308+
"lpticker_delay_ticks": 0
43384309
}
43394310
},
43404311
"DISCO_L475VG_IOT01A": {
@@ -4730,7 +4701,6 @@
47304701
"STM32F439ZI",
47314702
"STM32F439xx",
47324703
"STM32F439xI",
4733-
"STM_EMAC",
47344704
"CORDIO",
47354705
"CORDIO_ODIN_W2"
47364706
],
@@ -4834,8 +4804,7 @@
48344804
"STM32F437",
48354805
"STM32F437VG",
48364806
"STM32F437xx",
4837-
"STM32F437xG",
4838-
"STM_EMAC"
4807+
"STM32F437xG"
48394808
],
48404809
"config": {
48414810
"modem_is_on_board": {
@@ -4865,8 +4834,7 @@
48654834
"device_name": "STM32F437VG",
48664835
"bootloader_supported": true,
48674836
"overrides": {
4868-
"lse_available": 0,
4869-
"network-default-interface-type": "ETHERNET"
4837+
"lse_available": 0
48704838
}
48714839
},
48724840
"UBLOX_C030_U201": {

0 commit comments

Comments
 (0)