Skip to content

Commit 48375c2

Browse files
jeromecoutantjeromecoutant
committed
STM32 targets.json update for USB
Removed unsupported MBED2 features: - USB_STM_HAL - USBHOST_OTHER
1 parent bc0fbd3 commit 48375c2

File tree

1 file changed

+28
-37
lines changed

1 file changed

+28
-37
lines changed

‎targets/targets.json

Lines changed: 28 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2393,7 +2393,6 @@
23932393
}
23942394
},
23952395
"detect_code": ["0835"],
2396-
"macros_add": ["USBHOST_OTHER"],
23972396
"device_has_add": [
23982397
"ANALOGOUT",
23992398
"CAN",
@@ -2536,7 +2535,7 @@
25362535
}
25372536
},
25382537
"detect_code": ["0720"],
2539-
"macros_add": ["USB_STM_HAL", "USBHOST_OTHER", "MBED_TICKLESS"],
2538+
"macros_add": ["MBED_TICKLESS"],
25402539
"device_has_add": [
25412540
"SERIAL_ASYNCH",
25422541
"FLASH",
@@ -2556,7 +2555,7 @@
25562555
"macro_name": "CLOCK_SOURCE"
25572556
}
25582557
},
2559-
"macros_add": ["USB_STM_HAL", "USBHOST_OTHER", "HSE_VALUE=25000000"],
2558+
"macros_add": ["HSE_VALUE=25000000"],
25602559
"device_has_add": [
25612560
"SERIAL_ASYNCH",
25622561
"FLASH",
@@ -2616,7 +2615,7 @@
26162615
"macro_name": "CLOCK_SOURCE"
26172616
}
26182617
},
2619-
"macros_add": ["USB_STM_HAL", "USBHOST_OTHER", "MBED_TICKLESS"],
2618+
"macros_add": ["MBED_TICKLESS"],
26202619
"device_has_add": [
26212620
"SERIAL_ASYNCH",
26222621
"FLASH",
@@ -2639,7 +2638,6 @@
26392638
}
26402639
},
26412640
"detect_code": ["0826"],
2642-
"macros_add": ["USB_STM_HAL", "USBHOST_OTHER"],
26432641
"device_has_add": [
26442642
"CAN",
26452643
"SERIAL_ASYNCH",
@@ -2764,9 +2762,7 @@
27642762
"overrides": { "lpticker_delay_ticks": 4, "tickless-from-us-ticker": true },
27652763
"detect_code": ["0743"],
27662764
"macros_add": [
2767-
"MBED_TICKLESS",
2768-
"USB_STM_HAL",
2769-
"USBHOST_OTHER"
2765+
"MBED_TICKLESS"
27702766
],
27712767
"device_has_add": [
27722768
"ANALOGOUT",
@@ -2806,9 +2802,7 @@
28062802
"overrides": { "lpticker_delay_ticks": 4, "tickless-from-us-ticker": true},
28072803
"detect_code": ["0743"],
28082804
"macros_add": [
2809-
"MBED_TICKLESS",
2810-
"USB_STM_HAL",
2811-
"USBHOST_OTHER"
2805+
"MBED_TICKLESS"
28122806
],
28132807
"device_has_add": [
28142808
"ANALOGOUT",
@@ -2847,6 +2841,10 @@
28472841
"value": "PA_7",
28482842
"macro_name": "STM32_D11_SPI_ETHERNET_PIN"
28492843
},
2844+
"usb_speed": {
2845+
"help": "USE_USB_OTG_FS or USE_USB_OTG_HS or USE_USB_HS_IN_FS",
2846+
"value": "USE_USB_OTG_FS"
2847+
},
28502848
"clock_source": {
28512849
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
28522850
"value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
@@ -2863,10 +2861,6 @@
28632861
"PSA"
28642862
],
28652863
"components_add": ["FLASHIAP"],
2866-
"macros_add": [
2867-
"USB_STM_HAL",
2868-
"USBHOST_OTHER"
2869-
],
28702864
"device_has_add": [
28712865
"ANALOGOUT",
28722866
"CAN",
@@ -2937,9 +2931,7 @@
29372931
"STM_EMAC"
29382932
],
29392933
"macros_add": [
2940-
"MBEDTLS_CONFIG_HW_SUPPORT",
2941-
"USB_STM_HAL",
2942-
"USBHOST_OTHER"
2934+
"MBEDTLS_CONFIG_HW_SUPPORT"
29432935
],
29442936
"device_has_add": [
29452937
"ANALOGOUT",
@@ -3007,7 +2999,6 @@
30072999
}
30083000
},
30093001
"detect_code": ["0777"],
3010-
"macros_add": ["USB_STM_HAL", "USBHOST_OTHER"],
30113002
"device_has_add": [
30123003
"ANALOGOUT",
30133004
"CAN",
@@ -3029,10 +3020,13 @@
30293020
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
30303021
"value": "USE_PLL_HSE_EXTC|USE_PLL_HSI",
30313022
"macro_name": "CLOCK_SOURCE"
3023+
},
3024+
"usb_speed": {
3025+
"help": "USE_USB_OTG_FS or USE_USB_OTG_HS or USE_USB_HS_IN_FS",
3026+
"value": "USE_USB_OTG_FS"
30323027
}
30333028
},
30343029
"detect_code": ["0778"],
3035-
"macros_add": ["USB_STM_HAL", "USBHOST_OTHER"],
30363030
"device_has_add": [
30373031
"ANALOGOUT",
30383032
"CAN",
@@ -3088,8 +3082,7 @@
30883082
},
30893083
"macros_add": [
30903084
"MBED_TICKLESS",
3091-
"EXTRA_IDLE_STACK_REQUIRED",
3092-
"USBHOST_OTHER"
3085+
"EXTRA_IDLE_STACK_REQUIRED"
30933086
],
30943087
"supported_form_factors": ["ARDUINO"],
30953088
"detect_code": ["0816"],
@@ -3141,7 +3134,6 @@
31413134
"macros_add": [
31423135
"MBED_TICKLESS",
31433136
"EXTRA_IDLE_STACK_REQUIRED",
3144-
"USBHOST_OTHER",
31453137
"MBEDTLS_CONFIG_HW_SUPPORT"
31463138
],
31473139
"supported_form_factors": ["ARDUINO"],
@@ -3198,8 +3190,7 @@
31983190
"supported_form_factors": ["ARDUINO"],
31993191
"macros_add": [
32003192
"MBED_TICKLESS",
3201-
"EXTRA_IDLE_STACK_REQUIRED",
3202-
"USBHOST_OTHER"
3193+
"EXTRA_IDLE_STACK_REQUIRED"
32033194
],
32043195
"detect_code": ["0818"],
32053196
"device_has_add": [
@@ -3706,7 +3697,6 @@
37063697
"STM32L476xx",
37073698
"MBED_TICKLESS",
37083699
"EXTRA_IDLE_STACK_REQUIRED",
3709-
"USBHOST_OTHER",
37103700
"MBED_SPLIT_HEAP"
37113701
],
37123702
"device_has_add": [
@@ -4058,9 +4048,12 @@
40584048
"help": "Mask value : USE_PLL_HSE_EXTC (need HW patch) | USE_PLL_HSE_XTAL | USE_PLL_HSI",
40594049
"value": "USE_PLL_HSE_XTAL|USE_PLL_HSI",
40604050
"macro_name": "CLOCK_SOURCE"
4051+
},
4052+
"usb_speed": {
4053+
"help": "USE_USB_OTG_FS or USE_USB_OTG_HS or USE_USB_HS_IN_FS",
4054+
"value": "USE_USB_OTG_FS"
40614055
}
40624056
},
4063-
"macros_add": ["USB_STM_HAL"],
40644057
"overrides": { "lse_available": 0 },
40654058
"device_has_add": ["ANALOGOUT", "TRNG", "FLASH", "MPU"],
40664059
"release_versions": ["2", "5"],
@@ -4117,10 +4110,13 @@
41174110
"help": "Mask value : USE_PLL_HSE_EXTC (need HW patch) | USE_PLL_HSE_XTAL | USE_PLL_HSI",
41184111
"value": "USE_PLL_HSE_XTAL|USE_PLL_HSI",
41194112
"macro_name": "CLOCK_SOURCE"
4113+
},
4114+
"usb_speed": {
4115+
"help": "USE_USB_OTG_FS or USE_USB_OTG_HS or USE_USB_HS_IN_FS",
4116+
"value": "USE_USB_HS_IN_FS"
41204117
}
41214118
},
41224119
"overrides": { "lse_available": 0 },
4123-
"macros_add": ["USB_STM_HAL", "USBHOST_OTHER"],
41244120
"device_has_add": [
41254121
"ANALOGOUT",
41264122
"CAN",
@@ -4153,7 +4149,6 @@
41534149
}
41544150
},
41554151
"detect_code": ["0788"],
4156-
"macros_add": ["USB_STM_HAL", "USBHOST_OTHER"],
41574152
"device_has_add": [
41584153
"ANALOGOUT",
41594154
"CAN",
@@ -4315,8 +4310,8 @@
43154310
"macro_name": "CLOCK_SOURCE"
43164311
},
43174312
"usb_speed": {
4318-
"help": "Select the USB speed/connector (0=FullSpeed, 1=HighSpeed)",
4319-
"value": "1"
4313+
"help": "USE_USB_OTG_FS or USE_USB_OTG_HS or USE_USB_HS_IN_FS",
4314+
"value": "USE_USB_OTG_FS"
43204315
},
43214316
"lpticker_lptim": {
43224317
"help": "This target supports LPTIM. Set value 1 to use LPTIM for LPTICKER, or 0 to use RTC wakeup timer",
@@ -4326,9 +4321,7 @@
43264321
"detect_code": ["0815"],
43274322
"macros_add": [
43284323
"MBED_TICKLESS",
4329-
"EXTRA_IDLE_STACK_REQUIRED",
4330-
"USB_STM_HAL",
4331-
"USBHOST_OTHER"
4324+
"EXTRA_IDLE_STACK_REQUIRED"
43324325
],
43334326
"device_has_add": [
43344327
"ANALOGOUT",
@@ -4380,9 +4373,7 @@
43804373
"detect_code": ["0817"],
43814374
"macros_add": [
43824375
"MBED_TICKLESS",
4383-
"EXTRA_IDLE_STACK_REQUIRED",
4384-
"USB_STM_HAL",
4385-
"USBHOST_OTHER"
4376+
"EXTRA_IDLE_STACK_REQUIRED"
43864377
],
43874378
"device_has_add": [
43884379
"ANALOGOUT",

0 commit comments

Comments
 (0)