diff options
| author | Jon Loeliger <jdl@freescale.com> | 2006-10-10 17:21:42 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2006-10-10 17:21:42 -0500 |
| commit | daaba9859b0b94571dc3e45ad0c26e136426b351 (patch) | |
| tree | 688c9068794d45f78f9347cb47b7fba55a4b10be /common/cmd_bootm.c | |
| parent | 1fd5699a4a24f5c1dab1b32f480bace1ebb9fc3e (diff) | |
| parent | a3bb7bfc06a9ccb7e2f91ccc54a90ae69177214f (diff) | |
| download | talos-obmc-uboot-daaba9859b0b94571dc3e45ad0c26e136426b351.tar.gz talos-obmc-uboot-daaba9859b0b94571dc3e45ad0c26e136426b351.zip | |
Merge branch 'master' of http://www.denx.de/git/u-boot
Diffstat (limited to 'common/cmd_bootm.c')
| -rw-r--r-- | common/cmd_bootm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 652d8431da..e2cb6b93cd 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 @@ -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; |
