brain-hackers_pepepper-mirror
/
u-boot-brain
mirror of https://github.com/brain-hackers/u-boot-brain
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

image: Convert fit_image_hash_set_value() to static, and rename 

This function doesn't need to be exported, and with verification
we want to use it for setting the 'value' property in any node,
so rename it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Marek Vasut <marex@denx.de>
This commit is contained in:
Simon Glass 2013-05-07 06:11:56 +00:00 committed by Tom Rini
parent 94e5fa46a0
commit b7260910dc
2 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/image.h
View File

@ -614,8 +614,6 @@ int fit_image_hash_get_ignore(const void *fit, int noffset, int *ignore);
int fit_set_timestamp(void *fit, int noffset, time_t timestamp);
int fit_set_hashes(void *fit);
int fit_image_set_hashes(void *fit, int image_noffset);
int fit_image_hash_set_value(void *fit, int noffset, uint8_t *value,
int value_len);
int fit_image_check_hashes(const void *fit, int noffset);
int fit_all_image_check_hashes(const void *fit);

62
tools/image-host.c
View File

@ -78,6 +78,36 @@ int fit_set_hashes(void *fit)
return 0;
}
/**
* fit_set_hash_value - set hash value in requested has node
* @fit: pointer to the FIT format image header
* @noffset: hash node offset
* @value: hash value to be set
* @value_len: hash value length
*
* fit_set_hash_value() attempts to set hash value in a node at offset
* given and returns operation status to the caller.
*
* returns
* 0, on success
* -1, on failure
*/
static int fit_set_hash_value(void *fit, int noffset, uint8_t *value,
int value_len)
{
int ret;
ret = fdt_setprop(fit, noffset, FIT_VALUE_PROP, value, value_len);
if (ret) {
printf("Can't set hash '%s' property for '%s' node(%s)\n",
FIT_VALUE_PROP, fit_get_name(fit, noffset, NULL),
fdt_strerror(ret));
return -1;
}
return 0;
}
/**
* fit_image_process_hash - Process a single subnode of the images/ node
*
@ -119,7 +149,7 @@ static int fit_image_process_hash(void *fit, const char *image_name,
return -1;
}
if (fit_image_hash_set_value(fit, noffset, value, value_len)) {
if (fit_set_hash_value(fit, noffset, value, value_len)) {
printf("Can't set hash value for '%s' hash node in '%s' image node\n",
fit_get_name(fit, noffset, NULL), image_name);
return -1;
@ -187,33 +217,3 @@ int fit_image_set_hashes(void *fit, int image_noffset)
return 0;
}
/**
* fit_image_hash_set_value - set hash value in requested has node
* @fit: pointer to the FIT format image header
* @noffset: hash node offset
* @value: hash value to be set
* @value_len: hash value length
*
* fit_image_hash_set_value() attempts to set hash value in a node at offset
* given and returns operation status to the caller.
*
* returns
* 0, on success
* -1, on failure
*/
int fit_image_hash_set_value(void *fit, int noffset, uint8_t *value,
int value_len)
{
int ret;
ret = fdt_setprop(fit, noffset, FIT_VALUE_PROP, value, value_len);
if (ret) {
printf("Can't set hash '%s' property for '%s' node(%s)\n",
FIT_VALUE_PROP, fit_get_name(fit, noffset, NULL),
fdt_strerror(ret));
return -1;
}
return 0;
}