Merge git://git.denx.de/u-boot-x86

[people/ms/u-boot.git] / tools / imagetool.c

diff --git a/tools/imagetool.c b/tools/imagetool.c
index a25b86b36ebafa3baaa43344a1ab3c08033c033e..855a096d0ab0f2579a07bcc60d662a9d8eaf2a22 100644 (file)
--- a/tools/imagetool.c
+++ b/tools/imagetool.c
@@ -10,71 +10,18 @@
 
 #include <image.h>
 
-/*
- * Callback function to register a image type within a tool
- */
-static imagetool_register_t register_func;
-
-/*
- * register_image_tool -
- *
- * The tool provides its own registration function in order to all image
- * types initialize themselves.
- */
-void register_image_tool(imagetool_register_t image_register)
+struct image_type_params *imagetool_get_type(int type)
 {
-       /*
-        * Save the image tool callback function. It will be used to register
-        * image types within that tool
-        */
-       register_func = image_register;
-
-       /* Init ATMEL ROM Boot Image generation/list support */
-       init_atmel_image_type();
-       /* Init Freescale PBL Boot image generation/list support */
-       init_pbl_image_type();
-       /* Init Kirkwood Boot image generation/list support */
-       init_kwb_image_type();
-       /* Init Freescale imx Boot image generation/list support */
-       init_imx_image_type();
-       /* Init Freescale mxs Boot image generation/list support */
-       init_mxs_image_type();
-       /* Init FIT image generation/list support */
-       init_fit_image_type();
-       /* Init TI OMAP Boot image generation/list support */
-       init_omap_image_type();
-       /* Init Default image generation/list support */
-       init_default_image_type();
-       /* Init Davinci UBL support */
-       init_ubl_image_type();
-       /* Init Davinci AIS support */
-       init_ais_image_type();
-       /* Init Altera SOCFPGA support */
-       init_socfpga_image_type();
-       /* Init TI Keystone boot image generation/list support */
-       init_gpimage_type();
-}
+       struct image_type_params **curr;
+       INIT_SECTION(image_type);
 
-/*
- * register_image_type -
- *
- * Register a image type within a tool
- */
-void register_image_type(struct image_type_params *tparams)
-{
-       register_func(tparams);
-}
-
-struct image_type_params *imagetool_get_type(
-       int type,
-       struct image_type_params *tparams)
-{
-       struct image_type_params *curr;
+       struct image_type_params **start = __start_image_type;
+       struct image_type_params **end = __stop_image_type;
 
-       for (curr = tparams; curr != NULL; curr = curr->next) {
-               if (curr->check_image_type) {
-                       if (!curr->check_image_type(type))
-                               return curr;
+       for (curr = start; curr != end; curr++) {
+               if ((*curr)->check_image_type) {
+                       if (!(*curr)->check_image_type(type))
+                               return *curr;
                }
        }
        return NULL;
@@ -87,11 +34,15 @@ int imagetool_verify_print_header(
        struct image_tool_params *params)
 {
        int retval = -1;
-       struct image_type_params *curr;
+       struct image_type_params **curr;
+       INIT_SECTION(image_type);
+
+       struct image_type_params **start = __start_image_type;
+       struct image_type_params **end = __stop_image_type;
 
-       for (curr = tparams; curr != NULL; curr = curr->next) {
-               if (curr->verify_header) {
-                       retval = curr->verify_header((unsigned char *)ptr,
+       for (curr = start; curr != end; curr++) {
+               if ((*curr)->verify_header) {
+                       retval = (*curr)->verify_header((unsigned char *)ptr,
                                                     sbuf->st_size, params);
 
                        if (retval == 0) {
@@ -99,12 +50,13 @@ int imagetool_verify_print_header(
                                 * Print the image information  if verify is
                                 * successful
                                 */
-                               if (curr->print_header) {
-                                       curr->print_header(ptr);
+                               if ((*curr)->print_header) {
+                                       if (!params->quiet)
+                                               (*curr)->print_header(ptr);
                                } else {
                                        fprintf(stderr,
                                                "%s: print_header undefined for %s\n",
-                                               params->cmdname, curr->name);
+                                               params->cmdname, (*curr)->name);
                                }
                                break;
                        }
@@ -114,7 +66,7 @@ int imagetool_verify_print_header(
        return retval;
 }
 
-int imagetool_save_datafile(
+int imagetool_save_subimage(
        const char *file_name,
        ulong file_data,
        ulong file_len)
@@ -140,3 +92,46 @@ int imagetool_save_datafile(
 
        return 0;
 }
+
+int imagetool_get_filesize(struct image_tool_params *params, const char *fname)
+{
+       struct stat sbuf;
+       int fd;
+
+       fd = open(fname, O_RDONLY | O_BINARY);
+       if (fd < 0) {
+               fprintf(stderr, "%s: Can't open %s: %s\n",
+                       params->cmdname, fname, strerror(errno));
+               return -1;
+       }
+
+       if (fstat(fd, &sbuf) < 0) {
+               fprintf(stderr, "%s: Can't stat %s: %s\n",
+                       params->cmdname, fname, strerror(errno));
+               close(fd);
+               return -1;
+       }
+       close(fd);
+
+       return sbuf.st_size;
+}
+
+time_t imagetool_get_source_date(
+        struct image_tool_params *params,
+        time_t fallback)
+{
+       char *source_date_epoch = getenv("SOURCE_DATE_EPOCH");
+
+       if (source_date_epoch == NULL)
+               return fallback;
+
+       time_t time = (time_t) strtol(source_date_epoch, NULL, 10);
+
+       if (gmtime(&time) == NULL) {
+               fprintf(stderr, "%s: SOURCE_DATE_EPOCH is not valid\n",
+                       params->cmdname);
+               time = 0;
+       }
+
+       return time;
+}