karo: tx6: replace open coded interpretation of cpurev by calls to is_cpu_type()

[karo-tx-uboot.git] / tools / socfpgaimage.c

diff --git a/tools/socfpgaimage.c b/tools/socfpgaimage.c
index 917873e7b3ce83487cb16a9a9d577f495192f5f6..8fe91fe80ee9ac9ab5c2c0f7af25705f212bd486 100644 (file)
--- a/tools/socfpgaimage.c
+++ b/tools/socfpgaimage.c
@@ -33,6 +33,8 @@
 
 #include "pbl_crc32.h"
 #include "imagetool.h"
+#include "mkimage.h"
+
 #include <image.h>
 
 #define HEADER_OFFSET  0x40
@@ -133,12 +135,12 @@ static int verify_buffer(const uint8_t *buf)
 
        len = verify_header(buf + HEADER_OFFSET);
        if (len < 0) {
-               fprintf(stderr, "Invalid header\n");
+               debug("Invalid header\n");
                return -1;
        }
 
        if (len < HEADER_OFFSET || len > PADDED_SIZE) {
-               fprintf(stderr, "Invalid header length (%i)\n", len);
+               debug("Invalid header length (%i)\n", len);
                return -1;
        }
 
@@ -241,19 +243,17 @@ static void socfpgaimage_set_header(void *ptr, struct stat *sbuf, int ifd,
        sign_buffer(buf, 0, 0, data_size, 0);
 }
 
-static struct image_type_params socfpgaimage_params = {
-       .name           = "Altera SOCFPGA preloader support",
-       .vrec_header    = socfpgaimage_vrec_header,
-       .header_size    = 0, /* This will be modified by vrec_header() */
-       .hdr            = (void *)buffer,
-       .check_image_type = socfpgaimage_check_image_types,
-       .verify_header  = socfpgaimage_verify_header,
-       .print_header   = socfpgaimage_print_header,
-       .set_header     = socfpgaimage_set_header,
-       .check_params   = socfpgaimage_check_params,
-};
-
-void init_socfpga_image_type(void)
-{
-       register_image_type(&socfpgaimage_params);
-}
+U_BOOT_IMAGE_TYPE(
+       socfpgaimage,
+       "Altera SOCFPGA preloader support",
+       0, /* This will be modified by vrec_header() */
+       (void *)buffer,
+       socfpgaimage_check_params,
+       socfpgaimage_verify_header,
+       socfpgaimage_print_header,
+       socfpgaimage_set_header,
+       NULL,
+       socfpgaimage_check_image_types,
+       NULL,
+       socfpgaimage_vrec_header
+);