From cee055d7eb1c9178f3fca8d576a2cd6bb21aaed6 Mon Sep 17 00:00:00 2001 From: Breno Lima Date: Thu, 13 Dec 2018 17:42:55 -0200 Subject: [PATCH] MLK-20583-1 imx: mx6sabresd: Enable OCOTP CTRL clock in DCD and plugin The HAB code can not set Field Return and SRK Revoke sticky bits in case OCOTP CTRL clock is gated out. In case we disable OCOTP CTRL clock in DCD and plugin those features may not operate as expected. Keep OCOTP CTRL clock enabled in DCD and plugin so HAB can propely lock those features, users should use the CSF Unlock command to prevent those features from being locked. Signed-off-by: Breno Lima (cherry picked from commit fe78359704fa5c5199daf0274019ae58980bc710) --- board/freescale/mx6sabresd/mx6dlsabresd.cfg | 2 +- board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg | 2 +- board/freescale/mx6sabresd/mx6qp.cfg | 2 +- board/freescale/mx6sabresd/mx6qp_optee.cfg | 2 +- board/freescale/mx6sabresd/mx6solo_4x_mt41j128.cfg | 2 +- board/freescale/mx6sabresd/plugin.S | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/board/freescale/mx6sabresd/mx6dlsabresd.cfg b/board/freescale/mx6sabresd/mx6dlsabresd.cfg index b3c916f..07fb280 100644 --- a/board/freescale/mx6sabresd/mx6dlsabresd.cfg +++ b/board/freescale/mx6sabresd/mx6dlsabresd.cfg @@ -136,7 +136,7 @@ DATA 4 0x021b001c 0x00000000 /* set the default clock gate to save power */ DATA 4 0x020c4068 0x00C03F3F DATA 4 0x020c406c 0x0030FC03 -DATA 4 0x020c4070 0x0FFFC000 +DATA 4 0x020c4070 0x0FFFF000 DATA 4 0x020c4074 0x3FF00000 DATA 4 0x020c4078 0x00FFF300 DATA 4 0x020c407c 0x0F0000C3 diff --git a/board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg b/board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg index 0e70a50..41ef703 100644 --- a/board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg +++ b/board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg @@ -135,7 +135,7 @@ DATA 4 0x021b001c 0x00000000 /* set the default clock gate to save power */ DATA 4 0x020c4068 0x00C03F3F DATA 4 0x020c406c 0x0030FC03 -DATA 4 0x020c4070 0x0FFFC000 +DATA 4 0x020c4070 0x0FFFF000 DATA 4 0x020c4074 0x3FF00000 DATA 4 0x020c4078 0x00FFF300 DATA 4 0x020c407c 0x0F0000F3 diff --git a/board/freescale/mx6sabresd/mx6qp.cfg b/board/freescale/mx6sabresd/mx6qp.cfg index e97863d..e53603d 100644 --- a/board/freescale/mx6sabresd/mx6qp.cfg +++ b/board/freescale/mx6sabresd/mx6qp.cfg @@ -147,7 +147,7 @@ DATA 4, 0x021b001c, 0x00000000 /* set the default clock gate to save power */ DATA 4, 0x020c4068, 0x00C03F3F DATA 4, 0x020c406c, 0x0030FC03 -DATA 4, 0x020c4070, 0x0FFFC000 +DATA 4, 0x020c4070, 0x0FFFF000 DATA 4, 0x020c4074, 0x3FF00000 DATA 4, 0x020c4078, 0x00FFF300 DATA 4, 0x020c407c, 0x0F0000F3 diff --git a/board/freescale/mx6sabresd/mx6qp_optee.cfg b/board/freescale/mx6sabresd/mx6qp_optee.cfg index ad77eb4..70b4420 100644 --- a/board/freescale/mx6sabresd/mx6qp_optee.cfg +++ b/board/freescale/mx6sabresd/mx6qp_optee.cfg @@ -147,7 +147,7 @@ DATA 4, 0x021b001c, 0x00000000 /* set the default clock gate to save power */ DATA 4, 0x020c4068, 0x00C03F3F DATA 4, 0x020c406c, 0x0030FC03 -DATA 4, 0x020c4070, 0x0FFFC000 +DATA 4, 0x020c4070, 0x0FFFF000 DATA 4, 0x020c4074, 0x3FF00000 DATA 4, 0x020c4078, 0x00FFF300 DATA 4, 0x020c407c, 0x0F0000F3 diff --git a/board/freescale/mx6sabresd/mx6solo_4x_mt41j128.cfg b/board/freescale/mx6sabresd/mx6solo_4x_mt41j128.cfg index 41eef4f..ec37548 100644 --- a/board/freescale/mx6sabresd/mx6solo_4x_mt41j128.cfg +++ b/board/freescale/mx6sabresd/mx6solo_4x_mt41j128.cfg @@ -111,7 +111,7 @@ DATA 4, 0x021b001c, 0x00000000 /* set the default clock gate to save power */ DATA 4, 0x020c4068, 0x00C03F3F DATA 4, 0x020c406c, 0x0030FC03 -DATA 4, 0x020c4070, 0x0FFFC000 +DATA 4, 0x020c4070, 0x0FFFF000 DATA 4, 0x020c4074, 0x3FF00000 DATA 4, 0x020c4078, 0x00FFF300 DATA 4, 0x020c407c, 0x0F0000C3 diff --git a/board/freescale/mx6sabresd/plugin.S b/board/freescale/mx6sabresd/plugin.S index 7354232..d99349f 100644 --- a/board/freescale/mx6sabresd/plugin.S +++ b/board/freescale/mx6sabresd/plugin.S @@ -636,7 +636,7 @@ str r1, [r0, #0x068] ldr r1, =0x0030FC03 str r1, [r0, #0x06c] - ldr r1, =0x0FFFC000 + ldr r1, =0x0FFFF000 str r1, [r0, #0x070] ldr r1, =0x3FF00000 str r1, [r0, #0x074] -- 1.9.1