projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
tools
/
aisimage.c
diff --git
a/tools/aisimage.c
b/tools/aisimage.c
index
980bf2e
..
8de370a
100644
(file)
--- a/
tools/aisimage.c
+++ b/
tools/aisimage.c
@@
-2,10
+2,10
@@
* (C) Copyright 2011
* Stefano Babic, DENX Software Engineering, sbabic@denx.de.
*
* (C) Copyright 2011
* Stefano Babic, DENX Software Engineering, sbabic@denx.de.
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0+
*/
*/
-#include "
mkimage
.h"
+#include "
imagetool
.h"
#include "aisimage.h"
#include <image.h>
#include "aisimage.h"
#include <image.h>
@@
-176,7
+176,7
@@
static uint32_t *ais_insert_cmd_header(uint32_t cmd, uint32_t nargs,
}
}
-static uint32_t *ais_alloc_buffer(struct
mkimage
_params *params)
+static uint32_t *ais_alloc_buffer(struct
image_tool
_params *params)
{
int dfd;
struct stat sbuf;
{
int dfd;
struct stat sbuf;
@@
-216,7
+216,7
@@
static uint32_t *ais_alloc_buffer(struct mkimage_params *params)
return ptr;
}
return ptr;
}
-static uint32_t *ais_copy_image(struct
mkimage
_params *params,
+static uint32_t *ais_copy_image(struct
image_tool
_params *params,
uint32_t *aisptr)
{
uint32_t *aisptr)
{
@@
-252,7
+252,7
@@
static uint32_t *ais_copy_image(struct mkimage_params *params,
}
}
-static int aisimage_generate(struct
mkimage
_params *params,
+static int aisimage_generate(struct
image_tool
_params *params,
struct image_type_params *tparams)
{
FILE *fd = NULL;
struct image_type_params *tparams)
{
FILE *fd = NULL;
@@
-370,7
+370,7
@@
static int aisimage_check_image_types(uint8_t type)
}
static int aisimage_verify_header(unsigned char *ptr, int image_size,
}
static int aisimage_verify_header(unsigned char *ptr, int image_size,
- struct
mkimage
_params *params)
+ struct
image_tool
_params *params)
{
struct ais_header *ais_hdr = (struct ais_header *)ptr;
{
struct ais_header *ais_hdr = (struct ais_header *)ptr;
@@
-384,11
+384,11
@@
static int aisimage_verify_header(unsigned char *ptr, int image_size,
}
static void aisimage_set_header(void *ptr, struct stat *sbuf, int ifd,
}
static void aisimage_set_header(void *ptr, struct stat *sbuf, int ifd,
- struct
mkimage
_params *params)
+ struct
image_tool
_params *params)
{
}
{
}
-int aisimage_check_params(struct
mkimage
_params *params)
+int aisimage_check_params(struct
image_tool
_params *params)
{
if (!params)
return CFG_INVALID;
{
if (!params)
return CFG_INVALID;
@@
-427,5
+427,5
@@
static struct image_type_params aisimage_params = {
void init_ais_image_type(void)
{
void init_ais_image_type(void)
{
-
mkimage_register
(&aisimage_params);
+
register_image_type
(&aisimage_params);
}
}