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

mkimage: fit_image: Use macros from image.h

Browse Source 
There is no reason not to use macros which are already defined.
It is also much easier for grepping.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Michal Simek 2018-07-20 12:31:02 +02:00 committed by Tom Rini
parent 69ca343906
commit 4a8b6e0101
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
tools/fit_image.c
View File

@ -202,21 +202,22 @@ static int fit_write_images(struct image_tool_params *params, char *fdt)
typename = genimg_get_type_short_name(params->fit_image_type); typename = genimg_get_type_short_name(params->fit_image_type);
snprintf(str, sizeof(str), "%s-1", typename); snprintf(str, sizeof(str), "%s-1", typename);
fdt_begin_node(fdt, str); fdt_begin_node(fdt, str);
fdt_property_string(fdt, "description", params->imagename); fdt_property_string(fdt, FIT_DESC_PROP, params->imagename);
fdt_property_string(fdt, "type", typename); fdt_property_string(fdt, FIT_TYPE_PROP, typename);
fdt_property_string(fdt, "arch", fdt_property_string(fdt, FIT_ARCH_PROP,
genimg_get_arch_short_name(params->arch)); genimg_get_arch_short_name(params->arch));
fdt_property_string(fdt, "os", genimg_get_os_short_name(params->os)); fdt_property_string(fdt, FIT_OS_PROP,
fdt_property_string(fdt, "compression", genimg_get_os_short_name(params->os));
fdt_property_string(fdt, FIT_COMP_PROP,
genimg_get_comp_short_name(params->comp)); genimg_get_comp_short_name(params->comp));
fdt_property_u32(fdt, "load", params->addr); fdt_property_u32(fdt, FIT_LOAD_PROP, params->addr);
fdt_property_u32(fdt, "entry", params->ep); fdt_property_u32(fdt, FIT_ENTRY_PROP, params->ep);
/* /*
* Put data last since it is large. SPL may only load the first part * Put data last since it is large. SPL may only load the first part
* of the DT, so this way it can access all the above fields. * of the DT, so this way it can access all the above fields.
*/ */
ret = fdt_property_file(params, fdt, "data", params->datafile); ret = fdt_property_file(params, fdt, FIT_DATA_PROP, params->datafile);
if (ret) if (ret)
return ret; return ret;
fdt_end_node(fdt); fdt_end_node(fdt);
@ -230,14 +231,15 @@ static int fit_write_images(struct image_tool_params *params, char *fdt)
fdt_begin_node(fdt, str); fdt_begin_node(fdt, str);
get_basename(str, sizeof(str), cont->fname); get_basename(str, sizeof(str), cont->fname);
fdt_property_string(fdt, "description", str); fdt_property_string(fdt, FIT_DESC_PROP, str);
ret = fdt_property_file(params, fdt, "data", cont->fname); ret = fdt_property_file(params, fdt, FIT_DATA_PROP,
cont->fname);
if (ret) if (ret)
return ret; return ret;
fdt_property_string(fdt, "type", typename); fdt_property_string(fdt, FIT_TYPE_PROP, typename);
fdt_property_string(fdt, "arch", fdt_property_string(fdt, FIT_ARCH_PROP,
genimg_get_arch_short_name(params->arch)); genimg_get_arch_short_name(params->arch));
fdt_property_string(fdt, "compression", fdt_property_string(fdt, FIT_COMP_PROP,
genimg_get_comp_short_name(IH_COMP_NONE)); genimg_get_comp_short_name(IH_COMP_NONE));
fdt_end_node(fdt); fdt_end_node(fdt);
} }
@ -246,10 +248,12 @@ static int fit_write_images(struct image_tool_params *params, char *fdt)
if (params->fit_ramdisk) { if (params->fit_ramdisk) {
fdt_begin_node(fdt, FIT_RAMDISK_PROP "-1"); fdt_begin_node(fdt, FIT_RAMDISK_PROP "-1");
fdt_property_string(fdt, "type", FIT_RAMDISK_PROP); fdt_property_string(fdt, FIT_TYPE_PROP, FIT_RAMDISK_PROP);
fdt_property_string(fdt, "os", genimg_get_os_short_name(params->os)); fdt_property_string(fdt, FIT_OS_PROP,
genimg_get_os_short_name(params->os));
ret = fdt_property_file(params, fdt, "data", params->fit_ramdisk); ret = fdt_property_file(params, fdt, FIT_DATA_PROP,
params->fit_ramdisk);
if (ret) if (ret)
return ret; return ret;
@ -278,7 +282,7 @@ static void fit_write_configs(struct image_tool_params *params, char *fdt)
int upto; int upto;
fdt_begin_node(fdt, "configurations"); fdt_begin_node(fdt, "configurations");
fdt_property_string(fdt, "default", "conf-1"); fdt_property_string(fdt, FIT_DEFAULT_PROP, "conf-1");
upto = 0; upto = 0;
for (cont = params->content_head; cont; cont = cont->next) { for (cont = params->content_head; cont; cont = cont->next) {
@ -289,7 +293,7 @@ static void fit_write_configs(struct image_tool_params *params, char *fdt)
fdt_begin_node(fdt, str); fdt_begin_node(fdt, str);
get_basename(str, sizeof(str), cont->fname); get_basename(str, sizeof(str), cont->fname);
fdt_property_string(fdt, "description", str); fdt_property_string(fdt, FIT_DESC_PROP, str);
typename = genimg_get_type_short_name(params->fit_image_type); typename = genimg_get_type_short_name(params->fit_image_type);
snprintf(str, sizeof(str), "%s-1", typename); snprintf(str, sizeof(str), "%s-1", typename);
@ -329,7 +333,7 @@ static int fit_build_fdt(struct image_tool_params *params, char *fdt, int size)
return ret; return ret;
fdt_finish_reservemap(fdt); fdt_finish_reservemap(fdt);
fdt_begin_node(fdt, ""); fdt_begin_node(fdt, "");
fdt_property_strf(fdt, "description", fdt_property_strf(fdt, FIT_DESC_PROP,
"%s image with one or more FDT blobs", "%s image with one or more FDT blobs",
genimg_get_type_name(params->fit_image_type)); genimg_get_type_name(params->fit_image_type));
fdt_property_strf(fdt, "creator", "U-Boot mkimage %s", PLAIN_VERSION); fdt_property_strf(fdt, "creator", "U-Boot mkimage %s", PLAIN_VERSION);
@ -441,25 +445,26 @@ static int fit_extract_data(struct image_tool_params *params, const char *fname)
const char *data; const char *data;
int len; int len;
data = fdt_getprop(fdt, node, "data", &len); data = fdt_getprop(fdt, node, FIT_DATA_PROP, &len);
if (!data) if (!data)
continue; continue;
memcpy(buf + buf_ptr, data, len); memcpy(buf + buf_ptr, data, len);
debug("Extracting data size %x\n", len); debug("Extracting data size %x\n", len);
ret = fdt_delprop(fdt, node, "data"); ret = fdt_delprop(fdt, node, FIT_DATA_PROP);
if (ret) { if (ret) {
ret = -EPERM; ret = -EPERM;
goto err_munmap; goto err_munmap;
} }
if (params->external_offset > 0) { if (params->external_offset > 0) {
/* An external offset positions the data absolutely. */ /* An external offset positions the data absolutely. */
fdt_setprop_u32(fdt, node, "data-position", fdt_setprop_u32(fdt, node, FIT_DATA_POSITION_PROP,
params->external_offset + buf_ptr); params->external_offset + buf_ptr);
} else { } else {
fdt_setprop_u32(fdt, node, "data-offset", buf_ptr); fdt_setprop_u32(fdt, node, FIT_DATA_OFFSET_PROP,
buf_ptr);
} }
fdt_setprop_u32(fdt, node, "data-size", len); fdt_setprop_u32(fdt, node, FIT_DATA_SIZE_PROP, len);
buf_ptr += (len + 3) & ~3; buf_ptr += (len + 3) & ~3;
} }