summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorWolfgang Denk <wd@nyx.denx.de>2006-10-09 13:32:53 +0200
committerWolfgang Denk <wd@nyx.denx.de>2006-10-09 13:32:53 +0200
commita3bb7bfc06a9ccb7e2f91ccc54a90ae69177214f (patch)
treeb40f5497ed0612956f5b74b662cf6913b4072e78 /common
parentd262a92f0f6d43d671bfb0d5681246bff14d7997 (diff)
parent1a1b7374b89a04737c76948b00207b56a1bb37b6 (diff)
downloadu-boot-imx-a3bb7bfc06a9ccb7e2f91ccc54a90ae69177214f.zip
u-boot-imx-a3bb7bfc06a9ccb7e2f91ccc54a90ae69177214f.tar.gz
u-boot-imx-a3bb7bfc06a9ccb7e2f91ccc54a90ae69177214f.tar.bz2
Merge with /home/sr/git/u-boot/avr32
Diffstat (limited to 'common')
-rw-r--r--common/cmd_bootm.c3
1 files changed, 3 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 @@ 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;