diff options
author | Tom Rini <trini@ti.com> | 2013-09-06 20:25:35 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-09-06 20:25:35 -0400 |
commit | 47f75cf2e1d8648e3438630f3a4bddf9b5caa25d (patch) | |
tree | 1d0f8f8943d44245381f255a059e258c696bc5a8 /common/image.c | |
parent | 1affd4d4a3fe512050e1ad1636d9360c670da531 (diff) | |
parent | 68e1747f9c0506159e8ecc9a4feb58e9c65a7b39 (diff) | |
download | u-boot-imx-47f75cf2e1d8648e3438630f3a4bddf9b5caa25d.zip u-boot-imx-47f75cf2e1d8648e3438630f3a4bddf9b5caa25d.tar.gz u-boot-imx-47f75cf2e1d8648e3438630f3a4bddf9b5caa25d.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
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 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, "", "", }, }; |