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 /include | |
| parent | 797449a16d7f56ce1a7e38e3d85061f933b92c17 (diff) | |
| parent | d510859bed4165ebf2635c74c40a037cd2819fce (diff) | |
| download | u-boot-4ebbba442587cb03590c0747fd1fea16a158f15c.tar.gz u-boot-4ebbba442587cb03590c0747fd1fea16a158f15c.tar.bz2 u-boot-4ebbba442587cb03590c0747fd1fea16a158f15c.zip | |
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 'include')
| -rw-r--r-- | include/image.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/image.h b/include/image.h index 6a41c2e34e..466c98018f 100644 --- a/include/image.h +++ b/include/image.h @@ -162,6 +162,7 @@ #define IH_TYPE_UBLIMAGE 11 /* Davinci UBL Image */ #define IH_TYPE_OMAPIMAGE 12 /* TI OMAP Config Header Image */ #define IH_TYPE_AISIMAGE 13 /* TI Davinci AIS Image */ +#define IH_TYPE_KERNEL_NOLOAD 14 /* OS Kernel Image, can run from any load address */ /* * Compression Types |