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 /common/image.c | |
| 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 'common/image.c')
| -rw-r--r-- | common/image.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/common/image.c b/common/image.c index 555d9d9d42..aacae5ac51 100644 --- a/common/image.c +++ b/common/image.c @@ -136,6 +136,7 @@ static const table_entry_t uimage_type[] = { { IH_TYPE_FIRMWARE, "firmware", "Firmware", }, { IH_TYPE_FLATDT, "flat_dt", "Flat Device Tree", }, { IH_TYPE_KERNEL, "kernel", "Kernel Image", }, + { IH_TYPE_KERNEL_NOLOAD, "kernel_noload", "Kernel Image (no loading done)", }, { IH_TYPE_KWBIMAGE, "kwbimage", "Kirkwood Boot Image",}, { IH_TYPE_IMXIMAGE, "imximage", "Freescale i.MX Boot Image",}, { IH_TYPE_INVALID, NULL, "Invalid Image", }, |