diff options
| author | Wolfgang Denk <wd@nyx.denx.de> | 2006-10-11 14:15:21 +0200 | 
|---|---|---|
| committer | Wolfgang Denk <wd@nyx.denx.de> | 2006-10-11 14:15:21 +0200 | 
| commit | fb883a521e04437acfe989de3e152b2e4866856b (patch) | |
| tree | 0cf61f45ae693082b24ced9c1da9a87bdd0cabbd /common/cmd_bootm.c | |
| parent | 4a39616da41840bbc5b4c3f69df9861c2e6a8425 (diff) | |
| parent | 2255b2d2044d434463eb2661e18018e50f1643d9 (diff) | |
| download | olio-uboot-2014.01-fb883a521e04437acfe989de3e152b2e4866856b.tar.xz olio-uboot-2014.01-fb883a521e04437acfe989de3e152b2e4866856b.zip | |
Merge with /home/wd/git/u-boot/master
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 27bb494ff..bc84ae3da 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; |