diff options
| author | Wolfgang Denk <wd@nyx.denx.de> | 2006-10-09 13:32:53 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@nyx.denx.de> | 2006-10-09 13:32:53 +0200 |
| commit | a3bb7bfc06a9ccb7e2f91ccc54a90ae69177214f (patch) | |
| tree | b40f5497ed0612956f5b74b662cf6913b4072e78 | |
| parent | d262a92f0f6d43d671bfb0d5681246bff14d7997 (diff) | |
| parent | 1a1b7374b89a04737c76948b00207b56a1bb37b6 (diff) | |
| download | olio-uboot-2014.01-a3bb7bfc06a9ccb7e2f91ccc54a90ae69177214f.tar.xz olio-uboot-2014.01-a3bb7bfc06a9ccb7e2f91ccc54a90ae69177214f.zip | |
Merge with /home/sr/git/u-boot/avr32
| -rw-r--r-- | CHANGELOG | 5 | ||||
| -rw-r--r-- | common/cmd_bootm.c | 3 | ||||
| -rw-r--r-- | include/image.h | 1 | ||||
| -rw-r--r-- | tools/mkimage.c | 1 |
4 files changed, 10 insertions, 0 deletions
@@ -2,6 +2,11 @@ Changes since U-Boot 1.1.4: ====================================================================== +* Define IH_CPU_AVR32 + Make it possible to generate AVR32 uImage files with mkimage and + make cmd_bootm recognize them. + Patch by Haavard Skinnemoen, 22 Sep 2006 + * Fix buffer overflow problem in ft_build.c Patch by Fredrik Roubert, 09 Oct 2006 diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index fdf7180a1..2168e6737 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; diff --git a/include/image.h b/include/image.h index 139df0b2d..d9f2d461a 100644 --- a/include/image.h +++ b/include/image.h @@ -76,6 +76,7 @@ #define IH_CPU_MICROBLAZE 14 /* MicroBlaze */ #define IH_CPU_NIOS2 15 /* Nios-II */ #define IH_CPU_BLACKFIN 16 /* Blackfin */ +#define IH_CPU_AVR32 17 /* AVR32 */ /* * Image Types diff --git a/tools/mkimage.c b/tools/mkimage.c index 60aac79f2..5f3634de4 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -94,6 +94,7 @@ table_entry_t arch_name[] = { { IH_CPU_SPARC, "sparc", "SPARC", }, { IH_CPU_SPARC64, "sparc64", "SPARC 64 Bit", }, { IH_CPU_BLACKFIN, "blackfin", "Blackfin", }, + { IH_CPU_AVR32, "avr32", "AVR32", }, { -1, "", "", }, }; |