Skip to content

Commit 9b7b3e9

Browse files
jeromecoutantjeromecoutant
committed
STM32 targets.json update for USB
Removed unsupported MBED2 features: - USB_STM_HAL - USBHOST_OTHER
1 parent 811e1ec commit 9b7b3e9

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": [
@@ -3677,7 +3668,6 @@
36773668
"STM32L476xx",
36783669
"MBED_TICKLESS",
36793670
"EXTRA_IDLE_STACK_REQUIRED",
3680-
"USBHOST_OTHER",
36813671
"MBED_SPLIT_HEAP"
36823672
],
36833673
"device_has_add": [
@@ -4027,9 +4017,12 @@
40274017
"help": "Mask value : USE_PLL_HSE_EXTC (need HW patch) | USE_PLL_HSE_XTAL | USE_PLL_HSI",
40284018
"value": "USE_PLL_HSE_XTAL|USE_PLL_HSI",
40294019
"macro_name": "CLOCK_SOURCE"
4020+
},
4021+
"usb_speed": {
4022+
"help": "USE_USB_OTG_FS or USE_USB_OTG_HS or USE_USB_HS_IN_FS",
4023+
"value": "USE_USB_OTG_FS"
40304024
}
40314025
},
4032-
"macros_add": ["USB_STM_HAL"],
40334026
"overrides": { "lse_available": 0 },
40344027
"device_has_add": ["ANALOGOUT", "TRNG", "FLASH", "MPU"],
40354028
"release_versions": ["2", "5"],
@@ -4050,10 +4043,13 @@
40504043
"help": "Mask value : USE_PLL_HSE_EXTC (need HW patch) | USE_PLL_HSE_XTAL | USE_PLL_HSI",
40514044
"value": "USE_PLL_HSE_XTAL|USE_PLL_HSI",
40524045
"macro_name": "CLOCK_SOURCE"
4046+
},
4047+
"usb_speed": {
4048+
"help": "USE_USB_OTG_FS or USE_USB_OTG_HS or USE_USB_HS_IN_FS",
4049+
"value": "USE_USB_HS_IN_FS"
40534050
}
40544051
},
40554052
"overrides": { "lse_available": 0 },
4056-
"macros_add": ["USB_STM_HAL", "USBHOST_OTHER"],
40574053
"device_has_add": [
40584054
"ANALOGOUT",
40594055
"CAN",
@@ -4086,7 +4082,6 @@
40864082
}
40874083
},
40884084
"detect_code": ["0788"],
4089-
"macros_add": ["USB_STM_HAL", "USBHOST_OTHER"],
40904085
"device_has_add": [
40914086
"ANALOGOUT",
40924087
"CAN",
@@ -4248,8 +4243,8 @@
42484243
"macro_name": "CLOCK_SOURCE"
42494244
},
42504245
"usb_speed": {
4251-
"help": "Select the USB speed/connector (0=FullSpeed, 1=HighSpeed)",
4252-
"value": "1"
4246+
"help": "USE_USB_OTG_FS or USE_USB_OTG_HS or USE_USB_HS_IN_FS",
4247+
"value": "USE_USB_OTG_FS"
42534248
},
42544249
"lpticker_lptim": {
42554250
"help": "This target supports LPTIM. Set value 1 to use LPTIM for LPTICKER, or 0 to use RTC wakeup timer",
@@ -4259,9 +4254,7 @@
42594254
"detect_code": ["0815"],
42604255
"macros_add": [
42614256
"MBED_TICKLESS",
4262-
"EXTRA_IDLE_STACK_REQUIRED",
4263-
"USB_STM_HAL",
4264-
"USBHOST_OTHER"
4257+
"EXTRA_IDLE_STACK_REQUIRED"
42654258
],
42664259
"device_has_add": [
42674260
"ANALOGOUT",
@@ -4313,9 +4306,7 @@
43134306
"detect_code": ["0817"],
43144307
"macros_add": [
43154308
"MBED_TICKLESS",
4316-
"EXTRA_IDLE_STACK_REQUIRED",
4317-
"USB_STM_HAL",
4318-
"USBHOST_OTHER"
4309+
"EXTRA_IDLE_STACK_REQUIRED"
43194310
],
43204311
"device_has_add": [
43214312
"ANALOGOUT",

0 commit comments

Comments
 (0)