summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBreno Lima <breno.lima@nxp.com>2018-12-13 17:45:07 -0200
committerYe Li <ye.li@nxp.com>2018-12-19 19:30:26 -0800
commit9a3d4a6b8470980c4d4f938619a9d34a9282a69c (patch)
treeae21c74b04c15120c6b274176ef4f9e47c0dce23
parentcee055d7eb1c9178f3fca8d576a2cd6bb21aaed6 (diff)
MLK-20583-2 imx: mx6sabreauto: 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 <breno.lima@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 2ee4bd12140fa9a29ad1a7cb5016b78e4a4077f1)
-rw-r--r--board/freescale/mx6sabreauto/imximage.cfg2
-rw-r--r--board/freescale/mx6sabreauto/mx6dl.cfg2
-rw-r--r--board/freescale/mx6sabreauto/mx6qp.cfg2
-rw-r--r--board/freescale/mx6sabreauto/mx6solo.cfg2
-rw-r--r--board/freescale/mx6sabreauto/plugin.S2
5 files changed, 5 insertions, 5 deletions
diff --git a/board/freescale/mx6sabreauto/imximage.cfg b/board/freescale/mx6sabreauto/imximage.cfg
index e109a833ea..4c97e8ff6a 100644
--- a/board/freescale/mx6sabreauto/imximage.cfg
+++ b/board/freescale/mx6sabreauto/imximage.cfg
@@ -143,7 +143,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 0xFFFFF300
DATA 4 0x020c407c 0x0F0000F3
diff --git a/board/freescale/mx6sabreauto/mx6dl.cfg b/board/freescale/mx6sabreauto/mx6dl.cfg
index 8eff03d8aa..8d01d4b879 100644
--- a/board/freescale/mx6sabreauto/mx6dl.cfg
+++ b/board/freescale/mx6sabreauto/mx6dl.cfg
@@ -144,7 +144,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 0xFFFFF300
DATA 4 0x020c407c 0x0F0000C3
diff --git a/board/freescale/mx6sabreauto/mx6qp.cfg b/board/freescale/mx6sabreauto/mx6qp.cfg
index 4511971039..23e94d02f7 100644
--- a/board/freescale/mx6sabreauto/mx6qp.cfg
+++ b/board/freescale/mx6sabreauto/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, 0xFFFFF300
DATA 4, 0x020c407c, 0x0F0000F3
diff --git a/board/freescale/mx6sabreauto/mx6solo.cfg b/board/freescale/mx6sabreauto/mx6solo.cfg
index c7d6f591c1..abce4f9ea6 100644
--- a/board/freescale/mx6sabreauto/mx6solo.cfg
+++ b/board/freescale/mx6sabreauto/mx6solo.cfg
@@ -120,7 +120,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, 0xFFFFF300
DATA 4, 0x020c407c, 0x0F0000C3
diff --git a/board/freescale/mx6sabreauto/plugin.S b/board/freescale/mx6sabreauto/plugin.S
index 8e3c23c468..6301ae1990 100644
--- a/board/freescale/mx6sabreauto/plugin.S
+++ b/board/freescale/mx6sabreauto/plugin.S
@@ -621,7 +621,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]