|
@@ -43,7 +43,7 @@ optee_image_get_load_addr(const struct image_header *hdr)
|
|
|
return optee_image_get_entry_point(hdr) - sizeof(struct optee_header);
|
|
|
}
|
|
|
|
|
|
-#if defined(CONFIG_OPTEE)
|
|
|
+#if defined(CONFIG_OPTEE_IMAGE)
|
|
|
int optee_verify_image(struct optee_header *hdr, unsigned long tzdram_start,
|
|
|
unsigned long tzdram_len, unsigned long image_len);
|
|
|
#else
|
|
@@ -57,7 +57,7 @@ static inline int optee_verify_image(struct optee_header *hdr,
|
|
|
|
|
|
#endif
|
|
|
|
|
|
-#if defined(CONFIG_OPTEE)
|
|
|
+#if defined(CONFIG_OPTEE_IMAGE)
|
|
|
int optee_verify_bootm_image(unsigned long image_addr,
|
|
|
unsigned long image_load_addr,
|
|
|
unsigned long image_len);
|
|
@@ -70,7 +70,7 @@ static inline int optee_verify_bootm_image(unsigned long image_addr,
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
-#if defined(CONFIG_OPTEE) && defined(CONFIG_OF_LIBFDT)
|
|
|
+#if defined(CONFIG_OPTEE_LIB) && defined(CONFIG_OF_LIBFDT)
|
|
|
int optee_copy_fdt_nodes(void *new_blob);
|
|
|
#else
|
|
|
static inline int optee_copy_fdt_nodes(void *new_blob)
|