andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1687 from ldts/rcar_gen3/maintain_4 

rcar-gen3: lock RPC hyper-flash access
This commit is contained in:
Antonio Niño Díaz 2018-11-22 14:59:38 +01:00 committed by GitHub
parent c385955764 6e93392b7a
commit 0668e5a877
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plat/renesas/rcar/bl2_secure_setting.c
View File

@ -66,7 +66,9 @@ static const struct {
/* {SEC_SEL12, 0xFFFFFFFFU}, */
/* Bit22: RPC slave ports. */
/* 0: registers accessed from secure resource only. */
/* {SEC_SEL13, 0xFFBFFFFFU},*/
#if (RCAR_RPC_HYPERFLASH_LOCKED == 1)
{SEC_SEL13, 0xFFBFFFFFU},
#endif
/* Bit27: System Timer (SCMT) slave ports */
/* 0: registers accessed from secure resource only */
/* Bit26: System Watchdog Timer (SWDT) slave ports */
@ -183,8 +185,10 @@ static const struct {
/** Security group 1 attribute setting for slave ports 13 */
/* Bit22: RPC slave ports. */
/* SecurityGroup3 */
/* {SEC_GRP0COND13, 0x00400000U}, */
/* {SEC_GRP1COND13, 0x00400000U}, */
#if (RCAR_RPC_HYPERFLASH_LOCKED == 1)
{SEC_GRP0COND13, 0x00400000U},
{SEC_GRP1COND13, 0x00400000U},
#endif
/** Security group 0 attribute setting for slave ports 14 */
/** Security group 1 attribute setting for slave ports 14 */
/* Bit26: System Timer (SCMT) slave ports */

7
plat/renesas/rcar/platform.mk
View File

@ -137,6 +137,13 @@ else
$(eval $(call add_define,RCAR_LSI))
endif
# lock RPC HYPERFLASH access by default
# unlock to repogram the ATF firmware from u-boot
ifndef RCAR_RPC_HYPERFLASH_LOCKED
RCAR_RPC_HYPERFLASH_LOCKED := 1
endif
$(eval $(call add_define,RCAR_RPC_HYPERFLASH_LOCKED))
# Process RCAR_SECURE_BOOT flag
ifndef RCAR_SECURE_BOOT
RCAR_SECURE_BOOT := 1