LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

image-fit: Fix FIT_CIPHER linking 

When CONFIG_FIT_CIPHER=y and CONFIG_FIT_SIGNATURE=n is there is no
implementation of image_get_host_blob for mkimage/dumpimage:

 /usr/bin/ld: tools/common/image-cipher.o: in function `fit_image_decrypt_data':
 image-cipher.c:(.text+0x9a): undefined reference to `image_get_host_blob'

Move the implementation to a common file so it can be shaed between
image-cipher.c and image-fit-sig.c.

Signed-off-by: Joel Stanley <joel@jms.id.au>
This commit is contained in:
Joel Stanley 2020-12-08 14:42:14 +10:30 committed by Tom Rini
parent 5d40d5f12e
commit 93af80f3e8
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/image-fit-sig.c
View File

@ -19,20 +19,6 @@ DECLARE_GLOBAL_DATA_PTR;
#define IMAGE_MAX_HASHED_NODES 100 #define IMAGE_MAX_HASHED_NODES 100
#ifdef USE_HOSTCC
void *host_blob;
void image_set_host_blob(void *blob)
{
host_blob = blob;
}
void *image_get_host_blob(void)
{
return host_blob;
}
#endif
/** /**
* fit_region_make_list() - Make a list of image regions * fit_region_make_list() - Make a list of image regions
* *

15
common/image-fit.c
View File

@ -112,6 +112,21 @@ int fit_parse_subimage(const char *spec, ulong addr_curr,
} }
#endif /* !USE_HOSTCC */ #endif /* !USE_HOSTCC */
#ifdef USE_HOSTCC
/* Host tools use these implementations for Cipher and Signature support */
static void *host_blob;
void image_set_host_blob(void *blob)
{
host_blob = blob;
}
void *image_get_host_blob(void)
{
return host_blob;
}
#endif /* USE_HOSTCC */
static void fit_get_debug(const void *fit, int noffset, static void fit_get_debug(const void *fit, int noffset,
char *prop_name, int err) char *prop_name, int err)
{ {