diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-03-22 00:00:03 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-03-22 00:00:03 +0100 |
| commit | a17824c749aac3df0bbb528bb5d33af68296b0b1 (patch) | |
| tree | 399efb15b55d6992279eef98fa6878852d403352 /common/cmd_bootm.c | |
| parent | 2a8dfe08359a1b663418b2faa1da1d7bce34d302 (diff) | |
| parent | b2777c087b5a564e9209988873da4ec749f85aad (diff) | |
| download | talos-obmc-uboot-a17824c749aac3df0bbb528bb5d33af68296b0b1.tar.gz talos-obmc-uboot-a17824c749aac3df0bbb528bb5d33af68296b0b1.zip | |
Merge with /home/wd/git/u-boot/custodian/u-boot-blackfin
Diffstat (limited to 'common/cmd_bootm.c')
| -rw-r--r-- | common/cmd_bootm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 7aae8a6d1b..727b8726f5 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -258,7 +258,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) if (hdr->ih_arch != IH_CPU_MICROBLAZE) #elif defined(__nios2__) if (hdr->ih_arch != IH_CPU_NIOS2) -#elif defined(__blackfin__) +#elif defined(__bfin__) if (hdr->ih_arch != IH_CPU_BLACKFIN) #elif defined(__avr32__) if (hdr->ih_arch != IH_CPU_AVR32) @@ -1367,6 +1367,7 @@ print_type (image_header_t *hdr) case IH_CPU_MICROBLAZE: arch = "Microblaze"; break; case IH_CPU_NIOS: arch = "Nios"; break; case IH_CPU_NIOS2: arch = "Nios-II"; break; + case IH_CPU_BLACKFIN: arch = "Blackfin"; break; default: arch = "Unknown Architecture"; break; } |
