diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-01-26 12:11:54 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-01-26 12:11:54 +0100 |
| commit | 707acd01ded3c60a4e277f7c5432d397897b4dfd (patch) | |
| tree | 5730e1e1f0bac6c1aeddc261cb412fc3d5f220fd /tools/mkimage.c | |
| parent | be2a3bb39adf1fdd274fc427e30ef62eb86441a1 (diff) | |
| parent | c71b4dd2da0dcddabd7c29e6c3dc8a495d4bd928 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'tools/mkimage.c')
| -rw-r--r-- | tools/mkimage.c | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/tools/mkimage.c b/tools/mkimage.c index 7f221013e3..123d0c7d93 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -19,7 +19,7 @@ static void usage(void); struct image_type_params *mkimage_tparams = NULL; /* parameters initialized by core will be used by the image type code */ -struct mkimage_params params = { +struct image_tool_params params = { .os = IH_OS_LINUX, .arch = IH_ARCH_PPC, .type = IH_TYPE_KERNEL, @@ -139,24 +139,8 @@ main (int argc, char **argv) struct image_type_params *tparams = NULL; int pad_len = 0; - /* 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 all image generation/list support */ + register_image_tool(mkimage_register); params.cmdname = *argv; params.addr = params.ep = 0; @@ -632,8 +616,7 @@ copy_file (int ifd, const char *datafile, int pad) (void) close (dfd); } -void -usage () +static void usage(void) { fprintf (stderr, "Usage: %s -l image\n" " -l ==> list image header information\n", |