From 3950fd0fb27ef108d98957b3559ba7003d22b3eb Mon Sep 17 00:00:00 2001 From: jeromecoutant Date: Fri, 11 Oct 2019 10:32:48 +0200 Subject: [PATCH] STM32 targets.json update for USB Removed unsupported MBED2 features: - USB_STM_HAL - USBHOST_OTHER --- targets/targets.json | 65 +++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 37 deletions(-) diff --git a/targets/targets.json b/targets/targets.json index 7cde1f85f0..866117278c 100644 --- a/targets/targets.json +++ b/targets/targets.json @@ -2393,7 +2393,6 @@ } }, "detect_code": ["0835"], - "macros_add": ["USBHOST_OTHER"], "device_has_add": [ "ANALOGOUT", "CAN", @@ -2536,7 +2535,7 @@ } }, "detect_code": ["0720"], - "macros_add": ["USB_STM_HAL", "USBHOST_OTHER", "MBED_TICKLESS"], + "macros_add": ["MBED_TICKLESS"], "device_has_add": [ "SERIAL_ASYNCH", "FLASH", @@ -2556,7 +2555,7 @@ "macro_name": "CLOCK_SOURCE" } }, - "macros_add": ["USB_STM_HAL", "USBHOST_OTHER", "HSE_VALUE=25000000"], + "macros_add": ["HSE_VALUE=25000000"], "device_has_add": [ "SERIAL_ASYNCH", "FLASH", @@ -2616,7 +2615,7 @@ "macro_name": "CLOCK_SOURCE" } }, - "macros_add": ["USB_STM_HAL", "USBHOST_OTHER", "MBED_TICKLESS"], + "macros_add": ["MBED_TICKLESS"], "device_has_add": [ "SERIAL_ASYNCH", "FLASH", @@ -2639,7 +2638,6 @@ } }, "detect_code": ["0826"], - "macros_add": ["USB_STM_HAL", "USBHOST_OTHER"], "device_has_add": [ "CAN", "SERIAL_ASYNCH", @@ -2764,9 +2762,7 @@ "overrides": { "lpticker_delay_ticks": 4, "tickless-from-us-ticker": true }, "detect_code": ["0743"], "macros_add": [ - "MBED_TICKLESS", - "USB_STM_HAL", - "USBHOST_OTHER" + "MBED_TICKLESS" ], "device_has_add": [ "ANALOGOUT", @@ -2806,9 +2802,7 @@ "overrides": { "lpticker_delay_ticks": 4, "tickless-from-us-ticker": true}, "detect_code": ["0743"], "macros_add": [ - "MBED_TICKLESS", - "USB_STM_HAL", - "USBHOST_OTHER" + "MBED_TICKLESS" ], "device_has_add": [ "ANALOGOUT", @@ -2847,6 +2841,10 @@ "value": "PA_7", "macro_name": "STM32_D11_SPI_ETHERNET_PIN" }, + "usb_speed": { + "help": "USE_USB_OTG_FS or USE_USB_OTG_HS or USE_USB_HS_IN_FS", + "value": "USE_USB_OTG_FS" + }, "clock_source": { "help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI", "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI", @@ -2863,10 +2861,6 @@ "PSA" ], "components_add": ["FLASHIAP"], - "macros_add": [ - "USB_STM_HAL", - "USBHOST_OTHER" - ], "device_has_add": [ "ANALOGOUT", "CAN", @@ -2937,9 +2931,7 @@ "STM_EMAC" ], "macros_add": [ - "MBEDTLS_CONFIG_HW_SUPPORT", - "USB_STM_HAL", - "USBHOST_OTHER" + "MBEDTLS_CONFIG_HW_SUPPORT" ], "device_has_add": [ "ANALOGOUT", @@ -3007,7 +2999,6 @@ } }, "detect_code": ["0777"], - "macros_add": ["USB_STM_HAL", "USBHOST_OTHER"], "device_has_add": [ "ANALOGOUT", "CAN", @@ -3029,10 +3020,13 @@ "help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI", "value": "USE_PLL_HSE_EXTC|USE_PLL_HSI", "macro_name": "CLOCK_SOURCE" + }, + "usb_speed": { + "help": "USE_USB_OTG_FS or USE_USB_OTG_HS or USE_USB_HS_IN_FS", + "value": "USE_USB_OTG_FS" } }, "detect_code": ["0778"], - "macros_add": ["USB_STM_HAL", "USBHOST_OTHER"], "device_has_add": [ "ANALOGOUT", "CAN", @@ -3088,8 +3082,7 @@ }, "macros_add": [ "MBED_TICKLESS", - "EXTRA_IDLE_STACK_REQUIRED", - "USBHOST_OTHER" + "EXTRA_IDLE_STACK_REQUIRED" ], "supported_form_factors": ["ARDUINO"], "detect_code": ["0816"], @@ -3141,7 +3134,6 @@ "macros_add": [ "MBED_TICKLESS", "EXTRA_IDLE_STACK_REQUIRED", - "USBHOST_OTHER", "MBEDTLS_CONFIG_HW_SUPPORT" ], "supported_form_factors": ["ARDUINO"], @@ -3198,8 +3190,7 @@ "supported_form_factors": ["ARDUINO"], "macros_add": [ "MBED_TICKLESS", - "EXTRA_IDLE_STACK_REQUIRED", - "USBHOST_OTHER" + "EXTRA_IDLE_STACK_REQUIRED" ], "detect_code": ["0818"], "device_has_add": [ @@ -3706,7 +3697,6 @@ "STM32L476xx", "MBED_TICKLESS", "EXTRA_IDLE_STACK_REQUIRED", - "USBHOST_OTHER", "MBED_SPLIT_HEAP" ], "device_has_add": [ @@ -4058,9 +4048,12 @@ "help": "Mask value : USE_PLL_HSE_EXTC (need HW patch) | USE_PLL_HSE_XTAL | USE_PLL_HSI", "value": "USE_PLL_HSE_XTAL|USE_PLL_HSI", "macro_name": "CLOCK_SOURCE" + }, + "usb_speed": { + "help": "USE_USB_OTG_FS or USE_USB_OTG_HS or USE_USB_HS_IN_FS", + "value": "USE_USB_OTG_FS" } }, - "macros_add": ["USB_STM_HAL"], "overrides": { "lse_available": 0 }, "device_has_add": ["ANALOGOUT", "TRNG", "FLASH", "MPU"], "release_versions": ["2", "5"], @@ -4117,10 +4110,13 @@ "help": "Mask value : USE_PLL_HSE_EXTC (need HW patch) | USE_PLL_HSE_XTAL | USE_PLL_HSI", "value": "USE_PLL_HSE_XTAL|USE_PLL_HSI", "macro_name": "CLOCK_SOURCE" + }, + "usb_speed": { + "help": "USE_USB_OTG_FS or USE_USB_OTG_HS or USE_USB_HS_IN_FS", + "value": "USE_USB_HS_IN_FS" } }, "overrides": { "lse_available": 0 }, - "macros_add": ["USB_STM_HAL", "USBHOST_OTHER"], "device_has_add": [ "ANALOGOUT", "CAN", @@ -4153,7 +4149,6 @@ } }, "detect_code": ["0788"], - "macros_add": ["USB_STM_HAL", "USBHOST_OTHER"], "device_has_add": [ "ANALOGOUT", "CAN", @@ -4315,8 +4310,8 @@ "macro_name": "CLOCK_SOURCE" }, "usb_speed": { - "help": "Select the USB speed/connector (0=FullSpeed, 1=HighSpeed)", - "value": "1" + "help": "USE_USB_OTG_FS or USE_USB_OTG_HS or USE_USB_HS_IN_FS", + "value": "USE_USB_OTG_FS" }, "lpticker_lptim": { "help": "This target supports LPTIM. Set value 1 to use LPTIM for LPTICKER, or 0 to use RTC wakeup timer", @@ -4326,9 +4321,7 @@ "detect_code": ["0815"], "macros_add": [ "MBED_TICKLESS", - "EXTRA_IDLE_STACK_REQUIRED", - "USB_STM_HAL", - "USBHOST_OTHER" + "EXTRA_IDLE_STACK_REQUIRED" ], "device_has_add": [ "ANALOGOUT", @@ -4380,9 +4373,7 @@ "detect_code": ["0817"], "macros_add": [ "MBED_TICKLESS", - "EXTRA_IDLE_STACK_REQUIRED", - "USB_STM_HAL", - "USBHOST_OTHER" + "EXTRA_IDLE_STACK_REQUIRED" ], "device_has_add": [ "ANALOGOUT",