From 4b8c2b87a060f407aca93c54bce3e1a33a85c869 Mon Sep 17 00:00:00 2001 From: jeromecoutant Date: Wed, 30 Jan 2019 10:46:40 +0100 Subject: [PATCH] STM32: set DEVICE_SERIAL_FC at FAMILY_STM32 level --- targets/targets.json | 106 ++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 61 deletions(-) diff --git a/targets/targets.json b/targets/targets.json index 329e9f57b4..78a9abe36c 100644 --- a/targets/targets.json +++ b/targets/targets.json @@ -1866,6 +1866,7 @@ "PORTOUT", "PWMOUT", "SERIAL", + "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", @@ -2027,7 +2028,7 @@ "CMSIS_VECTAB_VIRTUAL", "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\"" ], - "device_has_add": ["CRC", "SERIAL_FC"], + "device_has_add": ["CRC"], "device_has_remove": ["LPTICKER"], "default_lib": "small", "release_versions": ["2"], @@ -2052,7 +2053,7 @@ "CMSIS_VECTAB_VIRTUAL", "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\"" ], - "device_has_add": ["CRC", "SERIAL_FC"], + "device_has_add": ["CRC"], "device_has_remove": ["LPTICKER"], "default_lib": "small", "release_versions": ["2"], @@ -2077,7 +2078,7 @@ "CMSIS_VECTAB_VIRTUAL", "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\"" ], - "device_has_add": ["CAN", "CRC", "SERIAL_FC"], + "device_has_add": ["CAN", "CRC"], "device_has_remove": ["LPTICKER"], "default_lib": "small", "release_versions": ["2"], @@ -2100,7 +2101,7 @@ "CMSIS_VECTAB_VIRTUAL", "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\"" ], - "device_has_add": ["CRC", "SERIAL_FC", "SERIAL_ASYNCH", "FLASH"], + "device_has_add": ["CRC", "SERIAL_ASYNCH", "FLASH"], "release_versions": ["2", "5"], "device_name": "STM32F070RB" }, @@ -2125,7 +2126,6 @@ "ANALOGOUT", "CAN", "CRC", - "SERIAL_FC", "SERIAL_ASYNCH", "FLASH" ], @@ -2153,7 +2153,6 @@ "ANALOGOUT", "CAN", "CRC", - "SERIAL_FC", "SERIAL_ASYNCH", "FLASH" ], @@ -2178,7 +2177,7 @@ } }, "detect_code": ["0700"], - "device_has_add": ["CAN", "SERIAL_FC", "SERIAL_ASYNCH", "FLASH"], + "device_has_add": ["CAN", "SERIAL_ASYNCH", "FLASH"], "device_has_remove": ["LPTICKER"], "release_versions": ["2", "5"], "device_name": "STM32F103RB" @@ -2207,7 +2206,6 @@ "CAN", "EMAC", "SERIAL_ASYNCH", - "SERIAL_FC", "FLASH", "TRNG", "MPU" @@ -2237,8 +2235,7 @@ "ANALOGOUT", "CAN", "CRC", - "SERIAL_ASYNCH", - "SERIAL_FC" + "SERIAL_ASYNCH" ], "default_lib": "small", "release_versions": ["2"], @@ -2259,7 +2256,7 @@ "overrides": { "lse_available": 0 }, "detect_code": ["0775"], "default_lib": "small", - "device_has_add": ["ANALOGOUT", "CAN", "CRC", "SERIAL_FC"], + "device_has_add": ["ANALOGOUT", "CAN", "CRC"], "release_versions": ["2"], "device_name": "STM32F303K8" }, @@ -2281,7 +2278,6 @@ "CAN", "CRC", "SERIAL_ASYNCH", - "SERIAL_FC", "FLASH", "MPU" ], @@ -2323,8 +2319,7 @@ "ANALOGOUT", "CAN", "CRC", - "SERIAL_ASYNCH", - "SERIAL_FC" + "SERIAL_ASYNCH" ], "default_lib": "small", "release_versions": ["2"], @@ -2344,7 +2339,7 @@ }, "detect_code": ["0720"], "macros_add": ["USB_STM_HAL", "USBHOST_OTHER"], - "device_has_add": ["SERIAL_ASYNCH", "SERIAL_FC", "FLASH", "MPU"], + "device_has_add": ["SERIAL_ASYNCH", "FLASH", "MPU"], "release_versions": ["2", "5"], "device_name": "STM32F401RE" }, @@ -2360,7 +2355,7 @@ } }, "macros_add": ["USB_STM_HAL", "USBHOST_OTHER", "HSE_VALUE=25000000"], - "device_has_add": ["SERIAL_ASYNCH", "SERIAL_FC", "FLASH", "MPU"], + "device_has_add": ["SERIAL_ASYNCH", "FLASH", "MPU"], "overrides": { "lse_available": 0 }, "release_versions": ["2", "5"], "device_name": "STM32F401VE" @@ -2394,7 +2389,6 @@ "device_has_add": [ "ANALOGOUT", "SERIAL_ASYNCH", - "SERIAL_FC", "TRNG", "FLASH", "MPU" @@ -2422,7 +2416,7 @@ } }, "macros_add": ["USB_STM_HAL", "USBHOST_OTHER"], - "device_has_add": ["SERIAL_ASYNCH", "SERIAL_FC", "FLASH", "MPU"], + "device_has_add": ["SERIAL_ASYNCH", "FLASH", "MPU"], "release_versions": ["2", "5"], "device_name": "STM32F411RE", "bootloader_supported": true @@ -2444,7 +2438,6 @@ "device_has_add": [ "CAN", "SERIAL_ASYNCH", - "SERIAL_FC", "TRNG", "FLASH", "MPU" @@ -2467,7 +2460,6 @@ "device_has_add": [ "CAN", "SERIAL_ASYNCH", - "SERIAL_FC", "TRNG", "FLASH", "MPU" @@ -2502,7 +2494,6 @@ "macros_add": ["USB_STM_HAL", "USBHOST_OTHER"], "device_has_add": [ "SERIAL_ASYNCH", - "SERIAL_FC", "TRNG", "FLASH", "MPU" @@ -2573,7 +2564,6 @@ "ANALOGOUT", "CAN", "SERIAL_ASYNCH", - "SERIAL_FC", "TRNG", "FLASH", "QSPI", @@ -2615,7 +2605,6 @@ "ANALOGOUT", "CAN", "SERIAL_ASYNCH", - "SERIAL_FC", "TRNG", "FLASH", "MPU" @@ -2633,6 +2622,7 @@ "supported_toolchains": ["ARM", "uARM", "GCC_ARM"], "detect_code": ["----"], "device_has_add": ["MPU"], + "device_has_remove": ["SERIAL_FC"], "default_lib": "small", "release_versions": ["2"], "device_name": "STM32F411RE" @@ -2677,7 +2667,6 @@ "CAN", "EMAC", "SERIAL_ASYNCH", - "SERIAL_FC", "TRNG", "FLASH", "MPU" @@ -2729,7 +2718,6 @@ "CAN", "EMAC", "SERIAL_ASYNCH", - "SERIAL_FC", "TRNG", "FLASH", "MPU" @@ -2760,7 +2748,6 @@ "ANALOGOUT", "CAN", "SERIAL_ASYNCH", - "SERIAL_FC", "FLASH", "MPU" ], @@ -2786,7 +2773,6 @@ "ANALOGOUT", "CAN", "SERIAL_ASYNCH", - "SERIAL_FC", "FLASH", "MPU" ], @@ -2803,7 +2789,6 @@ "ANALOGOUT", "CAN", "SERIAL_ASYNCH", - "SERIAL_FC", "FLASH", "MPU" ], @@ -3032,7 +3017,7 @@ }, "overrides": { "lpticker_delay_ticks": 4 }, "detect_code": ["0780"], - "device_has_add": ["CRC", "SERIAL_FC", "FLASH"], + "device_has_add": ["CRC", "FLASH"], "default_lib": "small", "release_versions": ["2"], "device_name": "STM32L011K4" @@ -3056,7 +3041,7 @@ }, "overrides": { "lpticker_delay_ticks": 4 }, "detect_code": ["0790"], - "device_has_add": ["CRC", "SERIAL_FC", "FLASH"], + "device_has_add": ["CRC", "FLASH"], "default_lib": "small", "release_versions": ["2"], "device_name": "STM32L031K6" @@ -3082,7 +3067,6 @@ "device_has_add": [ "ANALOGOUT", "CRC", - "SERIAL_FC", "SERIAL_ASYNCH", "FLASH", "MPU" @@ -3115,7 +3099,6 @@ "device_has_add": [ "ANALOGOUT", "CRC", - "SERIAL_FC", "SERIAL_ASYNCH", "TRNG", "FLASH", @@ -3140,7 +3123,6 @@ "device_has_add": [ "ANALOGOUT", "SERIAL_ASYNCH", - "SERIAL_FC", "FLASH", "MPU" ], @@ -3171,7 +3153,6 @@ "device_has_add": [ "ANALOGOUT", "CRC", - "SERIAL_FC", "SERIAL_ASYNCH", "CAN", "TRNG", @@ -3206,7 +3187,6 @@ "device_has_add": [ "ANALOGOUT", "CRC", - "SERIAL_FC", "SERIAL_ASYNCH", "CAN", "TRNG", @@ -3233,7 +3213,6 @@ "device_has_add": [ "ANALOGOUT", "CRC", - "SERIAL_FC", "SERIAL_ASYNCH", "CAN", "TRNG", @@ -3274,7 +3253,6 @@ "CAN", "CRC", "SERIAL_ASYNCH", - "SERIAL_FC", "TRNG", "FLASH", "MPU" @@ -3302,7 +3280,6 @@ "CAN", "CRC", "SERIAL_ASYNCH", - "SERIAL_FC", "TRNG", "FLASH", "MPU" @@ -3339,7 +3316,6 @@ "CAN", "CRC", "SERIAL_ASYNCH", - "SERIAL_FC", "TRNG", "FLASH", "MPU" @@ -3375,7 +3351,6 @@ "ANALOGOUT", "CRC", "SERIAL_ASYNCH", - "SERIAL_FC", "TRNG", "FLASH", "MPU" @@ -3400,7 +3375,10 @@ "STM_EMAC" ], "device_has_add": ["ANALOGOUT", "TRNG", "FLASH", "EMAC", "MPU"], - "device_has_remove": ["LPTICKER"], + "device_has_remove": [ + "LPTICKER", + "SERIAL_FC" + ], "macros_add": ["USB_STM_HAL"], "config": { "clock_source": { @@ -3457,7 +3435,6 @@ "ANALOGOUT", "CAN", "LOWPOWERTIMER", - "SERIAL_FC", "TRNG", "FLASH", "MPU" @@ -3497,7 +3474,7 @@ }, "extra_labels_add": ["STM32F4", "STM32F439", "STM32F439VI", "STM32F439xx", "STM32F439xI"], "macros_add": ["MBEDTLS_CONFIG_HW_SUPPORT"], - "device_has_add": ["ANALOGOUT", "LOWPOWERTIMER", "SERIAL_ASYNCH", "SERIAL_FC", "TRNG", "FLASH", "MPU"], + "device_has_add": ["ANALOGOUT", "LOWPOWERTIMER", "SERIAL_ASYNCH", "TRNG", "FLASH", "MPU"], "detect_code": ["9015"], "release_versions": ["2", "5"], "device_name" : "STM32F439VI", @@ -3523,7 +3500,7 @@ "CMSIS_VECTAB_VIRTUAL", "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\"" ], - "device_has_add": ["CRC", "SERIAL_FC", "MPU"], + "device_has_add": ["CRC", "MPU"], "device_has_remove": ["LPTICKER"], "device_name": "STM32F051R8" }, @@ -3555,7 +3532,7 @@ }, "supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"], "release_versions": ["2", "5"], - "device_has_add": ["ANALOGOUT", "CAN", "CRC", "SERIAL_FC", "MPU"], + "device_has_add": ["ANALOGOUT", "CAN", "CRC", "MPU"], "device_name": "STM32F303VC" }, "DISCO_F334C8": { @@ -3571,7 +3548,7 @@ }, "overrides": { "lse_available": 0 }, "detect_code": ["0810"], - "device_has_add": ["ANALOGOUT", "CRC", "SERIAL_ASYNCH", "SERIAL_FC"], + "device_has_add": ["ANALOGOUT", "CRC", "SERIAL_ASYNCH"], "default_lib": "small", "release_versions": ["2"], "device_name": "STM32F334C8" @@ -3627,7 +3604,6 @@ "ANALOGOUT", "CAN", "SERIAL_ASYNCH", - "SERIAL_FC", "TRNG", "FLASH", "MPU" @@ -3660,7 +3636,6 @@ "device_has_add": [ "ANALOGOUT", "CAN", - "SERIAL_FC", "TRNG", "FLASH", "QSPI", @@ -3689,7 +3664,7 @@ "lse_available": 0, "lpticker_delay_ticks": 4 }, - "device_has_add": ["ANALOGOUT", "CRC", "SERIAL_FC", "FLASH", "MPU"], + "device_has_add": ["ANALOGOUT", "CRC", "FLASH", "MPU"], "default_lib": "small", "release_versions": ["2"], "device_name": "STM32L053C8" @@ -3722,7 +3697,6 @@ "detect_code": ["0833"], "device_has_add": [ "ANALOGOUT", - "SERIAL_FC", "SERIAL_ASYNCH", "TRNG", "FLASH", @@ -3743,7 +3717,6 @@ "detect_code": ["0456"], "device_has_add": [ "ANALOGOUT", - "SERIAL_FC", "SERIAL_ASYNCH", "TRNG", "FLASH", @@ -3882,7 +3855,6 @@ "device_has_add": [ "ANALOGOUT", "CAN", - "SERIAL_FC", "TRNG", "FLASH", "QSPI", @@ -3918,7 +3890,6 @@ "device_has_add": [ "ANALOGOUT", "CAN", - "SERIAL_FC", "TRNG", "FLASH", "QSPI", @@ -3952,6 +3923,9 @@ "toolchains": ["GCC_ARM", "ARM_STD", "ARM_MICRO", "IAR"] }, "device_has_add": ["MPU"], + "device_has_remove": [ + "SERIAL_FC" + ], "release_versions": ["2", "5"], "device_name": "STM32F411RE" }, @@ -3978,6 +3952,9 @@ "toolchains": ["GCC_ARM", "ARM_STD", "ARM_MICRO", "IAR"] }, "device_has_add": ["MPU"], + "device_has_remove": [ + "SERIAL_FC" + ], "release_versions": ["2", "5"], "device_name": "STM32F411RE" }, @@ -4014,7 +3991,6 @@ "ANALOGOUT", "CAN", "SERIAL_ASYNCH", - "SERIAL_FC", "TRNG", "FLASH", "MPU" @@ -4044,6 +4020,9 @@ }, "macros_add": ["HSE_VALUE=26000000", "VECT_TAB_OFFSET=0x08010000"], "device_has_add": ["MPU"], + "device_has_remove": [ + "SERIAL_FC" + ], "post_binary_hook": { "function": "MTSCode.combine_bins_mtb_mts_dragonfly", "toolchains": ["GCC_ARM", "ARM_STD", "ARM_MICRO", "IAR"] @@ -4065,6 +4044,9 @@ }, "supported_toolchains": ["ARM", "GCC_ARM", "IAR"], "device_has_add": ["ANALOGOUT", "FLASH", "MPU"], + "device_has_remove": [ + "SERIAL_FC" + ], "release_versions": ["5"], "device_name": "STM32L151CC", "bootloader_supported": true @@ -4091,6 +4073,9 @@ }, "supported_toolchains": ["ARM", "GCC_ARM", "IAR"], "device_has_add": ["ANALOGOUT", "FLASH", "MPU"], + "device_has_remove": [ + "SERIAL_FC" + ], "release_versions": ["5"], "device_name": "STM32L151CC", "bootloader_supported": true @@ -4102,6 +4087,9 @@ "extra_labels_add": ["STM32L1", "STM32L151xBA", "STM32L151CBA"], "supported_toolchains": ["ARM", "GCC_ARM", "IAR"], "device_has_add": ["ANALOGOUT", "MPU"], + "device_has_remove": [ + "SERIAL_FC" + ], "release_versions": ["5"], "device_name": "STM32L151CBxxA", "bootloader_supported": true @@ -4115,6 +4103,7 @@ "extra_labels_add": ["STM32L1", "STM32L152RC"], "detect_code": ["4100"], "device_has_add": ["ANALOGOUT", "SERIAL_ASYNCH", "FLASH", "MPU"], + "device_has_remove": ["SERIAL_FC"], "release_versions": ["2", "5"], "device_name": "STM32L152RC" }, @@ -4168,7 +4157,6 @@ "TRNG", "FLASH", "WIFI", - "SERIAL_FC", "SERIAL" ], "features": ["BLE"], @@ -4262,7 +4250,6 @@ "device_has_add": [ "ANALOGOUT", "EMAC", - "SERIAL_FC", "TRNG", "FLASH", "MPU" @@ -6889,7 +6876,7 @@ "default_toolchain": "GCC_ARM", "extra_labels_add": ["STM32F1", "STM32F103C8"], "supported_toolchains": ["GCC_ARM"], - "device_has_add": ["CAN", "SERIAL_FC", "SERIAL_ASYNCH", "FLASH"], + "device_has_add": ["CAN", "SERIAL_ASYNCH", "FLASH"], "device_has_remove": ["STDIO_MESSAGES", "LPTICKER"] }, "NUMAKER_PFM_NUC472": { @@ -7304,7 +7291,6 @@ "CAN", "CRC", "SERIAL_ASYNCH", - "SERIAL_FC", "TRNG", "FLASH", "MPU", @@ -7340,7 +7326,6 @@ "CAN", "CRC", "SERIAL_ASYNCH", - "SERIAL_FC", "TRNG", "FLASH", "MPU" @@ -7379,7 +7364,6 @@ "CAN", "CRC", "SERIAL_ASYNCH", - "SERIAL_FC", "TRNG", "FLASH", "MPU" @@ -7534,7 +7518,7 @@ "macro_name": "CLOCK_SOURCE" } }, - "device_has_add": ["SERIAL_ASYNCH", "SERIAL_FC", "FLASH"], + "device_has_add": ["SERIAL_ASYNCH", "FLASH"], "release_versions": ["2"], "device_name": "STM32F411RE" },