From: Jorge Ramirez-Ortiz Date: Mon, 19 Nov 2018 18:26:56 +0000 (+0100) Subject: rcar-gen3: control RPC hyper-flash access X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6e93392b7a761c43c1f4b5b564fe57c51d806388;p=project%2Fbcm63xx%2Fatf.git rcar-gen3: control RPC hyper-flash access RCAR_RPC_HYPERFLASH_LOCKED can be set to 0 as a build option if the user needs to allow u-boot to reprogram the ATF firmware using a FIP image (as a faster alternative of toggling numerous DIP switches on the board and using ascii-xfer of srec files) The code being controlled with this commit should only be re-enabled for debugging (_never_ on a product release) Signed-off-by: Jorge Ramirez-Ortiz --- diff --git a/plat/renesas/rcar/bl2_secure_setting.c b/plat/renesas/rcar/bl2_secure_setting.c index 35c658c0..c0d49deb 100644 --- a/plat/renesas/rcar/bl2_secure_setting.c +++ b/plat/renesas/rcar/bl2_secure_setting.c @@ -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 */ diff --git a/plat/renesas/rcar/platform.mk b/plat/renesas/rcar/platform.mk index 95b7902f..f7d6216a 100644 --- a/plat/renesas/rcar/platform.mk +++ b/plat/renesas/rcar/platform.mk @@ -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