Skip to content

Commit 6e762a2

Browse files
authored
Merge pull request #12210 from mprse/disable_lp_ticker_stm_no_lse
Fix for issue #10725: disable lp-ticker for STM targets which uses RTC/LSI for lp-ticker
2 parents 0d48a26 + 3980911 commit 6e762a2

File tree

1 file changed

+60
-10
lines changed

1 file changed

+60
-10
lines changed

targets/targets.json

Lines changed: 60 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3544,6 +3544,9 @@
35443544
"CAN",
35453545
"CRC"
35463546
],
3547+
"device_has_remove": [
3548+
"LPTICKER"
3549+
],
35473550
"release_versions": [
35483551
"2"
35493552
],
@@ -3737,6 +3740,9 @@
37373740
"FLASH",
37383741
"MPU"
37393742
],
3743+
"device_has_remove": [
3744+
"LPTICKER"
3745+
],
37403746
"overrides": {
37413747
"lse_available": 0
37423748
},
@@ -3982,6 +3988,12 @@
39823988
"overrides": {
39833989
"lse_available": 0
39843990
},
3991+
"device_has_remove": [
3992+
"LPTICKER"
3993+
],
3994+
"features_remove": [
3995+
"BLE"
3996+
],
39853997
"inherits": [
39863998
"USI_WM_BN_BM_22"
39873999
]
@@ -5756,6 +5768,9 @@
57565768
"CRC",
57575769
"MPU"
57585770
],
5771+
"device_has_remove": [
5772+
"LPTICKER"
5773+
],
57595774
"device_name": "STM32F303VC"
57605775
},
57615776
"DISCO_F334C8": {
@@ -5786,6 +5801,9 @@
57865801
"CRC",
57875802
"SERIAL_ASYNCH"
57885803
],
5804+
"device_has_remove": [
5805+
"LPTICKER"
5806+
],
57895807
"default_lib": "small",
57905808
"release_versions": [
57915809
"2"
@@ -5821,6 +5839,9 @@
58215839
"FLASH",
58225840
"MPU"
58235841
],
5842+
"device_has_remove": [
5843+
"LPTICKER"
5844+
],
58245845
"release_versions": [
58255846
"2",
58265847
"5"
@@ -5859,6 +5880,9 @@
58595880
"CAN",
58605881
"USBDEVICE"
58615882
],
5883+
"device_has_remove": [
5884+
"LPTICKER"
5885+
],
58625886
"release_versions": [
58635887
"5"
58645888
],
@@ -5898,6 +5922,9 @@
58985922
"FLASH",
58995923
"MPU"
59005924
],
5925+
"device_has_remove": [
5926+
"LPTICKER"
5927+
],
59015928
"release_versions": [
59025929
"2",
59035930
"5"
@@ -6561,7 +6588,8 @@
65616588
"FLASH"
65626589
],
65636590
"device_has_remove": [
6564-
"SERIAL_FC"
6591+
"SERIAL_FC",
6592+
"LPTICKER"
65656593
],
65666594
"release_versions": [
65676595
"2",
@@ -6699,7 +6727,8 @@
66996727
"MPU"
67006728
],
67016729
"device_has_remove": [
6702-
"SERIAL_FC"
6730+
"SERIAL_FC",
6731+
"LPTICKER"
67036732
],
67046733
"post_binary_hook": {
67056734
"function": "MTSCode.combine_bins_mtb_mts_dragonfly",
@@ -6997,7 +7026,6 @@
69977026
"inherits": [
69987027
"MODULE_UBLOX_ODIN_W2"
69997028
],
7000-
"device_has_add": [],
70017029
"overrides": {
70027030
"lse_available": 0
70037031
},
@@ -7009,7 +7037,12 @@
70097037
"inherits": [
70107038
"MODULE_UBLOX_ODIN_W2"
70117039
],
7012-
"device_has_add": [],
7040+
"device_has_remove": [
7041+
"LPTICKER"
7042+
],
7043+
"features_remove": [
7044+
"BLE"
7045+
],
70137046
"overrides": {
70147047
"lse_available": 0
70157048
},
@@ -7053,7 +7086,6 @@
70537086
"device_name": "STM32F437VG",
70547087
"bootloader_supported": true,
70557088
"overrides": {
7056-
"lse_available": 0,
70577089
"network-default-interface-type": "ETHERNET"
70587090
}
70597091
},
@@ -7141,6 +7173,9 @@
71417173
"ANALOGOUT",
71427174
"MPU"
71437175
],
7176+
"device_has_remove": [
7177+
"LPTICKER"
7178+
],
71447179
"default_lib": "small",
71457180
"device_name": "STM32L151RC"
71467181
},
@@ -12594,7 +12629,10 @@
1259412629
"mbed_ram_size": "0x2000"
1259512630
},
1259612631
"NU_PFM_M2351_NS": {
12597-
"inherits": ["NSPE_Target", "NU_PFM_M2351"],
12632+
"inherits": [
12633+
"NSPE_Target",
12634+
"NU_PFM_M2351"
12635+
],
1259812636
"core": "Cortex-M23-NS",
1259912637
"tfm.level": 1,
1260012638
"extra_labels_add": [
@@ -12608,7 +12646,9 @@
1260812646
"CMSIS_NVIC_VIRTUAL",
1260912647
"MBEDTLS_PSA_CRYPTO_C"
1261012648
],
12611-
"components_add": ["FLASHIAP"],
12649+
"components_add": [
12650+
"FLASHIAP"
12651+
],
1261212652
"post_binary_hook": {"function": "M2351Code.merge_secure"},
1261312653
"secure_image_filename": "tfm.hex",
1261412654
"overrides": {
@@ -12623,21 +12663,31 @@
1262312663
}
1262412664
},
1262512665
"NU_PFM_M2351_S": {
12626-
"inherits": ["SPE_Target", "NU_PFM_M2351"],
12666+
"inherits": [
12667+
"SPE_Target",
12668+
"NU_PFM_M2351"
12669+
],
1262712670
"core": "Cortex-M23",
1262812671
"tfm.level": 1,
1262912672
"extra_labels_add": [
1263012673
"M23_S",
1263112674
"PSA",
1263212675
"TFM"
1263312676
],
12634-
"device_has_remove": ["SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "STDIO_MESSAGES"],
12677+
"device_has_remove": [
12678+
"SERIAL",
12679+
"SERIAL_ASYNCH",
12680+
"SERIAL_FC",
12681+
"STDIO_MESSAGES"
12682+
],
1263512683
"macros_add": [
1263612684
"DAUTH_CHIP_DEFAULT",
1263712685
"MBEDTLS_PSA_CRYPTO_C",
1263812686
"MBEDTLS_PSA_CRYPTO_SPM"
1263912687
],
12640-
"components_add": ["FLASHIAP"],
12688+
"components_add": [
12689+
"FLASHIAP"
12690+
],
1264112691
"deliver_to_target": "NU_PFM_M2351_NS",
1264212692
"delivery_dir": "TARGET_NUVOTON/TARGET_M2351/TARGET_M23_NS/TARGET_NU_PFM_M2351_NS/TARGET_NU_PREBUILD_SECURE",
1264312693
"overrides": {

0 commit comments

Comments
 (0)