diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-12-02 00:05:25 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-12-02 00:05:25 +0100 |
| commit | 4ebbba442587cb03590c0747fd1fea16a158f15c (patch) | |
| tree | 0b6f2db3755d4deec6b7f8f69462d68b7eacba9e /tools | |
| parent | 797449a16d7f56ce1a7e38e3d85061f933b92c17 (diff) | |
| parent | d510859bed4165ebf2635c74c40a037cd2819fce (diff) | |
Merge branch 'sr@denx.de' of git://git.denx.de/u-boot-staging
* 'sr@denx.de' of git://git.denx.de/u-boot-staging:
image: Don't detect XIP images as overlapping.
image: Implement IH_TYPE_KERNEL_NOLOAD
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/default_image.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/default_image.c b/tools/default_image.c index 6ea3b462cdd..e9d072975bb 100644 --- a/tools/default_image.c +++ b/tools/default_image.c @@ -35,7 +35,8 @@ static image_header_t header; static int image_check_image_types(uint8_t type) { - if ((type > IH_TYPE_INVALID) && (type < IH_TYPE_FLATDT)) + if (((type > IH_TYPE_INVALID) && (type < IH_TYPE_FLATDT)) || + (type == IH_TYPE_KERNEL_NOLOAD)) return EXIT_SUCCESS; else return EXIT_FAILURE; |