]> git.baikalelectronics.ru Git - arm-tf.git/commitdiff
optee: print header info before validate
authorVictor Chong <victor.chong@linaro.org>
Fri, 26 Jan 2018 07:10:07 +0000 (16:10 +0900)
committerVictor Chong <victor.chong@linaro.org>
Wed, 7 Feb 2018 17:17:24 +0000 (02:17 +0900)
Currently optee header info is only printed after it is validated,
but this does not help with debugging in case of error, so print it
before.

Signed-off-by: Victor Chong <victor.chong@linaro.org>
lib/optee/optee_utils.c

index 87e52bd18854b05755c0c5e4dafc6b12fdb49d66..ac51265ed4498af6917353c5068cd81b939bad23 100644 (file)
@@ -140,6 +140,15 @@ int parse_optee_header(entry_point_info_t *header_ep,
        optee_header = (optee_header_t *)header_ep->pc;
        assert(optee_header);
 
+       /* Print the OPTEE header information */
+       INFO("OPTEE ep=0x%x\n", (unsigned int)header_ep->pc);
+       INFO("OPTEE header info:\n");
+       INFO("      magic=0x%x\n", optee_header->magic);
+       INFO("      version=0x%x\n", optee_header->version);
+       INFO("      arch=0x%x\n", optee_header->arch);
+       INFO("      flags=0x%x\n", optee_header->flags);
+       INFO("      nb_images=0x%x\n", optee_header->nb_images);
+
        /*
         * OPTEE image has 3 types:
         *
@@ -167,15 +176,6 @@ int parse_optee_header(entry_point_info_t *header_ep,
                return 0;
        }
 
-       /* Print the OPTEE header information */
-       INFO("OPTEE ep=0x%x\n", (unsigned int)header_ep->pc);
-       INFO("OPTEE header info:\n");
-       INFO("      magic=0x%x\n", optee_header->magic);
-       INFO("      version=0x%x\n", optee_header->version);
-       INFO("      arch=0x%x\n", optee_header->arch);
-       INFO("      flags=0x%x\n", optee_header->flags);
-       INFO("      nb_images=0x%x\n", optee_header->nb_images);
-
        /* Parse OPTEE image */
        for (num = 0; num < optee_header->nb_images; num++) {
                if (optee_header->optee_image[num].image_id ==