Skip to content

Commit 44edcf5

Browse files
sg-sg-
authored
Merge pull request #2130 from LMESTM/dev_stm32_device_h
stm32 : reduce number of device.h files
2 parents 2c96001 + 498de9c commit 44edcf5

File tree

63 files changed

+188
-2380
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+188
-2380
lines changed

‎hal/targets.json

Lines changed: 17 additions & 10 deletions
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,6 +726,7 @@
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"},
@@ -827,8 +830,8 @@
827830
"extra_labels": ["STM", "STM32F4", "STM32F429", "STM32F429ZI", "STM32F429xx"],
828831
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
829832
"progen": {"target": "nucleo-f429zi"},
830-
"macros": ["MBEDTLS_ENTROPY_HARDWARE_ALT"],
831-
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
833+
"macros": ["MBEDTLS_ENTROPY_HARDWARE_ALT", "DEVICE_RTC_LSI=1"],
834+
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
832835
"detect_code": ["0796"],
833836
"features": ["IPV4"],
834837
"release_versions": ["2", "5"]
@@ -1035,18 +1038,20 @@
10351038
"core": "Cortex-M4F",
10361039
"default_toolchain": "ARM",
10371040
"extra_labels": ["STM", "STM32F3", "STM32F303", "STM32F303VC"],
1041+
"macros": ["DEVICE_RTC_LSI=1"],
10381042
"supported_toolchains": ["GCC_ARM"],
1039-
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
1043+
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
10401044
},
10411045
"DISCO_F334C8": {
10421046
"inherits": ["Target"],
10431047
"core": "Cortex-M4F",
10441048
"default_toolchain": "ARM",
10451049
"extra_labels": ["STM", "STM32F3", "STM32F334C8"],
1050+
"macros": ["DEVICE_RTC_LSI=1"],
10461051
"supported_toolchains": ["ARM", "uARM", "IAR", "GCC_ARM"],
10471052
"progen": {"target": "disco-f334c8"},
10481053
"detect_code": ["0810"],
1049-
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
1054+
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
10501055
"default_lib": "small",
10511056
"release_versions": ["2"]
10521057
},
@@ -1063,10 +1068,10 @@
10631068
"core": "Cortex-M4F",
10641069
"default_toolchain": "ARM",
10651070
"extra_labels": ["STM", "STM32F4", "STM32F429", "STM32F429ZI", "STM32F429xx"],
1066-
"macros": ["MBEDTLS_ENTROPY_HARDWARE_ALT"],
1071+
"macros": ["MBEDTLS_ENTROPY_HARDWARE_ALT", "DEVICE_RTC_LSI=1"],
10671072
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
10681073
"progen": {"target": "disco-f429zi"},
1069-
"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"],
1074+
"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"],
10701075
"release_versions": ["2", "5"]
10711076
},
10721077
"DISCO_F469NI": {
@@ -1161,10 +1166,11 @@
11611166
"core": "Cortex-M3",
11621167
"default_toolchain": "uARM",
11631168
"extra_labels": ["STM", "STM32L1", "STM32L152RC"],
1169+
"macros": ["DEVICE_RTC_LSI=1"],
11641170
"supported_toolchains": ["ARM", "uARM", "IAR", "GCC_ARM"],
11651171
"progen": {"target": "stm32l151rc"},
11661172
"detect_code": ["4100"],
1167-
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
1173+
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
11681174
"default_lib": "small",
11691175
"release_versions": ["2"]
11701176
},
@@ -1193,9 +1199,10 @@
11931199
"default_toolchain": "uARM",
11941200
"program_cycle_s": 1.5,
11951201
"extra_labels": ["STM", "STM32L1", "STM32L151RC"],
1202+
"macros": ["DEVICE_RTC_LSI=1"],
11961203
"supported_toolchains": ["ARM", "uARM", "GCC_ARM"],
11971204
"progen": {"target": "stm32l151rc"},
1198-
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
1205+
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
11991206
"default_lib": "small"
12001207
},
12011208
"MCU_NRF51": {

‎hal/targets/hal/TARGET_STM/TARGET_STM32F0/TARGET_DISCO_F051R8/device.h

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎hal/targets/hal/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F031K6/device.h

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎hal/targets/hal/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F042K6/device.h

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎hal/targets/hal/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F072RB/device.h

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎hal/targets/hal/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F091RC/device.h

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)