Skip to content

Commit 498de9c

Browse files
author
Laurent MEUNIER
committed
[STM32] Move RTC_LSI to macros instead of device_has
device_has is a control list for generic apis, while macros can be used more freely. DEVICE_RTC_LSI being STM32 specific, it is moved to macros.
1 parent 62841f3 commit 498de9c

File tree

1 file changed

+18
-11
lines changed

1 file changed

+18
-11
lines changed

‎hal/targets.json

+18-11
Original file line numberDiff line numberDiff line change
@@ -624,11 +624,12 @@
624624
"core": "Cortex-M0",
625625
"default_toolchain": "uARM",
626626
"extra_labels": ["STM", "STM32F0", "STM32F031K6"],
627+
"macros": ["DEVICE_RTC_LSI=1"],
627628
"supported_toolchains": ["ARM", "uARM", "IAR", "GCC_ARM"],
628629
"inherits": ["Target"],
629630
"progen": {"target": "nucleo-f031k6"},
630631
"detect_code": ["0791"],
631-
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
632+
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
632633
"default_lib": "small",
633634
"release_versions": ["2"]
634635
},
@@ -637,11 +638,12 @@
637638
"core": "Cortex-M0",
638639
"default_toolchain": "uARM",
639640
"extra_labels": ["STM", "STM32F0", "STM32F042K6"],
641+
"macros": ["DEVICE_RTC_LSI=1"],
640642
"supported_toolchains": ["ARM", "uARM", "IAR", "GCC_ARM"],
641643
"inherits": ["Target"],
642644
"progen": {"target": "nucleo-f042k6"},
643645
"detect_code": ["0785"],
644-
"device_has": ["ANALOGIN", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
646+
"device_has": ["ANALOGIN", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
645647
"default_lib": "small",
646648
"release_versions": ["2"]
647649
},
@@ -724,12 +726,13 @@
724726
"core": "Cortex-M4F",
725727
"default_toolchain": "ARM",
726728
"extra_labels": ["STM", "STM32F3", "STM32F303K8"],
729+
"macros": ["DEVICE_RTC_LSI=1"],
727730
"supported_toolchains": ["ARM", "uARM", "IAR", "GCC_ARM"],
728731
"inherits": ["Target"],
729732
"progen": {"target": "nucleo-f303k8"},
730733
"detect_code": ["0775"],
731734
"default_lib": "small",
732-
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
735+
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
733736
"release_versions": ["2"]
734737
},
735738
"NUCLEO_F303RE": {
@@ -814,8 +817,8 @@
814817
"extra_labels": ["STM", "STM32F4", "STM32F429", "STM32F429ZI", "STM32F429xx"],
815818
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
816819
"progen": {"target": "nucleo-f429zi"},
817-
"macros": ["MBEDTLS_ENTROPY_HARDWARE_ALT"],
818-
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
820+
"macros": ["MBEDTLS_ENTROPY_HARDWARE_ALT", "DEVICE_RTC_LSI=1"],
821+
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
819822
"detect_code": ["0796"],
820823
"features": ["IPV4"],
821824
"release_versions": ["2", "5"]
@@ -1022,18 +1025,20 @@
10221025
"core": "Cortex-M4F",
10231026
"default_toolchain": "ARM",
10241027
"extra_labels": ["STM", "STM32F3", "STM32F303", "STM32F303VC"],
1028+
"macros": ["DEVICE_RTC_LSI=1"],
10251029
"supported_toolchains": ["GCC_ARM"],
1026-
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
1030+
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
10271031
},
10281032
"DISCO_F334C8": {
10291033
"inherits": ["Target"],
10301034
"core": "Cortex-M4F",
10311035
"default_toolchain": "ARM",
10321036
"extra_labels": ["STM", "STM32F3", "STM32F334C8"],
1037+
"macros": ["DEVICE_RTC_LSI=1"],
10331038
"supported_toolchains": ["ARM", "uARM", "IAR", "GCC_ARM"],
10341039
"progen": {"target": "disco-f334c8"},
10351040
"detect_code": ["0810"],
1036-
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
1041+
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
10371042
"default_lib": "small",
10381043
"release_versions": ["2"]
10391044
},
@@ -1050,10 +1055,10 @@
10501055
"core": "Cortex-M4F",
10511056
"default_toolchain": "ARM",
10521057
"extra_labels": ["STM", "STM32F4", "STM32F429", "STM32F429ZI", "STM32F429xx"],
1053-
"macros": ["MBEDTLS_ENTROPY_HARDWARE_ALT"],
1058+
"macros": ["MBEDTLS_ENTROPY_HARDWARE_ALT", "DEVICE_RTC_LSI=1"],
10541059
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
10551060
"progen": {"target": "disco-f429zi"},
1056-
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
1061+
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
10571062
"release_versions": ["2", "5"]
10581063
},
10591064
"DISCO_F469NI": {
@@ -1148,10 +1153,11 @@
11481153
"core": "Cortex-M3",
11491154
"default_toolchain": "uARM",
11501155
"extra_labels": ["STM", "STM32L1", "STM32L152RC"],
1156+
"macros": ["DEVICE_RTC_LSI=1"],
11511157
"supported_toolchains": ["ARM", "uARM", "IAR", "GCC_ARM"],
11521158
"progen": {"target": "stm32l151rc"},
11531159
"detect_code": ["4100"],
1154-
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
1160+
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
11551161
"default_lib": "small",
11561162
"release_versions": ["2"]
11571163
},
@@ -1180,9 +1186,10 @@
11801186
"default_toolchain": "uARM",
11811187
"program_cycle_s": 1.5,
11821188
"extra_labels": ["STM", "STM32L1", "STM32L151RC"],
1189+
"macros": ["DEVICE_RTC_LSI=1"],
11831190
"supported_toolchains": ["ARM", "uARM", "GCC_ARM"],
11841191
"progen": {"target": "stm32l151rc"},
1185-
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
1192+
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
11861193
"default_lib": "small"
11871194
},
11881195
"MCU_NRF51": {

0 commit comments

Comments
 (0)