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.

Reviewed-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c
index cf3c7d762a74c3946ec8c74f459ce18a0144dc00..361c578efc855b5c09389eee07a644286cd0a471 100644 (file)
--- a/arch/arm/mach-imx/imx8/ahab.c
+++ b/arch/arm/mach-imx/imx8/ahab.c
@@ -75,7 +75,7 @@ int authenticate_os_container(ulong addr)
        memcpy((void *)SEC_SECURE_RAM_BASE, (const void *)addr,
               ALIGN(length, CONFIG_SYS_CACHELINE_SIZE));
 
        memcpy((void *)SEC_SECURE_RAM_BASE, (const void *)addr,
               ALIGN(length, CONFIG_SYS_CACHELINE_SIZE));
 

-       err = sc_seco_authenticate(-1, SC_MISC_AUTH_CONTAINER,
+       err = sc_seco_authenticate(-1, SC_SECO_AUTH_CONTAINER,

                                   SECO_LOCAL_SEC_SEC_SECURE_RAM_BASE);
        if (err) {
                printf("Authenticate container hdr failed, return %d\n",
                                   SECO_LOCAL_SEC_SEC_SECURE_RAM_BASE);
        if (err) {
                printf("Authenticate container hdr failed, return %d\n",


@@ -123,7 +123,7 @@ int authenticate_os_container(ulong addr)
                        goto exit;
                }
 
                        goto exit;
                }
 

-               err = sc_seco_authenticate(-1, SC_MISC_VERIFY_IMAGE,
+               err = sc_seco_authenticate(-1, SC_SECO_VERIFY_IMAGE,

                                           (1 << i));
                if (err) {
                        printf("Authenticate img %d failed, return %d\n",
                                           (1 << i));
                if (err) {
                        printf("Authenticate img %d failed, return %d\n",


@@ -144,7 +144,7 @@ int authenticate_os_container(ulong addr)
        }
 
 exit:
        }
 
 exit:

-       if (sc_seco_authenticate(-1, SC_MISC_REL_CONTAINER, 0) != SC_ERR_NONE)
+       if (sc_seco_authenticate(-1, SC_SECO_REL_CONTAINER, 0) != SC_ERR_NONE)

                printf("Error: release container failed!\n");
 
        return ret;
                printf("Error: release container failed!\n");
 
        return ret;

diff --git a/arch/arm/mach-imx/imx8/parse-container.c b/arch/arm/mach-imx/imx8/parse-container.c
index e192b0c6d207de3d773c13f8ea67dec7bbca7b5d..62e5b456109a4132befc2dac03c59ac5044a9848 100644 (file)
--- a/arch/arm/mach-imx/imx8/parse-container.c
+++ b/arch/arm/mach-imx/imx8/parse-container.c
@@ -49,7 +49,7 @@ static int authenticate_image(struct boot_img_t *img, int image_index)
                return -EPERM;
        }
 
                return -EPERM;
        }
 

-       err = sc_seco_authenticate(-1, SC_MISC_VERIFY_IMAGE,
+       err = sc_seco_authenticate(-1, SC_SECO_VERIFY_IMAGE,

                                   1 << image_index);
        if (err) {
                printf("authenticate img %d failed, return %d\n",
                                   1 << image_index);
        if (err) {
                printf("authenticate img %d failed, return %d\n",


@@ -168,7 +168,7 @@ static int read_auth_container(struct spl_image_info *spl_image,
        memcpy((void *)SEC_SECURE_RAM_BASE, (const void *)container,
               ALIGN(length, CONFIG_SYS_CACHELINE_SIZE));
 
        memcpy((void *)SEC_SECURE_RAM_BASE, (const void *)container,
               ALIGN(length, CONFIG_SYS_CACHELINE_SIZE));
 

-       ret = sc_seco_authenticate(-1, SC_MISC_AUTH_CONTAINER,
+       ret = sc_seco_authenticate(-1, SC_SECO_AUTH_CONTAINER,

                                   SECO_LOCAL_SEC_SEC_SECURE_RAM_BASE);
        if (ret) {
                printf("authenticate container hdr failed, return %d\n", ret);
                                   SECO_LOCAL_SEC_SEC_SECURE_RAM_BASE);
        if (ret) {
                printf("authenticate container hdr failed, return %d\n", ret);


@@ -194,7 +194,7 @@ static int read_auth_container(struct spl_image_info *spl_image,
 
 end_auth:
 #ifdef CONFIG_AHAB_BOOT
 
 end_auth:
 #ifdef CONFIG_AHAB_BOOT

-       if (sc_seco_authenticate(-1, SC_MISC_REL_CONTAINER, 0))
+       if (sc_seco_authenticate(-1, SC_SECO_REL_CONTAINER, 0))

                printf("Error: release container failed!\n");
 #endif
        return ret;
                printf("Error: release container failed!\n");
 #endif
        return ret;