Merge with /home/wd/git/u-boot/master

[u-boot] / common / cmd_bootm.c

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 27bb494ff056cd3f9fb5559509cb3a5e6dd898b3..bc84ae3da9955095d09e69783fb1d1018dc5304c 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
@@ -1310,6 +1312,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;