Merge branch 'master' of git://git.denx.de/u-boot-arm

2025-10-08 11:45:18 +02:00 · 2014-05-30 11:34:39 -04:00
parent 95856248ca 9637a1bb89
commit 90b51c33f3
70 changed files with 4112 additions and 54 deletions
--- 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,		    "",		  "",			},
 };