diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-05 11:15:26 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-05 11:15:26 +0200 |
| commit | 19d829fa60fc4e6df514a046142faaaf9fc8185d (patch) | |
| tree | 295c75b0d9f3c7180f23ec131442286cf91db5b1 /include/image.h | |
| parent | e62d5fb0da76ef168e90cae9bbbda80349aaf137 (diff) | |
| parent | 8467faef7fce8c5faad7224b7737a58e16c52186 (diff) | |
| download | olio-uboot-2014.01-19d829fa60fc4e6df514a046142faaaf9fc8185d.tar.xz olio-uboot-2014.01-19d829fa60fc4e6df514a046142faaaf9fc8185d.zip | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts:
drivers/serial/serial.c
The conflict above was a trivial case of adding one init
function in each branch, and manually resolved in merge.
Diffstat (limited to 'include/image.h')
| -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 f93a39389..ee6eb8d24 100644 --- a/include/image.h +++ b/include/image.h @@ -212,6 +212,7 @@ struct lmb; #define IH_TYPE_AISIMAGE 13 /* TI Davinci AIS Image */ #define IH_TYPE_KERNEL_NOLOAD 14 /* OS Kernel Image, can run from any load address */ #define IH_TYPE_PBLIMAGE 15 /* Freescale PBL Boot Image */ +#define IH_TYPE_MXSIMAGE 16 /* Freescale MXSBoot Image */ /* * Compression Types |