13 Dec, 2013
2 commits
-
In order to avoid duplicating code and keep only one point of modification,
the functions, structs and defines useful for "dumpimage" were moved from
"mkimage" to a common module called "imagetool".This modification also weakens the coupling between image types (FIT, IMX, MXS,
and so on) and image tools (mkimage and dumpimage). Any tool may initialize the
"imagetool" through register_image_tool() function, while the image types
register themselves within an image tool using the register_image_type()
function:+---------------+
+------| fit_image |
+--------------+ +-----------+ | +---------------+
| mkimage |--------> | | | |
Signed-off-by: Simon Glass -
This function should be declared static.
Signed-off-by: Guilherme Maciel Ferreira
Signed-off-by: Simon Glass
31 Aug, 2013
2 commits
-
Add mkimage support for generating and verifying MXS bootstream.
The implementation here is mostly a glue code between MXSSB v0.4
and mkimage, but the long-term goal is to rectify this and merge
MXSSB with mkimage more tightly. Once this code is properly in
U-Boot, MXSSB shall be deprecated in favor of mkimage-mxsimage
support.Note that the mxsimage generator needs libcrypto from OpenSSL, I
therefore enabled the libcrypto/libssl unconditionally.MXSSB: http://git.denx.de/?p=mxssb.git;a=summary
The code is based on research presented at:
http://www.rockbox.org/wiki/SbFileFormatSigned-off-by: Marek Vasut
Cc: Tom Rini
Cc: Fabio Estevam
Cc: Stefano Babic
Cc: Otavio Salvador -
Use previously unused return value of function vrec_header
to return a padding size to generic mkimage. This padding
size is used in copy_files to pad with zeros after copying
the data image.Signed-off-by: Stefano Babic
24 Jul, 2013
1 commit
-
Signed-off-by: Wolfgang Denk
[trini: Fixup common/cmd_io.c]
Signed-off-by: Tom Rini
26 Jun, 2013
5 commits
-
Normally, multiple public keys can be provided and U-Boot is not
required to use all of them for verification. This is because some
images may not be signed, or may be optionally signed.But we still need a mechanism to determine when a key must be used.
This feature cannot be implemented in the FIT itself, since anyone
could change it to mark a key as optional. The requirement for
key verification must go in with the public keys, in a place that
is protected from modification.Add a -r option which tells mkimage to mark all keys that it uses
for signing as 'required'.If some keys are optional and some are required, run mkimage several
times (perhaps with different key directories if some keys are very
secret) using the -F flag to update an existing FIT.Signed-off-by: Simon Glass
Reviewed-by: Marek Vasut -
When signing an image, it is useful to add some details about which tool
or person is authorising the signing. Add a comment field which can take
care of miscellaneous requirements.Signed-off-by: Simon Glass
Reviewed-by: Marek Vasut -
When signing images it is sometimes necessary to sign with different keys
at different times, or make the signer entirely separate from the FIT
creation to avoid needing the private keys to be publicly available in
the system.Add a -F option so that key signing can be a separate step, and possibly
done multiple times as different keys are avaiable.Signed-off-by: Simon Glass
Reviewed-by: Marek Vasut -
FIT image verification requires public keys. Add a convenient option to
mkimage to write the public keys to an FDT blob when it uses then for
signing an image. This allows us to use:mkimage -f test.its -K dest.dtb -k keys test.fit
and have the signatures written to test.fit and the corresponding public
keys written to dest.dtb. Then dest.dtb can be used as the control FDT
for U-Boot (CONFIG_OF_CONTROL), thus providing U-Boot with access to the
public keys it needs.Signed-off-by: Simon Glass
Reviewed-by: Marek Vasut -
Keys required for signing images will be in a specific directory. Add a
-k option to specify that directory.Also update the mkimage man page with this information and a clearer list
of available commands.Signed-off-by: Simon Glass
Reviewed-by: Marek Vasut (v1)
23 Aug, 2012
1 commit
-
Provides a tool to build boot Image for PBL(Pre boot loader) which is
used on Freescale CoreNet SoCs, PBL can be used to load some instructions
and/or data for pre-initialization. The default output image is u-boot.pbl,
for more details please refer to doc/README.pblimage.Signed-off-by: Shaohui Xie
Signed-off-by: Andy Fleming
24 Dec, 2011
1 commit
-
Support for variable length images like AIS image was introduced
in commit f0662105b674a3874227316abf8536bebc9b5995. A parameter
"-s" was also introduced to prohibit copying of the image file
automatically in the main program. However, this parameter
was implemented incorrectly and the image file was copied
nevertheless.Signed-off-by: Christian Riesch
Cc: Stefano Babic
Cc: Heiko Schocher
Acked-by: Stefano Babic
24 Oct, 2011
1 commit
-
Some Davinci processors supports the Application
Image Script (AIS) boot process. The patch adds the generation
of the AIS image inside the mkimage tool to make possible
to generate a bootable U-boot without external tools
(TI Davinci AIS Generator).Signed-off-by: Stefano Babic
CC: Wolfgang Denk
06 Oct, 2011
1 commit
-
Some images have not a header of fix lenght. The patch will be
used for the generation of AIS images, because this header has
a variable lenght. The patch adds also the parameter "-s" (skip)
to not copy automatically the passed image file.Signed-off-by: Stefano Babic
03 Aug, 2011
1 commit
-
- Add mkimage support for OMAP boot image
- Add support for OMAP boot image(MLO) generation in the new
SPL frameworkSigned-off-by: John Rigby
Signed-off-by: Aneesh V
Signed-off-by: Sandeep Paulraj
28 Jul, 2011
1 commit
-
creating an u-boot.ubl file, which contains the UBL Header
needed for booting from NAND with the RBL from TI. For more
information read doc/README.ublimage.Signed-off-by: Heiko Schocher
13 Apr, 2011
1 commit
-
Signed-off-by: Wolfgang Denk
10 Apr, 2010
1 commit
-
Version 4.2.4 of gcc produces the following warnings without this change:
mkimage.c: In function ‘main’:
mkimage.c:204: warning: dereferencing type-punned pointer will break strict-aliasing rules
mkimage.c:222: warning: dereferencing type-punned pointer will break strict-aliasing rulesSigned-off-by: Peter Tyser
28 Mar, 2010
1 commit
-
The restructuring of the mkimage command in commit 89a4d6b1 ("tools:
mkimage: split code into core, default and FIT image specific")
introduced a bug that caused mkimage to segfault when run without
"-n name" option. Initialize the imagename entry to prevent that.Signed-off-by: Wolfgang Denk
12 Mar, 2010
1 commit
-
Some people boot images with the entry point in the middle of the blob
(like Linux with the head code in discardable .init.text), and there is no
no real requirement that the entry point be right after the mkimage header
when doing XIP, so let people specify whatever they want. If they do need
an entry right after the header, then they still can do that with normal
-e behavior.Signed-off-by: Mike Frysinger
26 Jan, 2010
1 commit
-
This patch adds support for "imximage" (MX Boot Image)
to the mkimage utility. The imximage is used on the Freescales's
MX.25, MX.35 and MX.51 processors.Further details under doc/README.imximage.
This patch was tested on a Freescale mx51evk board.
Signed-off-by: Stefano Babic
08 Dec, 2009
1 commit
-
Recent commits 1a99de2cb4d08eb3bf9fb3f60a9d533150de8c0e and
6a590c5f5fd12cdd27f3153522acfac3854590e7 both fixed the same bug in the
same manner. Unfortunately git was "smart" enough to merge both changes
which resulted in some duplicate code.Signed-off-by: Peter Tyser
Reordered code and comment a bit.
Signed-off-by: Wolfgang Denk
05 Dec, 2009
2 commits
-
Previously, there was no indication to the user that a FIT image was
successfully created after executing mkimage. For example:$ mkimage -f uImage.its uImage.itb
DTC: dts->dtb on file "uImage.its"Adding some additional output after creating a FIT image lets the user
know exactly what is contained in their image, eg:$ mkimage -f uImage.its uImage.itb
DTC: dts->dtb on file "uImage.its"
FIT description: Linux kernel 2.6.32-rc7-00201-g7550d6f-dirty
Created: Tue Nov 24 15:43:01 2009
Image 0 (kernel@1)
Description: Linux Kernel 2.6.32-rc7-00201-g7550d6f-dirty
Type: Kernel Image
Compression: gzip compressed
Data Size: 2707311 Bytes = 2643.86 kB = 2.58 MB
Architecture: PowerPC
OS: Linux
Load Address: 0x00000000
Entry Point: 0x00000000
Hash algo: crc32
Hash value: efe0798b
Hash algo: sha1
Hash value: ecafba8c95684f2c8fec67e33c41ec88df1534d7
Image 1 (fdt@1)
Description: Flattened Device Tree blob
Type: Flat Device Tree
Compression: uncompressed
Data Size: 12288 Bytes = 12.00 kB = 0.01 MB
Architecture: PowerPC
Hash algo: crc32
Hash value: a5cab676
Hash algo: sha1
Hash value: 168722b13e305283cfd6603dfe8248cc329adea6
Default Configuration: 'config@1'
Configuration 0 (config@1)
Description: Default Linux kernel
Kernel: kernel@1
FDT: fdt@1This brings the behavior of creating a FIT image in line with creating a
standard uImage, which also prints out the uImage contents after
creation.Signed-off-by: Peter Tyser
-
When building a Flattened Image Tree (FIT) the image type needs to be
"flat_dt". Commit 89a4d6b12fd6394898b8a454cbabeaf1cd59bae5 introduced a
regression which caused the user to need to specify the "-T flat_dt"
parameter on the command line when building a FIT image. The "-T
flat_dt" parameter should not be needed and is at odds with the current
FIT image documentation.Signed-off-by: Peter Tyser
24 Nov, 2009
1 commit
-
The type is not set for generation of the FIT images, resulting
in no images being created without printing or returning an errorSigned-off-by: Remy Bohmer
11 Sep, 2009
4 commits
-
This patch adds support for "kwbimage" (Kirkwood Boot Image)
image types to the mkimage code.For details refer to docs/README.kwbimage
This patch is tested with Sheevaplug board
Signed-off-by: Prafulla Wadaskar
Acked-by: Ron LeeSigned-off-by: Prafulla Wadaskar
-
This is a first step towards reorganizing the mkimage code to make it
easier to add support for additional images types. Current mkimage
code is specific to generating uImage and FIT image files, but the
same framework can be used to generate other image types like
Kirkwood boot images (kwbimage-TBD). For this, the mkimage code gets
reworked:Here is the brief plan for the same:-
a) Split mkimage code into core and image specific support
b) Implement callback functions for image specific code
c) Move image type specific code to respective C files
Currently there are two types of file generation/list
supported (i.e uImage, FIT), the code is abstracted from
mkimage.c/.h and put in default_image.c and fit_image.c;
all code in these file is static except init function call
d) mkimage_register API is added to add new image type support
All above is addressed in this patch
e) Add kwbimage type support to this new framework (TBD)
This will be implemented in a following commit.Signed-off-by: Prafulla Wadaskar
Edit commit message, fix coding style and typos.
Signed-off-by: Wolfgang Denk -
uninitialized retval variable warning fixed
crc32 APIs moved to crc.h (newly added) and build warnings fixedSigned-off-by: Prafulla Wadaskar
Signed-off-by: Wolfgang Denk -
List command always return "EXIT_SUCCESS" even in case of
failure by any means.This patch return 0 if list command is sucessful,
returns negative value reported by check_header functionsSigned-off-by: Prafulla Wadaskar
Signed-off-by: Wolfgang Denk
05 Sep, 2009
1 commit
-
Some files included my old standerd file header which had a "All
Rights Reserved" part. As this has never been my intention, I remove
these lines to make the files compatible with GPL v.2 and later.Signed-off-by: Wolfgang Denk
20 Jul, 2009
1 commit
-
Shove a lot of the HOSTCC and related #ifdef checking crap into the new
compiler.h header so that we can keep all other headers nice and clean.Also introduce custom uswap functions so we don't have to rely on the non
standard implementations that a host may (or may not in the case of OS X)
provide. This allows mkimage to finally build cleanly on an OS X system.Signed-off-by: Mike Frysinger
04 May, 2008
1 commit
-
The mmap() related code is full of inconsistent casts/constants when
it comes to error checking, and may break when building on some
systems (like ones that do not implicitly define the caddr_t type).
Let's just avoid the whole mess by writing the code nice and clean in
the first place.Signed-off-by: Mike Frysinger
24 Apr, 2008
1 commit
-
As suggested by Wolfgang Denk:
- image printing functions:
- remove wrappers
- remove indentation prefix from functions' signatures
- merge getenv_verify and getenv_autostart into one parametrized functionSigned-off-by: Bartlomiej Sieka
11 Mar, 2008
1 commit
-
Support for the new uImage format (FIT) is added to mkimage tool.
Commandline syntax is appropriately extended:mkimage [-D dtc_options] -f fit-image.its fit-image
mkimage (together with dtc) takes fit-image.its and referenced therein
binaries (like vmlinux.bin.gz) as inputs, and produces fit-image file -- the
final image that can be transferred to the target (e.g., via tftp) and then
booted using the bootm command in U-Boot.Signed-off-by: Bartlomiej Sieka
29 Feb, 2008
2 commits
-
This patch adds the following common routines:
1) Dedicated mkimage print_header() is replaced with common
image_print_contents()
image_print_contents_noindent()2) Common os/arch/type/comp fields name id translation routines
genimg_get_os_name()
genimg_get_arch_name()
genimg_get_type_name()
genimg_get_comp_name()
genimg_get_os_id()
genimg_get_arch_id()
genimg_get_type_id()
genimg_get_comp_id()Signed-off-by: Marian Balakowicz
-
This patch introduces the following prefix convention for the
image format handling and bootm related code:genimg_ - dual format shared code
image_ - legacy uImage format specific code
fit_ - new uImage format specific code
boot_ - booting process related codeRelated routines are renamed and a few pieces of code are moved around and
re-grouped.Signed-off-by: Marian Balakowicz
07 Feb, 2008
1 commit
-
- Add inline helper macros for basic header processing
- Move common non inline code common/image.c
- Replace direct header access with the API routines
- Rename IH_CPU_* to IH_ARCH_*Signed-off-by: Marian Balakowicz
16 May, 2007
1 commit
-
Singed-off-by: Marc Hoffman
Signed-off-by: Aubrey Li
11 Oct, 2006
1 commit
09 Oct, 2006
1 commit
-
Make it possible to generate AVR32 uImage files with mkimage and
make cmd_bootm recognize them.
Patch by Haavard Skinnemoen, 22 Sep 2006
