Skip to content

Fix bare metal builds on Cypress targets #13864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 11, 2020
Merged

Fix bare metal builds on Cypress targets #13864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7641f1c
CYTFM_064B0S2_4343W: use cytfm_flash only if TFM and PSA are present
LDong-Arm Nov 4, 2020
810884b
Add mbed_lib.json for PSOC6 SCL to exclude it from build metal build
LDong-Arm Nov 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_SCL/mbed_lib.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"name": "cy_psoc6_scl"
}
2 changes: 1 addition & 1 deletion targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYTFM_064B0S2_4343W/cytfm_flash_info.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
4 changes: 2 additions & 2 deletions targets/TARGET_Cypress/TARGET_PSOC6/cy_flash_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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));
Expand Down