Define IH_CPU_AVR32

Make it possible to generate AVR32 uImage files with mkimage and
make cmd_bootm recognize them.
Patch by Haavard Skinnemoen, 22 Sep 2006

diff --git a/CHANGELOG b/CHANGELOG
index b6ba66d09cec2b55e84d055d3a982b7e860d298b..e3ab62138dd41e302de72f05ca063950a2db118d 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,11 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Define IH_CPU_AVR32
+  Make it possible to generate AVR32 uImage files with mkimage and
+  make cmd_bootm recognize them.
+  Patch by Haavard Skinnemoen, 22 Sep 2006
+
 * Make bootp implementation RFC3046 compliant
   Patch by Joakim Larsson, 27 Jun 2006
 

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index fdf7180a19a87d4974b3b1a4cc131dba4ba432ba..2168e6737a08b9125f9564dd439c5dfb785dcb5d 100644 (file)
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -260,6 +260,8 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        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 @@ print_type (image_header_t *hdr)
        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 139df0b2d1e783b836a81689a053071bd290f1a8..d9f2d461a5f809c6562dec78b84b2f96d24a8e79 100644 (file)
--- a/include/image.h
+++ b/include/image.h
@@ -76,6 +76,7 @@
 #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 60aac79f234ba750c8169b245bd68a8fd6e87a64..5f3634de4269e1e1b76d988010d769fe7bd63db0 100644 (file)
--- 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,                     "",             "",             },
 };