SECURE BOOT: Change fsl_secboot_validate func to pass image addr

[oweals/u-boot.git] / board / freescale / common / fsl_validate.c

diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c
index 95059c771fc05af32aedef94a4f2391e50099ed9..64e4e300a57ea13ae4a242be8f22bda9ba4e2146 100644 (file)
--- a/board/freescale/common/fsl_validate.c
+++ b/board/freescale/common/fsl_validate.c
@@ -570,7 +570,7 @@ static int calc_esbchdr_esbc_hash(struct fsl_secboot_img_priv *img)
 
        /* Update hash for actual Image */
        ret = algo->hash_update(algo, ctx,
-               (u8 *)img->img_addr, img->img_size, 1);
+               (u8 *)(*(img->img_addr_ptr)), img->img_size, 1);
        if (ret)
                return ret;
 
@@ -646,7 +646,6 @@ static void construct_img_encoded_hash_second(struct fsl_secboot_img_priv *img)
  */
 static int read_validate_esbc_client_header(struct fsl_secboot_img_priv *img)
 {
-       char buf[20];
        struct fsl_secboot_img_hdr *hdr = &img->hdr;
        void *esbc = (u8 *)(uintptr_t)img->ehdrloc;
        u8 *k, *s;
@@ -661,17 +660,14 @@ static int read_validate_esbc_client_header(struct fsl_secboot_img_priv *img)
        /* If Image Address is not passed as argument to function,
         * then Address and Size must be read from the Header.
         */
-       if (img->img_addr == 0) {
+       if (*(img->img_addr_ptr) == 0) {
        #ifdef CONFIG_ESBC_ADDR_64BIT
-               img->img_addr = hdr->pimg64;
+               *(img->img_addr_ptr) = hdr->pimg64;
        #else
-               img->img_addr = hdr->pimg;
+               *(img->img_addr_ptr) = hdr->pimg;
        #endif
        }
 
-       sprintf(buf, "%lx", img->img_addr);
-       setenv("img_addr", buf);
-
        if (!hdr->img_size)
                return ERROR_ESBC_CLIENT_HEADER_IMG_SIZE;
 
@@ -814,9 +810,17 @@ static int calculate_cmp_img_sig(struct fsl_secboot_img_priv *img)
 
        return 0;
 }
-
+/* haddr - Address of the header of image to be validated.
+ * arg_hash_str - Option hash string. If provided, this
+ * overides the key hash in the SFP fuses.
+ * img_addr_ptr - Optional pointer to address of image to be validated.
+ * If non zero addr, this overides the addr of image in header,
+ * otherwise updated to image addr in header.
+ * Acts as both input and output of function.
+ * This pointer shouldn't be NULL.
+ */
 int fsl_secboot_validate(uintptr_t haddr, char *arg_hash_str,
-                       uintptr_t img_addr)
+                       uintptr_t *img_addr_ptr)
 {
        struct ccsr_sfp_regs *sfp_regs = (void *)(CONFIG_SYS_SFP_ADDR);
        ulong hash[SHA256_BYTES/sizeof(ulong)];
@@ -869,7 +873,7 @@ int fsl_secboot_validate(uintptr_t haddr, char *arg_hash_str,
        /* Update the information in Private Struct */
        hdr = &img->hdr;
        img->ehdrloc = haddr;
-       img->img_addr = img_addr;
+       img->img_addr_ptr = img_addr_ptr;
        esbc = (u8 *)img->ehdrloc;
 
        memcpy(hdr, esbc, sizeof(struct fsl_secboot_img_hdr));