ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13864 from LDong-Arm/cypress_baremetal_fixes 

Fix bare metal builds on Cypress targets
pull/13904/head
Martin Kojtal 2020-11-11 08:55:39 +00:00 committed by GitHub
parent 3555ada459 810884b448
commit f867a949a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_SCL/mbed_lib.json Normal file
View File

@ -0,0 +1,3 @@
{
"name": "cy_psoc6_scl"
}

2
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYTFM_064B0S2_4343W/cytfm_flash_info.c
View File

@ -26,7 +26,7 @@
#include "region_defs.h"
#include "cytfm_flash_info.h"
#if DEVICE_FLASH
#if DEVICE_FLASH && defined(TARGET_TFM) && MBED_CONF_PSA_PRESENT
#ifdef __cplusplus
extern "C" {

4
targets/TARGET_Cypress/TARGET_PSOC6/cy_flash_api.c
View File

@ -17,7 +17,7 @@
#include "flash_api.h"
#include "cyhal_flash.h"
#ifdef TARGET_TFM
#if defined(TARGET_TFM) && MBED_CONF_PSA_PRESENT
#include "cytfm_flash_info.h"
#endif
@ -32,7 +32,7 @@ int32_t flash_init(flash_t *obj)
if (CY_RSLT_SUCCESS != cyhal_flash_init(&(obj->flash))) {
return -1;
}
#ifdef TARGET_TFM
#if defined(TARGET_TFM) && MBED_CONF_PSA_PRESENT
cytfm_flash_get_info(&(obj->flash), &(obj->info));
#else /* TARGET_TFM */
cyhal_flash_get_info(&(obj->flash), &(obj->info));