[U-Boot-Users] [PATCH 2/6] Support uImage files for the AVR32 architecture

[Haavard Skinnemoen]

Define IH_CPU_AVR32, make it possible to generate AVR32 uImage files
with mkimage and make cmd_bootm recognize them.

Signed-off-by: Haavard Skinnemoen <hskinnemoen at atmel.com>
---
CHANGELOG:
	Add support for uImage files for the AVR32 architecture

 common/cmd_bootm.c |    3 +++
 include/image.h    |    1 +
 tools/mkimage.c    |    1 +
 3 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index fdf7180..2168e67 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -260,6 +260,8 @@ #elif defined(__nios2__)
 	if (hdr->ih_arch != IH_CPU_NIOS2)
 #elif defined(__blackfin__)
 	if (hdr->ih_arch != IH_CPU_BLACKFIN)
+#elif defined(__avr32__)
+	if (hdr->ih_arch != IH_CPU_AVR32)
 #else
 # error Unknown CPU type
 #endif
@@ -1236,6 +1238,7 @@ #endif
 	case IH_CPU_INVALID:	arch = "Invalid CPU";		break;
 	case IH_CPU_ALPHA:	arch = "Alpha";			break;
 	case IH_CPU_ARM:	arch = "ARM";			break;
+	case IH_CPU_AVR32:	arch = "AVR32";			break;
 	case IH_CPU_I386:	arch = "Intel x86";		break;
 	case IH_CPU_IA64:	arch = "IA64";			break;
 	case IH_CPU_MIPS:	arch = "MIPS";			break;
diff --git a/include/image.h b/include/image.h
index 139df0b..d9f2d46 100644
--- a/include/image.h
+++ b/include/image.h
@@ -76,6 +76,7 @@ #define IH_CPU_NIOS		13	/* Nios-32	*/
 #define IH_CPU_MICROBLAZE	14	/* MicroBlaze   */
 #define IH_CPU_NIOS2		15	/* Nios-II	*/
 #define IH_CPU_BLACKFIN		16	/* Blackfin	*/
+#define IH_CPU_AVR32		17	/* AVR32	*/
 
 /*
  * Image Types
diff --git a/tools/mkimage.c b/tools/mkimage.c
index fea3e5b..2cb2524 100644
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -94,6 +94,7 @@ table_entry_t arch_name[] = {
     {	IH_CPU_SPARC,		"sparc",	"SPARC",	},
     {	IH_CPU_SPARC64,		"sparc64",	"SPARC 64 Bit",	},
     {	IH_CPU_BLACKFIN,	"blackfin",	"Blackfin",	},
+    {	IH_CPU_AVR32,		"avr32",	"AVR32",	},
     {	-1,			"",		"",		},
 };
 
-- 
1.4.1.1