diff options
author | Tom Rini <trini@ti.com> | 2014-05-30 11:34:39 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-05-30 11:34:39 -0400 |
commit | 90b51c33f362926e17d4c07dcef1ce822abaa89f (patch) | |
tree | 9eb339bb2b864bfac2434d0cd808301506e9bb82 /common | |
parent | 95856248ca93b9048d87264fbef67ca382975650 (diff) | |
parent | 9637a1bb896efe392a58dd2772e2c3fcb646409d (diff) | |
download | u-boot-imx-90b51c33f362926e17d4c07dcef1ce822abaa89f.zip u-boot-imx-90b51c33f362926e17d4c07dcef1ce822abaa89f.tar.gz u-boot-imx-90b51c33f362926e17d4c07dcef1ce822abaa89f.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'common')
-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 fa4864d..26eb89a 100644 --- a/common/image.c +++ b/common/image.c @@ -139,6 +139,7 @@ static const table_entry_t uimage_type[] = { { IH_TYPE_STANDALONE, "standalone", "Standalone Program", }, { IH_TYPE_UBLIMAGE, "ublimage", "Davinci UBL image",}, { IH_TYPE_MXSIMAGE, "mxsimage", "Freescale MXS Boot Image",}, + { IH_TYPE_ATMELIMAGE, "atmelimage", "ATMEL ROM-Boot Image",}, { -1, "", "", }, }; |