secure_boot: change error handler for esbc_validate

In case of error while executing esbc_validate command, SNVS
transition and issue of reset is required only for secure-boot.
If boot mode is non-secure, this is not required.

Similarly, esbc_halt command which puts the core in Spin Loop
is applicable only for Secure Boot.

Signed-off-by: Aneesh Bansal <aneesh.bansal@nxp.com>
Acked-by: Ruchika Gupta <ruchika.gupta@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>

diff --git a/board/freescale/common/cmd_esbc_validate.c b/board/freescale/common/cmd_esbc_validate.c
index ca7c73755e26775344fdb6efa2854b92330910ea..dfa3e2100edf06cb65cb1e3c4996ab207af4fcc5 100644 (file)
--- a/board/freescale/common/cmd_esbc_validate.c
+++ b/board/freescale/common/cmd_esbc_validate.c
@@ -11,6 +11,11 @@
 static int do_esbc_halt(cmd_tbl_t *cmdtp, int flag, int argc,
                                char * const argv[])
 {
+       if (fsl_check_boot_mode_secure() == 0) {
+               printf("Boot Mode is Non-Secure. Not entering spin loop.\n");
+               return 0;
+       }
+
        printf("Core is entering spin loop.\n");
 loop:
        goto loop;
@@ -64,6 +69,6 @@ U_BOOT_CMD(
 
 U_BOOT_CMD(
        esbc_halt,      1,      0,      do_esbc_halt,
-       "Put the core in spin loop ",
+       "Put the core in spin loop (Secure Boot Only)",
        ""
 );

diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c
index de40081a7b765b8f32a04c7c0a5f799247662a72..8fd6dd63b1d5f068afc72421346833f81dbcab20 100644 (file)
--- a/board/freescale/common/fsl_validate.c
+++ b/board/freescale/common/fsl_validate.c
@@ -370,6 +370,13 @@ void fsl_secboot_handle_error(int error)
                        printf("ERROR :: %x :: %s\n", error, e->name);
        }
 
+       /* If Boot Mode is secure, transition the SNVS state and issue
+        * reset based on type of failure and ITS setting.
+        * If Boot mode is non-secure, return from this function.
+        */
+       if (fsl_check_boot_mode_secure() == 0)
+               return;
+
        switch (error) {
        case ERROR_ESBC_CLIENT_HEADER_BARKER:
        case ERROR_ESBC_CLIENT_HEADER_IMG_SIZE: