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 /tools/mkimage.c | |
| parent | 4a39616da41840bbc5b4c3f69df9861c2e6a8425 (diff) | |
| parent | 2255b2d2044d434463eb2661e18018e50f1643d9 (diff) | |
| download | u-boot-fb883a521e04437acfe989de3e152b2e4866856b.zip u-boot-fb883a521e04437acfe989de3e152b2e4866856b.tar.gz u-boot-fb883a521e04437acfe989de3e152b2e4866856b.tar.bz2 | |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'tools/mkimage.c')
| -rw-r--r-- | tools/mkimage.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/mkimage.c b/tools/mkimage.c index d6000e0..416e658 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, "", "", }, }; @@ -633,7 +634,7 @@ print_header (image_header_t *hdr) if (hdr->ih_type == IH_TYPE_MULTI || hdr->ih_type == IH_TYPE_SCRIPT) { int i, ptrs; uint32_t pos; - unsigned long *len_ptr = (unsigned long *) ( + uint32_t *len_ptr = (uint32_t *) ( (unsigned long)hdr + sizeof(image_header_t) ); |