Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 206c8a0e7a628966697cf89918955021b08980f2

Authored by Ye Li
1 parent 71e4d73734
Exists in smarc_8mm-imx_v2019.04_4.19.35_1.1.0 and in 1 other branch smarc_8m-imx_v2019.04_4.19.35_1.1.0

MLK-22757-2 imx8: Change to use new SECO API commands 

Latest SCFW has removed old MISC SECO commands. So update the codes
to use new SECO commands.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 8e54efce6d2a1691605ae23983ff91f4a702adba)

Showing 4 changed files with 8 additions and 8 deletions Side-by-side Diff

arch/arm/mach-imx/imx8/ahab.c
Diff comments   View file @ 206c8a0
... ... @@ -74,7 +74,7 @@
74 74 debug("container length %u\n", length);
75 75 memcpy((void *)SEC_SECURE_RAM_BASE, (const void *)addr, ALIGN(length, CONFIG_SYS_CACHELINE_SIZE));
76 76  
77   - err = sc_seco_authenticate(-1, SC_MISC_AUTH_CONTAINER, SECO_LOCAL_SEC_SEC_SECURE_RAM_BASE);
  77 + err = sc_seco_authenticate(-1, SC_SECO_AUTH_CONTAINER, SECO_LOCAL_SEC_SEC_SECURE_RAM_BASE);
78 78 if (err) {
79 79 printf("Error: authenticate container hdr failed, return %d\n", err);
80 80 ret = -EIO;
... ... @@ -112,7 +112,7 @@
112 112 goto exit;
113 113 }
114 114  
115   - err = sc_seco_authenticate(-1, SC_MISC_VERIFY_IMAGE, (1 << i));
  115 + err = sc_seco_authenticate(-1, SC_SECO_VERIFY_IMAGE, (1 << i));
116 116 if (err) {
117 117 printf("Error: authenticate img %d failed, return %d\n", i, err);
118 118 ret = -EIO;
... ... @@ -129,7 +129,7 @@
129 129 }
130 130  
131 131 exit:
132   - if (sc_seco_authenticate(-1, SC_MISC_REL_CONTAINER, 0) != SC_ERR_NONE)
  132 + if (sc_seco_authenticate(-1, SC_SECO_REL_CONTAINER, 0) != SC_ERR_NONE)
133 133 printf("Error: release container failed!\n");
134 134  
135 135 return ret;
arch/arm/mach-imx/imx8/parser.c
Diff comments   View file @ 206c8a0
... ... @@ -128,7 +128,7 @@
128 128 return -EPERM;
129 129 }
130 130  
131   - err = sc_seco_authenticate(-1, SC_MISC_VERIFY_IMAGE,
  131 + err = sc_seco_authenticate(-1, SC_SECO_VERIFY_IMAGE,
132 132 1 << image_index);
133 133 if (err) {
134 134 printf("authenticate img %d failed, return %d\n",
... ... @@ -229,7 +229,7 @@
229 229 memcpy((void *)SEC_SECURE_RAM_BASE, (const void *)container,
230 230 ALIGN(length, CONFIG_SYS_CACHELINE_SIZE));
231 231  
232   - ret = sc_seco_authenticate(-1, SC_MISC_AUTH_CONTAINER,
  232 + ret = sc_seco_authenticate(-1, SC_SECO_AUTH_CONTAINER,
233 233 SECO_LOCAL_SEC_SEC_SECURE_RAM_BASE);
234 234 if (ret) {
235 235 printf("authenticate container hdr failed, return %d\n", ret);
... ... @@ -260,7 +260,7 @@
260 260  
261 261 end_auth:
262 262 #ifdef CONFIG_AHAB_BOOT
263   - if (sc_seco_authenticate(-1, SC_MISC_REL_CONTAINER, 0) != SC_ERR_NONE)
  263 + if (sc_seco_authenticate(-1, SC_SECO_REL_CONTAINER, 0) != SC_ERR_NONE)
264 264 printf("Error: release container failed!\n");
265 265 #endif
266 266 out:
drivers/video/imx/hdp_load.c
Diff comments   View file @ 206c8a0
... ... @@ -88,7 +88,7 @@
88 88  
89 89 s = env_get("hdp_authenticate_fw");
90 90 if (s && !strcmp(s, "yes"))
91   - SC_MISC_AUTH(-1, SC_MISC_SECO_AUTH_HDMI_TX_FW, 0);
  91 + SC_MISC_AUTH(-1, SC_SECO_AUTH_HDMI_TX_FW, 0);
92 92  
93 93 display_enable_clocks(OFF);
94 94 printf("Loading hdp firmware Complete\n");
drivers/video/imx/hdprx_load.c
Diff comments   View file @ 206c8a0
... ... @@ -56,7 +56,7 @@
56 56  
57 57 s = env_get("hdprx_authenticate_fw");
58 58 if (s && !strcmp(s, "yes"))
59   - SC_MISC_AUTH(-1, SC_MISC_SECO_AUTH_HDMI_RX_FW, 0);
  59 + SC_MISC_AUTH(-1, SC_SECO_AUTH_HDMI_RX_FW, 0);
60 60 printf("Loading hdp rx firmware Complete\n");
61 61 /* do not turn off hdmi power or firmware load will be lost */
62 62 } else {