X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tools%2Fsocfpgaimage.c;h=7f83b50761f08c1771c431a60791060a41fe993b;hb=6915dcf35987d654b491524f151e56b91e0d0ec9;hp=917873e7b3ce83487cb16a9a9d577f495192f5f6;hpb=0ce4af99c07acebf4fce9a91f1099d2460629293;p=u-boot

diff --git a/tools/socfpgaimage.c b/tools/socfpgaimage.c
index 917873e7b3..7f83b50761 100644
--- a/tools/socfpgaimage.c
+++ b/tools/socfpgaimage.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2014 Charles Manning <cdhmanning@gmail.com>
  *
- * SPDX-License-Identifier:	GPL-2.0+
- *
  * Reference doc http://www.altera.com.cn/literature/hb/cyclone-v/cv_5400A.pdf
  * Note this doc is not entirely accurate. Of particular interest to us is the
  * "header" length field being in U32s and not bytes.
@@ -33,6 +32,8 @@
 
 #include "pbl_crc32.h"
 #include "imagetool.h"
+#include "mkimage.h"
+
 #include <image.h>
 
 #define HEADER_OFFSET	0x40
@@ -133,12 +134,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 +242,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
+);