aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-09-05 11:15:26 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-09-05 11:15:26 +0200
commit19d829fa60fc4e6df514a046142faaaf9fc8185d (patch)
tree295c75b0d9f3c7180f23ec131442286cf91db5b1 /common
parente62d5fb0da76ef168e90cae9bbbda80349aaf137 (diff)
parent8467faef7fce8c5faad7224b7737a58e16c52186 (diff)
downloadu-boot-19d829fa60fc4e6df514a046142faaaf9fc8185d.zip
u-boot-19d829fa60fc4e6df514a046142faaaf9fc8185d.tar.gz
u-boot-19d829fa60fc4e6df514a046142faaaf9fc8185d.tar.bz2
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 'common')
-rw-r--r--common/image.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/common/image.c b/common/image.c
index 56a5a62..2c88091 100644
--- a/common/image.c
+++ b/common/image.c
@@ -135,6 +135,7 @@ static const table_entry_t uimage_type[] = {
{ IH_TYPE_SCRIPT, "script", "Script", },
{ IH_TYPE_STANDALONE, "standalone", "Standalone Program", },
{ IH_TYPE_UBLIMAGE, "ublimage", "Davinci UBL image",},
+ { IH_TYPE_MXSIMAGE, "mxsimage", "Freescale MXS Boot Image",},
{ -1, "", "", },
};