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

make protected secure flash region configurable and change secure and non secure default region sizes

pull/10034/head
Evgeni Bolotin 2019-03-11 13:57:12 +02:00
parent 84e4decad0
commit 04c5803131
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_WIFI_BT_M0_PSA/cyprotection_config.h
View File

@ -42,10 +42,35 @@ CY_PROT_PCMASK3 + CY_PROT_PCMASK4)
#define ALL_SUBREGIONS (0x0) #define ALL_SUBREGIONS (0x0)
/* protected rom region size */
#if PSA_SECURE_ROM_SIZE == 0x20000
#define CY_PROT_ROM_REGION_SIZE CY_PROT_SIZE_128KB /* 0x20000 */
#elif PSA_SECURE_ROM_SIZE == 0x40000
#define CY_PROT_ROM_REGION_SIZE CY_PROT_SIZE_256KB /* 0x40000 */
#elif PSA_SECURE_ROM_SIZE == 0x80000
#define CY_PROT_ROM_REGION_SIZE CY_PROT_SIZE_512KB /* 0x80000 */
#else
#error unsupported protected rom region size - not aligned or out of range
#endif
/* protected ram region size */
#if PSA_SECURE_RAM_SIZE == 0x10000
#define CY_PROT_RAM_REGION_SIZE CY_PROT_SIZE_64KB /* 0x10000 */
#elif PSA_SECURE_RAM_SIZE == 0x20000
#define CY_PROT_RAM_REGION_SIZE CY_PROT_SIZE_128KB /* 0x20000 */
#else
#error unsupported protected ram region size - not aligned or out of range
#endif
const cy_smpu_region_config_t flash_spm_smpu_config[] = { const cy_smpu_region_config_t flash_spm_smpu_config[] = {
{ /* FLASH_PC1_SPM */ { /* FLASH_PC1_SPM */
.address = (uint32_t *)PSA_SECURE_ROM_START, /* 0x10000000 */ .address = (uint32_t *)PSA_SECURE_ROM_START, /* 0x10000000 */
.regionSize = CY_PROT_SIZE_512KB, /* 0x80000 */ .regionSize = CY_PROT_ROM_REGION_SIZE,
.subregions = ALL_SUBREGIONS, .subregions = ALL_SUBREGIONS,
.userPermission = CY_PROT_PERM_RWX, .userPermission = CY_PROT_PERM_RWX,
.privPermission = CY_PROT_PERM_RWX, .privPermission = CY_PROT_PERM_RWX,
@ -62,7 +87,7 @@ const cy_smpu_region_config_t flash_spm_smpu_config[] = {
const cy_smpu_region_config_t sram_spm_smpu_config[] = { const cy_smpu_region_config_t sram_spm_smpu_config[] = {
{ /* SRAM_SPM_PRIV - must include SRAM_SPM_PUB area */ { /* SRAM_SPM_PRIV - must include SRAM_SPM_PUB area */
.address = (uint32_t *)PSA_SECURE_RAM_START, /* 0x08020000 */ .address = (uint32_t *)PSA_SECURE_RAM_START, /* 0x08020000 */
.regionSize = CY_PROT_SIZE_64KB, /* 0x10000 */ .regionSize = CY_PROT_RAM_REGION_SIZE,
.subregions = ALL_SUBREGIONS, /* 0xC0, /*Size 0xC000 ALL_SUBREGIONS,*/ .subregions = ALL_SUBREGIONS, /* 0xC0, /*Size 0xC000 ALL_SUBREGIONS,*/
.userPermission = CY_PROT_PERM_DISABLED, .userPermission = CY_PROT_PERM_DISABLED,
.privPermission = CY_PROT_PERM_RWX, .privPermission = CY_PROT_PERM_RWX,

12
targets/targets.json
View File

@ -8049,9 +8049,9 @@
"delivery_dir": "TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_WIFI_BT_PSA/prebuilt", "delivery_dir": "TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_WIFI_BT_PSA/prebuilt",
"overrides": { "overrides": {
"secure-rom-start": "0x10000000", "secure-rom-start": "0x10000000",
"secure-rom-size": "0x80000", "secure-rom-size": "0x40000",
"non-secure-rom-start": "0x10080000", "non-secure-rom-start": "0x10040000",
"non-secure-rom-size": "0x78000", "non-secure-rom-size": "0xB8000",
"secure-ram-start": "0x08000000", "secure-ram-start": "0x08000000",
"secure-ram-size": "0x10000", "secure-ram-size": "0x10000",
"non-secure-ram-start": "0x08010000", "non-secure-ram-start": "0x08010000",
@ -8071,9 +8071,9 @@
"hex_filename": "psa_release_1.0.hex", "hex_filename": "psa_release_1.0.hex",
"overrides": { "overrides": {
"secure-rom-start": "0x10000000", "secure-rom-start": "0x10000000",
"secure-rom-size": "0x80000", "secure-rom-size": "0x40000",
"non-secure-rom-start": "0x10080000", "non-secure-rom-start": "0x10040000",
"non-secure-rom-size": "0x78000", "non-secure-rom-size": "0xB8000",
"secure-ram-start": "0x08000000", "secure-ram-start": "0x08000000",
"secure-ram-size": "0x10000", "secure-ram-size": "0x10000",
"non-secure-ram-start": "0x08010000", "non-secure-ram-start": "0x08010000",