Skip to content

Commit e56ce3b

Browse files
itziardelatorreitziardelatorre
committed
IM880B: targets.json conflicts fixed
1 parent 87a5b41 commit e56ce3b

File tree

1 file changed

+58
-80
lines changed

1 file changed

+58
-80
lines changed

‎targets/targets.json‎

Lines changed: 58 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
"bootloader_supported": false,
1717
"static_memory_defines": true,
1818
"config": {
19-
"console-uart": {
20-
"help": "Target has UART console on pins STDIO_UART_TX, STDIO_UART_RX. Value is only significant if target has SERIAL device.",
21-
"value": true
22-
},
2319
"console-uart-flow-control": {
2420
"help": "Console hardware flow control. Options: null, RTS, CTS, RTSCTS.",
2521
"value": null
@@ -1511,10 +1507,12 @@
15111507
"SPI_ASYNCH",
15121508
"SPISLAVE",
15131509
"STDIO_MESSAGES",
1510+
"STORAGE",
15141511
"TRNG",
15151512
"FLASH",
15161513
"USBDEVICE"
15171514
],
1515+
"features": ["STORAGE"],
15181516
"release_versions": ["2", "5"],
15191517
"device_name": "MK64FN1M0xxx12",
15201518
"bootloader_supported": true,
@@ -2645,7 +2643,7 @@
26452643
"CYW4343X",
26462644
"CORDIO"
26472645
],
2648-
"features": ["BLE"],
2646+
"features": ["BLE", "STORAGE"],
26492647
"macros_add": ["USB_STM_HAL", "USBHOST_OTHER"],
26502648
"device_has_add": [
26512649
"SERIAL_ASYNCH",
@@ -3196,8 +3194,7 @@
31963194
}
31973195
},
31983196
"macros_add": [
3199-
"MBED_TICKLESS",
3200-
"USE_FULL_LL_DRIVER"
3197+
"MBED_TICKLESS"
32013198
],
32023199
"overrides": { "lpticker_delay_ticks": 4 },
32033200
"supported_form_factors": ["ARDUINO"],
@@ -3470,7 +3467,7 @@
34703467
"MPU"
34713468
],
34723469
"device_has_remove": ["LPTICKER"],
3473-
"macros_add": ["MBEDTLS_CONFIG_HW_SUPPORT", "MBED_SPLIT_HEAP"],
3470+
"macros_add": ["MBEDTLS_CONFIG_HW_SUPPORT"],
34743471
"device_name": "STM32L443RC",
34753472
"detect_code": ["0458"],
34763473
"bootloader_supported": true
@@ -3495,8 +3492,7 @@
34953492
"detect_code": ["0765"],
34963493
"macros_add": [
34973494
"MBED_TICKLESS",
3498-
"USBHOST_OTHER",
3499-
"MBED_SPLIT_HEAP"
3495+
"USBHOST_OTHER"
35003496
],
35013497
"device_has_add": [
35023498
"ANALOGOUT",
@@ -3558,8 +3554,7 @@
35583554
"macros_add": [
35593555
"MBED_TICKLESS",
35603556
"USBHOST_OTHER",
3561-
"MBEDTLS_CONFIG_HW_SUPPORT",
3562-
"MBED_SPLIT_HEAP"
3557+
"MBEDTLS_CONFIG_HW_SUPPORT"
35633558
],
35643559
"device_has_add": [
35653560
"ANALOGOUT",
@@ -3594,8 +3589,7 @@
35943589
"detect_code": ["0460"],
35953590
"macros_add": [
35963591
"MBEDTLS_CONFIG_HW_SUPPORT",
3597-
"WISE_1570",
3598-
"MBED_SPLIT_HEAP"
3592+
"WISE_1570"
35993593
],
36003594
"device_has_add": [
36013595
"ANALOGOUT",
@@ -4155,8 +4149,7 @@
41554149
"detect_code": ["0764"],
41564150
"macros_add": [
41574151
"MBED_TICKLESS",
4158-
"USBHOST_OTHER",
4159-
"MBED_SPLIT_HEAP"
4152+
"USBHOST_OTHER"
41604153
],
41614154
"device_has_add": [
41624155
"ANALOGOUT",
@@ -4187,7 +4180,7 @@
41874180
}
41884181
},
41894182
"detect_code": ["0468"],
4190-
"macros_add": ["USBHOST_OTHER", "MBED_SPLIT_HEAP"],
4183+
"macros_add": ["USBHOST_OTHER", "TWO_RAM_REGIONS"],
41914184
"device_has_add": [
41924185
"ANALOGOUT",
41934186
"CAN",
@@ -4220,8 +4213,7 @@
42204213
"detect_code": ["0820"],
42214214
"macros_add": [
42224215
"MBED_TICKLESS",
4223-
"USBHOST_OTHER",
4224-
"MBED_SPLIT_HEAP"
4216+
"USBHOST_OTHER"
42254217
],
42264218
"device_has_add": [
42274219
"ANALOGOUT",
@@ -4257,7 +4249,7 @@
42574249
"macros_add": [
42584250
"MBED_TICKLESS",
42594251
"USBHOST_OTHER",
4260-
"MBED_SPLIT_HEAP"
4252+
"TWO_RAM_REGIONS"
42614253
],
42624254
"device_has_add": [
42634255
"ANALOGOUT",
@@ -4369,9 +4361,6 @@
43694361
"FLASH",
43704362
"MPU"
43714363
],
4372-
"macros_add": [
4373-
"MBED_SPLIT_HEAP"
4374-
],
43754364
"release_versions": ["2", "5"],
43764365
"device_name": "STM32L471QG",
43774366
"bootloader_supported": true
@@ -5428,62 +5417,6 @@
54285417
"target.network-default-interface-type": "ETHERNET"
54295418
}
54305419
},
5431-
"ARM_MUSCA_A1": {
5432-
"public": false,
5433-
"inherits": ["Target"],
5434-
"default_toolchain": "ARMC6",
5435-
"extra_labels": ["ARM_SSG", "MUSCA_A1"],
5436-
"forced_reset_timeout": 7,
5437-
"release_versions": ["5"]
5438-
},
5439-
"ARM_MUSCA_A1_NS": {
5440-
"inherits": ["NSPE_Target", "ARM_MUSCA_A1"],
5441-
"core": "Cortex-M33-NS",
5442-
"supported_toolchains": ["ARMC6", "GCC_ARM", "IAR"],
5443-
"device_has_add": ["INTERRUPTIN", "LPTICKER", "SERIAL", "SLEEP", "USTICKER"],
5444-
"macros": [
5445-
"__STARTUP_CLEAR_BSS",
5446-
"MBED_FAULT_HANDLER_DISABLED",
5447-
"CMSIS_NVIC_VIRTUAL",
5448-
"LPTICKER_DELAY_TICKS=1",
5449-
"MBED_MPU_CUSTOM",
5450-
"MBEDTLS_PSA_CRYPTO_C"
5451-
],
5452-
"extra_labels_add": ["MUSCA_A1_NS", "PSA", "TFM"],
5453-
"post_binary_hook": {"function": "ArmMuscaA1Code.binary_hook"},
5454-
"secure_image_filename": "tfm.bin",
5455-
"overrides": {
5456-
"non-secure-rom-start": "0x000a0400",
5457-
"non-secure-rom-size": "0x5f800",
5458-
"non-secure-ram-start": "0x20011000",
5459-
"non-secure-ram-size": "0xf000"
5460-
}
5461-
},
5462-
"ARM_MUSCA_A1_S": {
5463-
"inherits": ["SPE_Target", "ARM_MUSCA_A1"],
5464-
"core": "Cortex-M33",
5465-
"supported_toolchains": ["ARMC6", "GCC_ARM"],
5466-
"device_has_add": ["FLASH"],
5467-
"macros": [
5468-
"__STARTUP_CLEAR_BSS_MULTIPLE",
5469-
"__STARTUP_COPY_MULTIPLE",
5470-
"MBED_MPU_CUSTOM",
5471-
"DAUTH_CHIP_DEFAULT",
5472-
"MBEDTLS_PSA_CRYPTO_SPM",
5473-
"MBEDTLS_PSA_CRYPTO_C",
5474-
"MBEDTLS_ENTROPY_NV_SEED"
5475-
],
5476-
"components_add": ["FLASHIAP"],
5477-
"extra_labels_add": ["MUSCA_A1_S", "PSA", "TFM"],
5478-
"deliver_to_target": "ARM_MUSCA_A1_NS",
5479-
"delivery_dir": "TARGET_ARM_SSG/TARGET_MUSCA_A1/TARGET_MUSCA_A1_NS/prebuilt",
5480-
"overrides": {
5481-
"secure-rom-start": "0x10020400",
5482-
"secure-rom-size": "0x7f800",
5483-
"secure-ram-start": "0x30000000",
5484-
"secure-ram-size": "0x11000"
5485-
}
5486-
},
54875420
"RZ_A1XX": {
54885421
"inherits": ["Target"],
54895422
"core": "Cortex-A9",
@@ -8163,7 +8096,6 @@
81638096
"device_name": "M2351KIAAEES",
81648097
"bootloader_supported": true,
81658098
"tickless-from-us-ticker": true,
8166-
"forced_reset_timeout": 3,
81678099
"mbed_rom_start" : "0x10040000",
81688100
"mbed_rom_size" : "0x40000",
81698101
"mbed_ram_start" : "0x30008000",
@@ -8484,6 +8416,52 @@
84848416
}
84858417
}
84868418
},
8419+
"FUTURE_SEQUANA_M0_PSA": {
8420+
"inherits": ["SPE_Target", "FUTURE_SEQUANA_M0"],
8421+
"components_add": ["SPM_MAILBOX", "FLASHIAP"],
8422+
"extra_labels_add": ["PSA", "MBED_SPM"],
8423+
"macros_add": [
8424+
"MBED_TICKLESS",
8425+
"PSOC6_DYNSRM_DISABLE=1",
8426+
"MBEDTLS_PSA_CRYPTO_SPM",
8427+
"MBEDTLS_PSA_CRYPTO_C",
8428+
"MBEDTLS_ENTROPY_NV_SEED"
8429+
],
8430+
"deliver_to_target": "FUTURE_SEQUANA_PSA",
8431+
"delivery_dir": "TARGET_Cypress/TARGET_PSOC6_FUTURE/TARGET_FUTURE_SEQUANA_PSA/prebuilt",
8432+
"overrides": {
8433+
"secure-rom-start": "0x10000000",
8434+
"secure-rom-size": "0x80000",
8435+
"non-secure-rom-start": "0x10080000",
8436+
"non-secure-rom-size": "0x78000",
8437+
"secure-ram-start": "0x08000000",
8438+
"secure-ram-size": "0x10000",
8439+
"non-secure-ram-start": "0x08010000",
8440+
"non-secure-ram-size": "0x37700",
8441+
"shared-ram-start": "0x08047700",
8442+
"shared-ram-size": "0x100"
8443+
}
8444+
},
8445+
"FUTURE_SEQUANA_PSA": {
8446+
"inherits": ["NSPE_Target", "FUTURE_SEQUANA"],
8447+
"extra_labels_add": ["PSA", "MBED_SPM"],
8448+
"extra_labels_remove": ["CORDIO"],
8449+
"components_add": ["SPM_MAILBOX", "FLASHIAP"],
8450+
"macros_add": ["PSOC6_DYNSRM_DISABLE=1", "MBEDTLS_PSA_CRYPTO_C"],
8451+
"hex_filename": "psa_release_1.0.hex",
8452+
"overrides": {
8453+
"secure-rom-start": "0x10000000",
8454+
"secure-rom-size": "0x80000",
8455+
"non-secure-rom-start": "0x10080000",
8456+
"non-secure-rom-size": "0x78000",
8457+
"secure-ram-start": "0x08000000",
8458+
"secure-ram-size": "0x10000",
8459+
"non-secure-ram-start": "0x08010000",
8460+
"non-secure-ram-size": "0x37700",
8461+
"shared-ram-start": "0x08047700",
8462+
"shared-ram-size": "0x100"
8463+
}
8464+
},
84878465
"TMPM3HQ": {
84888466
"inherits": ["Target"],
84898467
"core": "Cortex-M3",

0 commit comments

Comments
 (0)