Merge pull request #9605 from kfnta/alzix/pelion-psa

Restore MBEDTLS_PSA_CRYPTO_C for PSA targets
pull/9677/head
Cruz Monrreal 2019-02-11 18:46:12 -06:00 committed by GitHub
commit 87a9d7c45a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions

View File

@ -1747,7 +1747,7 @@
"PSA" "PSA"
], ],
"is_disk_virtual": true, "is_disk_virtual": true,
"macros": ["CPU_MK66FN2M0VMD18", "FSL_RTOS_MBED"], "macros": ["CPU_MK66FN2M0VMD18", "FSL_RTOS_MBED", "MBEDTLS_PSA_CRYPTO_C"],
"inherits": ["Target"], "inherits": ["Target"],
"detect_code": ["0311"], "detect_code": ["0311"],
"device_has": [ "device_has": [
@ -2439,7 +2439,7 @@
"macro_name": "CLOCK_SOURCE_USB" "macro_name": "CLOCK_SOURCE_USB"
} }
}, },
"macros_add": ["USB_STM_HAL", "USBHOST_OTHER"], "macros_add": ["USB_STM_HAL", "USBHOST_OTHER", "MBEDTLS_PSA_CRYPTO_C"],
"device_has_add": [ "device_has_add": [
"SERIAL_ASYNCH", "SERIAL_ASYNCH",
"FLASH", "FLASH",
@ -2688,7 +2688,8 @@
"components_add": ["FLASHIAP"], "components_add": ["FLASHIAP"],
"macros_add": [ "macros_add": [
"USB_STM_HAL", "USB_STM_HAL",
"USBHOST_OTHER" "USBHOST_OTHER",
"MBEDTLS_PSA_CRYPTO_C"
], ],
"device_has_add": [ "device_has_add": [
"ANALOGOUT", "ANALOGOUT",
@ -4235,6 +4236,9 @@
"device_has_remove": [], "device_has_remove": [],
"extra_labels_add": ["PSA"], "extra_labels_add": ["PSA"],
"components_add": ["FLASHIAP"], "components_add": ["FLASHIAP"],
"macros_add": [
"MBEDTLS_PSA_CRYPTO_C"
],
"config": { "config": {
"stdio_uart_tx_help": { "stdio_uart_tx_help": {
"help": "Value: D8(default) or D1" "help": "Value: D8(default) or D1"