1. 19 Jun, 2014 1 commit
    • Jeroen Hofstee's avatar
      includes: move openssl headers to include/u-boot · 2b9912e6
      Jeroen Hofstee authored
      commit 18b06652 "tools: include u-boot version of sha256.h"
      unconditionally forced the sha256.h from u-boot to be used
      for tools instead of the host version. This is fragile though
      as it will also include the host version. Therefore move it
      to include/u-boot to join u-boot/md5.h etc which were renamed
      for the same reason.
      
      cc: Simon Glass <sjg@chromium.org>
      Signed-off-by: default avatarJeroen Hofstee <jeroen@myspectrum.nl>
      2b9912e6
  2. 13 Dec, 2013 1 commit
    • Guilherme Maciel Ferreira's avatar
      tools: moved code common to all image tools to a separated module. · f86ed6a8
      Guilherme Maciel Ferreira authored
      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   |--------> |           | <-----+
       +--------------+          |           |              +---------------+
                                 | imagetool | <------------|    imximage   |
       +--------------+          |           |              +---------------+
       |  dumpimage   |--------> |           | <-----+
       +--------------+          +-----------+       |      +---------------+
                                                     +------| default_image |
                                                            +---------------+
      
                register_image_tool()           register_image_type()
      
      Also, the struct "mkimage_params" was renamed to "image_tool_params" to make
      clear its general purpose.
      Signed-off-by: default avatarGuilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
      Signed-off-by: default avatarSimon Glass <sjg@chromium.org>
      f86ed6a8
  3. 31 Aug, 2013 2 commits
  4. 24 Jul, 2013 1 commit
  5. 26 Jun, 2013 4 commits
    • Simon Glass's avatar
      mkimage: Add -r option to specify keys that must be verified · 399c744b
      Simon Glass authored
      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: default avatarSimon Glass <sjg@chromium.org>
      Reviewed-by: default avatarMarek Vasut <marex@denx.de>
      399c744b
    • Simon Glass's avatar
      mkimage: Add -c option to specify a comment for key signing · 4f610427
      Simon Glass authored
      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: default avatarSimon Glass <sjg@chromium.org>
      Reviewed-by: default avatarMarek Vasut <marex@denx.de>
      4f610427
    • Simon Glass's avatar
      mkimage: Add -K to write public keys to an FDT blob · e29495d3
      Simon Glass authored
      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: default avatarSimon Glass <sjg@chromium.org>
      Reviewed-by: default avatarMarek Vasut <marex@denx.de>
      e29495d3
    • Simon Glass's avatar
      mkimage: Add -k option to specify key directory · 80e4df8a
      Simon Glass authored
      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: default avatarSimon Glass <sjg@chromium.org>
      Reviewed-by: Marek Vasut <marex@denx.de> (v1)
      80e4df8a
  6. 04 Jun, 2013 1 commit
    • Simon Glass's avatar
      mkimage: Add map_sysmem() and IH_ARCH_DEFAULT to simplfy building · 2434c66d
      Simon Glass authored
      These are not actually used in mkimage itself, but the image code (which
      is common with mkimage) does use them. To avoid #ifdefs in the image code
      just for mkimage, define dummy version of these here. The compiler will
      eliminate the dead code anyway.
      
      A better way to handle this might be to split out more things from common.h
      so that mkimage can include them. At present any file that mkimage uses
      has to be very careful what headers it includes.
      Signed-off-by: default avatarSimon Glass <sjg@chromium.org>
      2434c66d
  7. 14 May, 2013 1 commit
  8. 23 Aug, 2012 1 commit
  9. 23 Oct, 2011 1 commit
    • Stefano Babic's avatar
      mkimage: adding support for Davinci AIS image · 4962e38e
      Stefano Babic authored
      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: default avatarStefano Babic <sbabic@denx.de>
      CC: Wolfgang Denk <wd@denx.de>
      4962e38e
  10. 05 Oct, 2011 1 commit
  11. 03 Aug, 2011 1 commit
  12. 28 Jul, 2011 1 commit
  13. 25 Jan, 2010 1 commit
  14. 03 Oct, 2009 4 commits
    • Prafulla Wadaskar's avatar
      mkimage: Add Kirkwood Boot Image support (kwbimage) · 36e0eb63
      Prafulla Wadaskar authored
      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: default avatarPrafulla Wadaskar <prafulla@marvell.com>
      Acked-by: default avatarRon Lee <ron@debian.org>
      Signed-off-by: default avatarPrafulla Wadaskar <prafulla@marvell.com>
      36e0eb63
    • Wolfgang Denk's avatar
      tools/mkimage: fix compiler warnings, use "const" · c928d1dc
      Wolfgang Denk authored
      This fixes some compiler warnings:
      tools/default_image.c:141: warning: initialization from incompatible pointer type
      tools/fit_image.c:202: warning: initialization from incompatible pointer type
      and changes to code to use "const" attributes in a few places where
      it's appropriate.
      Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
      c928d1dc
    • Prafulla Wadaskar's avatar
      tools: mkimage: split code into core, default and FIT image specific · c7138920
      Prafulla Wadaskar authored
      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: default avatarPrafulla Wadaskar <prafulla@marvell.com>
      Edit commit message, fix coding style and typos.
      Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
      c7138920
    • Wolfgang Denk's avatar
      License cleanup: remove unintended "All Rights Reserved" notices. · 4c5baa63
      Wolfgang Denk authored
      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: default avatarWolfgang Denk <wd@denx.de>
      4c5baa63
  15. 10 Sep, 2009 3 commits
    • Prafulla Wadaskar's avatar
      mkimage: Add Kirkwood Boot Image support (kwbimage) · aa0c7a86
      Prafulla Wadaskar authored
      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: default avatarPrafulla Wadaskar <prafulla@marvell.com>
      Acked-by: default avatarRon Lee <ron@debian.org>
      Signed-off-by: default avatarPrafulla Wadaskar <prafulla@marvell.com>
      aa0c7a86
    • Wolfgang Denk's avatar
      tools/mkimage: fix compiler warnings, use "const" · 3a2003f6
      Wolfgang Denk authored
      This fixes some compiler warnings:
      tools/default_image.c:141: warning: initialization from incompatible pointer type
      tools/fit_image.c:202: warning: initialization from incompatible pointer type
      and changes to code to use "const" attributes in a few places where
      it's appropriate.
      Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
      3a2003f6
    • Prafulla Wadaskar's avatar
      tools: mkimage: split code into core, default and FIT image specific · 89a4d6b1
      Prafulla Wadaskar authored
      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: default avatarPrafulla Wadaskar <prafulla@marvell.com>
      Edit commit message, fix coding style and typos.
      Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
      89a4d6b1
  16. 04 Sep, 2009 1 commit
  17. 19 Jul, 2009 1 commit
    • Mike Frysinger's avatar
      compiler.h: unify system ifdef cruft here · 37566090
      Mike Frysinger authored
      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: default avatarMike Frysinger <vapier@gentoo.org>
      37566090
  18. 03 Apr, 2009 1 commit
    • Peter Tyser's avatar
      Add support for building native win32 tools · 2f8d396b
      Peter Tyser authored
      Add support for compiling the host tools in the tools directory using
      the MinGW toolchain.  This produces executables which can be used on
      standard Windows computers without requiring cygwin.
      
      One must specify the MinGW compiler and strip utilities as if they
      were the host toolchain in order to build win32 executables, eg:
      
      make HOSTCC=i586-mingw32msvc-gcc HOSTSTRIP=i586-mingw32msvc-strip tools
      Signed-off-by: default avatarPeter Tyser <ptyser@xes-inc.com>
      2f8d396b
  19. 11 Mar, 2008 1 commit
    • Bartlomiej Sieka's avatar
      [new uImage] Add support for new uImage format to mkimage tool · 9d25438f
      Bartlomiej Sieka authored
      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: default avatarBartlomiej Sieka <tur@semihalf.com>
      9d25438f
  20. 10 Mar, 2008 1 commit
  21. 29 Feb, 2008 2 commits
  22. 07 Feb, 2008 1 commit