blob: 07fa2d3160d6aa6a3b676e418fe91bbe5b902aa5 [file] [log] [blame]
Tom Rini83d290c2018-05-06 17:58:06 -04001// SPDX-License-Identifier: GPL-2.0+
Marian Balakowiczb97a2a02008-01-08 18:14:09 +01002/*
3 * (C) Copyright 2008 Semihalf
4 *
5 * (C) Copyright 2000-2006
6 * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
Marian Balakowiczb97a2a02008-01-08 18:14:09 +01007 */
Marian Balakowiczceaed2b2008-01-31 13:57:17 +01008
Marian Balakowiczb97a2a02008-01-08 18:14:09 +01009#ifndef USE_HOSTCC
Marian Balakowicz5ad03eb2008-01-31 13:55:39 +010010#include <common.h>
Simon Glass7b51b572019-08-01 09:46:52 -060011#include <env.h>
Andy Shevchenko4b325312021-11-08 21:03:38 +030012#include <init.h>
Simon Glass4d72caa2020-05-10 11:40:01 -060013#include <lmb.h>
Simon Glassf7ae49f2020-05-10 11:40:05 -060014#include <log.h>
Simon Glass336d4612020-02-03 07:36:16 -070015#include <malloc.h>
Simon Glass3db71102019-11-14 12:57:16 -070016#include <u-boot/crc.h>
Marian Balakowicz5ad03eb2008-01-31 13:55:39 +010017
18#ifdef CONFIG_SHOW_BOOT_PROGRESS
19#include <status_led.h>
20#endif
21
Simon Glass0c303f92021-09-25 19:43:21 -060022#if CONFIG_IS_ENABLED(FIT) || CONFIG_IS_ENABLED(OF_LIBFDT)
Masahiro Yamadab08c8c42018-03-05 01:20:11 +090023#include <linux/libfdt.h>
Marian Balakowiczfff888a12008-02-21 17:20:19 +010024#include <fdt_support.h>
Marian Balakowiczc8779642008-03-12 10:12:37 +010025#endif
26
Simon Glass401d1c42020-10-30 21:38:53 -060027#include <asm/global_data.h>
Andy Fleming20a14a42008-04-02 16:19:07 -050028#include <u-boot/md5.h>
Jeroen Hofstee2b9912e2014-06-12 22:27:12 +020029#include <u-boot/sha1.h>
Masahiro Yamada1221ce42016-09-21 11:28:55 +090030#include <linux/errno.h>
Simon Glass35e7b0f2013-05-07 06:12:03 +000031#include <asm/io.h>
Marian Balakowiczc8779642008-03-12 10:12:37 +010032
Marian Balakowiczb6b0fe62008-01-31 13:58:13 +010033DECLARE_GLOBAL_DATA_PTR;
Marian Balakowicz8a5ea3e2008-02-27 11:01:04 +010034
Simon Glass458b30a2021-09-25 07:03:14 -060035/* Set this if we have less than 4 MB of malloc() space */
36#if CONFIG_SYS_MALLOC_LEN < (4096 * 1024)
37#define CONSERVE_MEMORY true
Marian Balakowiczb97a2a02008-01-08 18:14:09 +010038#else
Simon Glass458b30a2021-09-25 07:03:14 -060039#define CONSERVE_MEMORY false
40#endif
41
42#else /* USE_HOSTCC */
Marian Balakowicz5ad03eb2008-01-31 13:55:39 +010043#include "mkimage.h"
Andy Fleming20a14a42008-04-02 16:19:07 -050044#include <u-boot/md5.h>
Marian Balakowicz5dfb5212008-02-29 21:24:06 +010045#include <time.h>
Heiko Schocher80402f32015-06-29 09:10:46 +020046
47#ifndef __maybe_unused
48# define __maybe_unused /* unimplemented */
49#endif
Simon Glass458b30a2021-09-25 07:03:14 -060050
51#define CONSERVE_MEMORY false
52
Marian Balakowicz5dfb5212008-02-29 21:24:06 +010053#endif /* !USE_HOSTCC*/
Marian Balakowiczb97a2a02008-01-08 18:14:09 +010054
Simon Glass458b30a2021-09-25 07:03:14 -060055#include <abuf.h>
56#include <bzlib.h>
Simon Glass5d3248a2021-09-25 07:03:17 -060057#include <display_options.h>
Simon Glass458b30a2021-09-25 07:03:14 -060058#include <gzip.h>
Simon Glass41506ff2021-09-25 07:03:15 -060059#include <image.h>
Breno Matheus Lima5b20d142019-09-23 18:39:47 +000060#include <imximage.h>
Simon Glass2ac00c02021-09-25 07:03:18 -060061#include <relocate.h>
Simon Glass458b30a2021-09-25 07:03:14 -060062#include <linux/lzo.h>
63#include <linux/zstd.h>
64#include <linux/kconfig.h>
65#include <lzma/LzmaTypes.h>
66#include <lzma/LzmaDec.h>
67#include <lzma/LzmaTools.h>
68#include <u-boot/crc.h>
Simon Glass2a2d8e92021-10-09 09:28:21 -060069#include <u-boot/lz4.h>
Simon Glass0ccff502013-02-24 17:33:25 +000070
Mike Frysinger7edb1862010-10-20 07:17:39 -040071static const table_entry_t uimage_arch[] = {
Simon Glass30495bf2016-06-30 10:52:15 -060072 { IH_ARCH_INVALID, "invalid", "Invalid ARCH", },
Marian Balakowicz570abb02008-02-29 15:59:59 +010073 { IH_ARCH_ALPHA, "alpha", "Alpha", },
74 { IH_ARCH_ARM, "arm", "ARM", },
75 { IH_ARCH_I386, "x86", "Intel x86", },
76 { IH_ARCH_IA64, "ia64", "IA64", },
77 { IH_ARCH_M68K, "m68k", "M68K", },
78 { IH_ARCH_MICROBLAZE, "microblaze", "MicroBlaze", },
79 { IH_ARCH_MIPS, "mips", "MIPS", },
80 { IH_ARCH_MIPS64, "mips64", "MIPS 64 Bit", },
Marian Balakowicz570abb02008-02-29 15:59:59 +010081 { IH_ARCH_NIOS2, "nios2", "NIOS II", },
Grant Ericksone419e122008-05-04 16:45:01 -070082 { IH_ARCH_PPC, "powerpc", "PowerPC", },
Marian Balakowicz570abb02008-02-29 15:59:59 +010083 { IH_ARCH_PPC, "ppc", "PowerPC", },
84 { IH_ARCH_S390, "s390", "IBM S390", },
85 { IH_ARCH_SH, "sh", "SuperH", },
86 { IH_ARCH_SPARC, "sparc", "SPARC", },
87 { IH_ARCH_SPARC64, "sparc64", "SPARC 64 Bit", },
88 { IH_ARCH_BLACKFIN, "blackfin", "Blackfin", },
89 { IH_ARCH_AVR32, "avr32", "AVR32", },
Macpaul Lin64d61462011-10-19 20:41:09 +000090 { IH_ARCH_NDS32, "nds32", "NDS32", },
Stefan Kristiansson3ddcacc2011-11-26 19:04:50 +000091 { IH_ARCH_OPENRISC, "or1k", "OpenRISC 1000",},
Simon Glass35e7b0f2013-05-07 06:12:03 +000092 { IH_ARCH_SANDBOX, "sandbox", "Sandbox", },
David Feng0ae76532013-12-14 11:47:35 +080093 { IH_ARCH_ARM64, "arm64", "AArch64", },
Alexey Brodkinbc5d5422014-02-04 12:56:16 +040094 { IH_ARCH_ARC, "arc", "ARC", },
Simon Glass5bda35c2014-10-10 08:21:57 -060095 { IH_ARCH_X86_64, "x86_64", "AMD x86_64", },
Chris Zankelde5e5ce2016-08-10 18:36:43 +030096 { IH_ARCH_XTENSA, "xtensa", "Xtensa", },
Rick Chen86aa65a2018-03-13 13:37:29 +080097 { IH_ARCH_RISCV, "riscv", "RISC-V", },
Marian Balakowicz570abb02008-02-29 15:59:59 +010098 { -1, "", "", },
99};
100
Mike Frysinger7edb1862010-10-20 07:17:39 -0400101static const table_entry_t uimage_os[] = {
Simon Glass30495bf2016-06-30 10:52:15 -0600102 { IH_OS_INVALID, "invalid", "Invalid OS", },
Philipp Tomsich4914af12017-09-13 21:29:29 +0200103 { IH_OS_ARM_TRUSTED_FIRMWARE, "arm-trusted-firmware", "ARM Trusted Firmware" },
Marian Balakowicz570abb02008-02-29 15:59:59 +0100104 { IH_OS_LINUX, "linux", "Linux", },
Marian Balakowicz570abb02008-02-29 15:59:59 +0100105 { IH_OS_NETBSD, "netbsd", "NetBSD", },
Torkel Lundgren3df61952010-09-28 11:05:36 +0200106 { IH_OS_OSE, "ose", "Enea OSE", },
Steven Stallion04d41402013-03-20 06:31:35 +0000107 { IH_OS_PLAN9, "plan9", "Plan 9", },
Marian Balakowicz570abb02008-02-29 15:59:59 +0100108 { IH_OS_RTEMS, "rtems", "RTEMS", },
Bryan O'Donoghue45b55712018-03-13 16:50:35 +0000109 { IH_OS_TEE, "tee", "Trusted Execution Environment" },
Marian Balakowicz570abb02008-02-29 15:59:59 +0100110 { IH_OS_U_BOOT, "u-boot", "U-Boot", },
miao.yan@windriver.com68b15e82013-12-27 16:01:50 +0800111 { IH_OS_VXWORKS, "vxworks", "VxWorks", },
Marian Balakowicz570abb02008-02-29 15:59:59 +0100112#if defined(CONFIG_CMD_ELF) || defined(USE_HOSTCC)
113 { IH_OS_QNX, "qnx", "QNX", },
Marian Balakowicz570abb02008-02-29 15:59:59 +0100114#endif
Peter Tyserf5ed9e32008-09-08 14:56:49 -0500115#if defined(CONFIG_INTEGRITY) || defined(USE_HOSTCC)
116 { IH_OS_INTEGRITY,"integrity", "INTEGRITY", },
117#endif
Marian Balakowicz570abb02008-02-29 15:59:59 +0100118#ifdef USE_HOSTCC
119 { IH_OS_4_4BSD, "4_4bsd", "4_4BSD", },
120 { IH_OS_DELL, "dell", "Dell", },
121 { IH_OS_ESIX, "esix", "Esix", },
122 { IH_OS_FREEBSD, "freebsd", "FreeBSD", },
123 { IH_OS_IRIX, "irix", "Irix", },
124 { IH_OS_NCR, "ncr", "NCR", },
125 { IH_OS_OPENBSD, "openbsd", "OpenBSD", },
126 { IH_OS_PSOS, "psos", "pSOS", },
127 { IH_OS_SCO, "sco", "SCO", },
128 { IH_OS_SOLARIS, "solaris", "Solaris", },
129 { IH_OS_SVR4, "svr4", "SVR4", },
130#endif
Marek Vasut67ddd952014-12-16 14:07:21 +0100131#if defined(CONFIG_BOOTM_OPENRTOS) || defined(USE_HOSTCC)
132 { IH_OS_OPENRTOS, "openrtos", "OpenRTOS", },
133#endif
Lukas Auer5e30e452019-08-21 21:14:44 +0200134 { IH_OS_OPENSBI, "opensbi", "RISC-V OpenSBI", },
Cristian Ciocalteaa031b032019-12-24 18:05:38 +0200135 { IH_OS_EFI, "efi", "EFI Firmware" },
Marek Vasut67ddd952014-12-16 14:07:21 +0100136
Marian Balakowicz570abb02008-02-29 15:59:59 +0100137 { -1, "", "", },
138};
139
Mike Frysinger7edb1862010-10-20 07:17:39 -0400140static const table_entry_t uimage_type[] = {
Stefano Babic4962e382011-10-17 00:07:43 +0000141 { IH_TYPE_AISIMAGE, "aisimage", "Davinci AIS image",},
Marian Balakowicz570abb02008-02-29 15:59:59 +0100142 { IH_TYPE_FILESYSTEM, "filesystem", "Filesystem Image", },
143 { IH_TYPE_FIRMWARE, "firmware", "Firmware", },
John Rigby3decb142011-07-21 09:10:30 -0400144 { IH_TYPE_FLATDT, "flat_dt", "Flat Device Tree", },
Karicheri, Muralidharanbf411ea2014-04-04 13:16:48 -0400145 { IH_TYPE_GPIMAGE, "gpimage", "TI Keystone SPL Image",},
Marian Balakowicz570abb02008-02-29 15:59:59 +0100146 { IH_TYPE_KERNEL, "kernel", "Kernel Image", },
Stephen Warrenb9b50e892011-11-10 13:17:53 -0700147 { IH_TYPE_KERNEL_NOLOAD, "kernel_noload", "Kernel Image (no loading done)", },
Stefano Babic4962e382011-10-17 00:07:43 +0000148 { IH_TYPE_KWBIMAGE, "kwbimage", "Kirkwood Boot Image",},
149 { IH_TYPE_IMXIMAGE, "imximage", "Freescale i.MX Boot Image",},
Peng Fana2b96ec2018-10-16 04:50:30 +0000150 { IH_TYPE_IMX8IMAGE, "imx8image", "NXP i.MX8 Boot Image",},
Peng Fan6609c262018-11-20 10:19:36 +0000151 { IH_TYPE_IMX8MIMAGE, "imx8mimage", "NXP i.MX8M Boot Image",},
Simon Glass30495bf2016-06-30 10:52:15 -0600152 { IH_TYPE_INVALID, "invalid", "Invalid Image", },
Marian Balakowicz570abb02008-02-29 15:59:59 +0100153 { IH_TYPE_MULTI, "multi", "Multi-File Image", },
Stefano Babic4962e382011-10-17 00:07:43 +0000154 { IH_TYPE_OMAPIMAGE, "omapimage", "TI OMAP SPL With GP CH",},
Shaohui Xie5d898a02012-08-10 02:49:35 +0000155 { IH_TYPE_PBLIMAGE, "pblimage", "Freescale PBL Boot Image",},
Marian Balakowicz570abb02008-02-29 15:59:59 +0100156 { IH_TYPE_RAMDISK, "ramdisk", "RAMDisk Image", },
157 { IH_TYPE_SCRIPT, "script", "Script", },
Marek Vasut662abc42018-04-15 13:15:33 +0200158 { IH_TYPE_SOCFPGAIMAGE, "socfpgaimage", "Altera SoCFPGA CV/AV preloader",},
159 { IH_TYPE_SOCFPGAIMAGE_V1, "socfpgaimage_v1", "Altera SoCFPGA A10 preloader",},
Marian Balakowicz570abb02008-02-29 15:59:59 +0100160 { IH_TYPE_STANDALONE, "standalone", "Standalone Program", },
Heiko Schocher7816f2c2011-07-16 00:06:42 +0000161 { IH_TYPE_UBLIMAGE, "ublimage", "Davinci UBL image",},
Marek Vasutbce88372013-08-26 20:43:33 +0200162 { IH_TYPE_MXSIMAGE, "mxsimage", "Freescale MXS Boot Image",},
Andreas Bießmann7b1a4112014-05-19 14:23:39 +0200163 { IH_TYPE_ATMELIMAGE, "atmelimage", "ATMEL ROM-Boot Image",},
Simon Glass90268b82014-10-19 21:11:24 -0600164 { IH_TYPE_X86_SETUP, "x86_setup", "x86 setup.bin", },
Albert ARIBAUD \(3ADEV\)39f520b2015-03-31 11:40:49 +0200165 { IH_TYPE_LPC32XXIMAGE, "lpc32xximage", "LPC32XX Boot Image", },
Simon Glassa131c1f2015-08-30 16:55:24 -0600166 { IH_TYPE_RKIMAGE, "rkimage", "Rockchip Boot Image" },
Simon Glassf9a3c272015-08-30 16:55:25 -0600167 { IH_TYPE_RKSD, "rksd", "Rockchip SD Boot Image" },
Simon Glass10b84fe2015-08-30 16:55:26 -0600168 { IH_TYPE_RKSPI, "rkspi", "Rockchip SPI Boot Image" },
Albert ARIBAUD \(3ADEV\)ed0c2c02016-09-26 09:08:06 +0200169 { IH_TYPE_VYBRIDIMAGE, "vybridimage", "Vybrid Boot Image", },
Nathan Rossi66eef1e2015-11-17 22:56:56 +1000170 { IH_TYPE_ZYNQIMAGE, "zynqimage", "Xilinx Zynq Boot Image" },
Michal Simekd9b58b32016-04-27 14:03:29 +0200171 { IH_TYPE_ZYNQMPIMAGE, "zynqmpimage", "Xilinx ZynqMP Boot Image" },
Alexander Graf6915dcf2018-04-13 14:18:52 +0200172 { IH_TYPE_ZYNQMPBIF, "zynqmpbif", "Xilinx ZynqMP Boot Image (bif)" },
Michal Simeked0cea72016-05-17 13:58:44 +0200173 { IH_TYPE_FPGA, "fpga", "FPGA Image" },
Andrew F. Davis7e719ee2016-11-29 16:33:21 -0600174 { IH_TYPE_TEE, "tee", "Trusted Execution Environment Image",},
Sven Ebenfeldd21bd692016-11-06 16:37:56 +0100175 { IH_TYPE_FIRMWARE_IVT, "firmware_ivt", "Firmware with HABv4 IVT" },
Andrew F. Davis6442c962017-07-31 10:58:20 -0500176 { IH_TYPE_PMMC, "pmmc", "TI Power Management Micro-Controller Firmware",},
Patrick Delaunay81260e32018-03-12 10:46:04 +0100177 { IH_TYPE_STM32IMAGE, "stm32image", "STMicroelectronics STM32 Image" },
Ryder Lee3b975a12018-11-15 10:07:49 +0800178 { IH_TYPE_MTKIMAGE, "mtk_image", "MediaTek BootROM loadable Image" },
Patrick Delaunaye7fabe72019-08-02 15:07:19 +0200179 { IH_TYPE_COPRO, "copro", "Coprocessor Image"},
Andre Przywara6d295092018-12-20 01:15:18 +0000180 { IH_TYPE_SUNXI_EGON, "sunxi_egon", "Allwinner eGON Boot Image" },
Marian Balakowicz570abb02008-02-29 15:59:59 +0100181 { -1, "", "", },
182};
183
Mike Frysinger7edb1862010-10-20 07:17:39 -0400184static const table_entry_t uimage_comp[] = {
Marian Balakowicz570abb02008-02-29 15:59:59 +0100185 { IH_COMP_NONE, "none", "uncompressed", },
186 { IH_COMP_BZIP2, "bzip2", "bzip2 compressed", },
187 { IH_COMP_GZIP, "gzip", "gzip compressed", },
Luigi 'Comio' Mantellinifc9c1722008-09-08 02:46:13 +0200188 { IH_COMP_LZMA, "lzma", "lzma compressed", },
Peter Korsgaard20dde482009-11-19 11:37:51 +0100189 { IH_COMP_LZO, "lzo", "lzo compressed", },
Julius Werner027b7282015-10-06 20:03:53 -0700190 { IH_COMP_LZ4, "lz4", "lz4 compressed", },
Robert Marko26073f92020-04-25 19:37:21 +0200191 { IH_COMP_ZSTD, "zstd", "zstd compressed", },
Marian Balakowicz570abb02008-02-29 15:59:59 +0100192 { -1, "", "", },
193};
194
Simon Glass56d7ab72016-06-30 10:52:14 -0600195struct table_info {
196 const char *desc;
197 int count;
198 const table_entry_t *table;
199};
200
Atish Patra155d6a32020-03-05 16:24:22 -0800201static const struct comp_magic_map image_comp[] = {
202 { IH_COMP_BZIP2, "bzip2", {0x42, 0x5a},},
203 { IH_COMP_GZIP, "gzip", {0x1f, 0x8b},},
204 { IH_COMP_LZMA, "lzma", {0x5d, 0x00},},
205 { IH_COMP_LZO, "lzo", {0x89, 0x4c},},
Artem Lapkin2ddb8fc2021-08-31 18:22:18 +0800206 { IH_COMP_LZ4, "lz4", {0x04, 0x22},},
207 { IH_COMP_ZSTD, "zstd", {0x28, 0xb5},},
Atish Patra155d6a32020-03-05 16:24:22 -0800208 { IH_COMP_NONE, "none", {}, },
209};
210
Simon Glass56d7ab72016-06-30 10:52:14 -0600211static const struct table_info table_info[IH_COUNT] = {
212 { "architecture", IH_ARCH_COUNT, uimage_arch },
213 { "compression", IH_COMP_COUNT, uimage_comp },
214 { "operating system", IH_OS_COUNT, uimage_os },
215 { "image type", IH_TYPE_COUNT, uimage_type },
216};
217
Marian Balakowicz9a4daad2008-02-29 14:58:34 +0100218/*****************************************************************************/
219/* Legacy format routines */
220/*****************************************************************************/
Stephen Warren712fbcf2011-10-18 11:11:49 +0000221int image_check_hcrc(const image_header_t *hdr)
Marian Balakowiczb97a2a02008-01-08 18:14:09 +0100222{
223 ulong hcrc;
Stephen Warren712fbcf2011-10-18 11:11:49 +0000224 ulong len = image_get_header_size();
Marian Balakowiczb97a2a02008-01-08 18:14:09 +0100225 image_header_t header;
226
227 /* Copy header so we can blank CRC field for re-calculation */
Stephen Warren712fbcf2011-10-18 11:11:49 +0000228 memmove(&header, (char *)hdr, image_get_header_size());
229 image_set_hcrc(&header, 0);
Marian Balakowiczb97a2a02008-01-08 18:14:09 +0100230
Stephen Warren712fbcf2011-10-18 11:11:49 +0000231 hcrc = crc32(0, (unsigned char *)&header, len);
Marian Balakowiczb97a2a02008-01-08 18:14:09 +0100232
Stephen Warren712fbcf2011-10-18 11:11:49 +0000233 return (hcrc == image_get_hcrc(hdr));
Marian Balakowiczb97a2a02008-01-08 18:14:09 +0100234}
235
Stephen Warren712fbcf2011-10-18 11:11:49 +0000236int image_check_dcrc(const image_header_t *hdr)
Marian Balakowiczb97a2a02008-01-08 18:14:09 +0100237{
Stephen Warren712fbcf2011-10-18 11:11:49 +0000238 ulong data = image_get_data(hdr);
239 ulong len = image_get_data_size(hdr);
240 ulong dcrc = crc32_wd(0, (unsigned char *)data, len, CHUNKSZ_CRC32);
Marian Balakowiczb97a2a02008-01-08 18:14:09 +0100241
Stephen Warren712fbcf2011-10-18 11:11:49 +0000242 return (dcrc == image_get_dcrc(hdr));
Marian Balakowiczb97a2a02008-01-08 18:14:09 +0100243}
244
Marian Balakowiczf13e7b22008-01-08 18:12:17 +0100245/**
246 * image_multi_count - get component (sub-image) count
247 * @hdr: pointer to the header of the multi component image
248 *
249 * image_multi_count() returns number of components in a multi
250 * component image.
251 *
252 * Note: no checking of the image type is done, caller must pass
253 * a valid multi component image.
254 *
255 * returns:
256 * number of components
257 */
Stephen Warren712fbcf2011-10-18 11:11:49 +0000258ulong image_multi_count(const image_header_t *hdr)
Marian Balakowiczf13e7b22008-01-08 18:12:17 +0100259{
260 ulong i, count = 0;
Marian Balakowiczdf6f1b82008-02-29 16:00:06 +0100261 uint32_t *size;
Marian Balakowiczf13e7b22008-01-08 18:12:17 +0100262
263 /* get start of the image payload, which in case of multi
264 * component images that points to a table of component sizes */
Stephen Warren712fbcf2011-10-18 11:11:49 +0000265 size = (uint32_t *)image_get_data(hdr);
Marian Balakowiczf13e7b22008-01-08 18:12:17 +0100266
267 /* count non empty slots */
268 for (i = 0; size[i]; ++i)
269 count++;
270
271 return count;
272}
273
274/**
275 * image_multi_getimg - get component data address and size
276 * @hdr: pointer to the header of the multi component image
277 * @idx: index of the requested component
278 * @data: pointer to a ulong variable, will hold component data address
279 * @len: pointer to a ulong variable, will hold component size
280 *
281 * image_multi_getimg() returns size and data address for the requested
282 * component in a multi component image.
283 *
284 * Note: no checking of the image type is done, caller must pass
285 * a valid multi component image.
286 *
287 * returns:
288 * data address and size of the component, if idx is valid
289 * 0 in data and len, if idx is out of range
290 */
Stephen Warren712fbcf2011-10-18 11:11:49 +0000291void image_multi_getimg(const image_header_t *hdr, ulong idx,
Marian Balakowiczf13e7b22008-01-08 18:12:17 +0100292 ulong *data, ulong *len)
293{
294 int i;
Marian Balakowiczdf6f1b82008-02-29 16:00:06 +0100295 uint32_t *size;
Nick Spence02b9b222008-05-10 14:02:04 -0700296 ulong offset, count, img_data;
Marian Balakowiczf13e7b22008-01-08 18:12:17 +0100297
298 /* get number of component */
Stephen Warren712fbcf2011-10-18 11:11:49 +0000299 count = image_multi_count(hdr);
Marian Balakowiczf13e7b22008-01-08 18:12:17 +0100300
301 /* get start of the image payload, which in case of multi
302 * component images that points to a table of component sizes */
Stephen Warren712fbcf2011-10-18 11:11:49 +0000303 size = (uint32_t *)image_get_data(hdr);
Marian Balakowiczf13e7b22008-01-08 18:12:17 +0100304
305 /* get address of the proper component data start, which means
306 * skipping sizes table (add 1 for last, null entry) */
Stephen Warren712fbcf2011-10-18 11:11:49 +0000307 img_data = image_get_data(hdr) + (count + 1) * sizeof(uint32_t);
Marian Balakowiczf13e7b22008-01-08 18:12:17 +0100308
309 if (idx < count) {
Stephen Warren712fbcf2011-10-18 11:11:49 +0000310 *len = uimage_to_cpu(size[idx]);
Marian Balakowiczf13e7b22008-01-08 18:12:17 +0100311 offset = 0;
Marian Balakowiczf13e7b22008-01-08 18:12:17 +0100312
313 /* go over all indices preceding requested component idx */
314 for (i = 0; i < idx; i++) {
Nick Spence02b9b222008-05-10 14:02:04 -0700315 /* add up i-th component size, rounding up to 4 bytes */
Stephen Warren712fbcf2011-10-18 11:11:49 +0000316 offset += (uimage_to_cpu(size[i]) + 3) & ~3 ;
Marian Balakowiczf13e7b22008-01-08 18:12:17 +0100317 }
318
319 /* calculate idx-th component data address */
Nick Spence02b9b222008-05-10 14:02:04 -0700320 *data = img_data + offset;
Marian Balakowiczf13e7b22008-01-08 18:12:17 +0100321 } else {
322 *len = 0;
323 *data = 0;
324 }
325}
Marian Balakowicz42b73e82008-01-31 13:20:07 +0100326
Stephen Warren712fbcf2011-10-18 11:11:49 +0000327static void image_print_type(const image_header_t *hdr)
Marian Balakowicz2242f532008-02-21 17:27:41 +0100328{
Heiko Schocher80402f32015-06-29 09:10:46 +0200329 const char __maybe_unused *os, *arch, *type, *comp;
Marian Balakowicz2242f532008-02-21 17:27:41 +0100330
Stephen Warren712fbcf2011-10-18 11:11:49 +0000331 os = genimg_get_os_name(image_get_os(hdr));
332 arch = genimg_get_arch_name(image_get_arch(hdr));
333 type = genimg_get_type_name(image_get_type(hdr));
334 comp = genimg_get_comp_name(image_get_comp(hdr));
Marian Balakowicz2242f532008-02-21 17:27:41 +0100335
Stephen Warren712fbcf2011-10-18 11:11:49 +0000336 printf("%s %s %s (%s)\n", arch, os, type, comp);
Marian Balakowicz2242f532008-02-21 17:27:41 +0100337}
338
Marian Balakowicz5dfb5212008-02-29 21:24:06 +0100339/**
Bartlomiej Siekaedbed242008-04-18 12:39:23 +0200340 * image_print_contents - prints out the contents of the legacy format image
Wolfgang Denk3a2003f2009-08-19 11:42:56 +0200341 * @ptr: pointer to the legacy format image header
Marian Balakowicz5dfb5212008-02-29 21:24:06 +0100342 * @p: pointer to prefix string
343 *
Bartlomiej Siekaedbed242008-04-18 12:39:23 +0200344 * image_print_contents() formats a multi line legacy image contents description.
Marian Balakowicz5dfb5212008-02-29 21:24:06 +0100345 * The routine prints out all header fields followed by the size/offset data
346 * for MULTI/SCRIPT images.
347 *
348 * returns:
349 * no returned results
350 */
Stephen Warren712fbcf2011-10-18 11:11:49 +0000351void image_print_contents(const void *ptr)
Marian Balakowicz2242f532008-02-21 17:27:41 +0100352{
Wolfgang Denk3a2003f2009-08-19 11:42:56 +0200353 const image_header_t *hdr = (const image_header_t *)ptr;
Heiko Schocher80402f32015-06-29 09:10:46 +0200354 const char __maybe_unused *p;
Bartlomiej Siekaedbed242008-04-18 12:39:23 +0200355
Simon Glass1fe7d932013-05-08 08:05:58 +0000356 p = IMAGE_INDENT_STRING;
Stephen Warren712fbcf2011-10-18 11:11:49 +0000357 printf("%sImage Name: %.*s\n", p, IH_NMLEN, image_get_name(hdr));
Simon Glass859e92b2013-05-07 06:11:51 +0000358 if (IMAGE_ENABLE_TIMESTAMP) {
359 printf("%sCreated: ", p);
360 genimg_print_time((time_t)image_get_time(hdr));
361 }
Stephen Warren712fbcf2011-10-18 11:11:49 +0000362 printf("%sImage Type: ", p);
363 image_print_type(hdr);
364 printf("%sData Size: ", p);
365 genimg_print_size(image_get_data_size(hdr));
366 printf("%sLoad Address: %08x\n", p, image_get_load(hdr));
367 printf("%sEntry Point: %08x\n", p, image_get_ep(hdr));
Marian Balakowicz2242f532008-02-21 17:27:41 +0100368
Stephen Warren712fbcf2011-10-18 11:11:49 +0000369 if (image_check_type(hdr, IH_TYPE_MULTI) ||
370 image_check_type(hdr, IH_TYPE_SCRIPT)) {
Marian Balakowicz2242f532008-02-21 17:27:41 +0100371 int i;
372 ulong data, len;
Stephen Warren712fbcf2011-10-18 11:11:49 +0000373 ulong count = image_multi_count(hdr);
Marian Balakowicz2242f532008-02-21 17:27:41 +0100374
Stephen Warren712fbcf2011-10-18 11:11:49 +0000375 printf("%sContents:\n", p);
Marian Balakowicz2242f532008-02-21 17:27:41 +0100376 for (i = 0; i < count; i++) {
Stephen Warren712fbcf2011-10-18 11:11:49 +0000377 image_multi_getimg(hdr, i, &data, &len);
Marian Balakowicz570abb02008-02-29 15:59:59 +0100378
Stephen Warren712fbcf2011-10-18 11:11:49 +0000379 printf("%s Image %d: ", p, i);
380 genimg_print_size(len);
Marian Balakowicz570abb02008-02-29 15:59:59 +0100381
Stephen Warren712fbcf2011-10-18 11:11:49 +0000382 if (image_check_type(hdr, IH_TYPE_SCRIPT) && i > 0) {
Marian Balakowicz570abb02008-02-29 15:59:59 +0100383 /*
384 * the user may need to know offsets
385 * if planning to do something with
386 * multiple files
387 */
Stephen Warren712fbcf2011-10-18 11:11:49 +0000388 printf("%s Offset = 0x%08lx\n", p, data);
Marian Balakowicz570abb02008-02-29 15:59:59 +0100389 }
Marian Balakowicz2242f532008-02-21 17:27:41 +0100390 }
Sven Ebenfeldd21bd692016-11-06 16:37:56 +0100391 } else if (image_check_type(hdr, IH_TYPE_FIRMWARE_IVT)) {
392 printf("HAB Blocks: 0x%08x 0x0000 0x%08x\n",
Breno Matheus Lima5b20d142019-09-23 18:39:47 +0000393 image_get_load(hdr) - image_get_header_size(),
394 (int)(image_get_size(hdr) + image_get_header_size()
395 + sizeof(flash_header_v2_t) - 0x2060));
Marian Balakowicz2242f532008-02-21 17:27:41 +0100396 }
397}
398
Julius Werner20908542019-07-24 19:37:54 -0700399/**
400 * print_decomp_msg() - Print a suitable decompression/loading message
401 *
402 * @type: OS type (IH_OS_...)
403 * @comp_type: Compression type being used (IH_COMP_...)
404 * @is_xip: true if the load address matches the image start
405 */
406static void print_decomp_msg(int comp_type, int type, bool is_xip)
407{
408 const char *name = genimg_get_type_name(type);
409
410 if (comp_type == IH_COMP_NONE)
411 printf(" %s %s\n", is_xip ? "XIP" : "Loading", name);
412 else
413 printf(" Uncompressing %s\n", name);
414}
415
Atish Patra155d6a32020-03-05 16:24:22 -0800416int image_decomp_type(const unsigned char *buf, ulong len)
417{
418 const struct comp_magic_map *cmagic = image_comp;
419
420 if (len < 2)
421 return -EINVAL;
422
423 for (; cmagic->comp_id > 0; cmagic++) {
424 if (!memcmp(buf, cmagic->magic, 2))
425 break;
426 }
427
428 return cmagic->comp_id;
429}
430
Julius Werner20908542019-07-24 19:37:54 -0700431int image_decomp(int comp, ulong load, ulong image_start, int type,
432 void *load_buf, void *image_buf, ulong image_len,
433 uint unc_len, ulong *load_end)
434{
Simon Glassb876eb82021-09-25 07:03:11 -0600435 int ret = -ENOSYS;
Julius Werner20908542019-07-24 19:37:54 -0700436
437 *load_end = load;
438 print_decomp_msg(comp, type, load == image_start);
439
440 /*
441 * Load the image to the right place, decompressing if needed. After
442 * this, image_len will be set to the number of uncompressed bytes
443 * loaded, ret will be non-zero on error.
444 */
445 switch (comp) {
446 case IH_COMP_NONE:
Simon Glassb876eb82021-09-25 07:03:11 -0600447 ret = 0;
Julius Werner20908542019-07-24 19:37:54 -0700448 if (load == image_start)
449 break;
450 if (image_len <= unc_len)
451 memmove_wd(load_buf, image_buf, image_len, CHUNKSZ);
452 else
453 ret = -ENOSPC;
454 break;
Simon Glass458b30a2021-09-25 07:03:14 -0600455 case IH_COMP_GZIP:
Simon Glassc9d6b5b2021-09-25 19:43:14 -0600456 if (!tools_build() && CONFIG_IS_ENABLED(GZIP))
Simon Glass458b30a2021-09-25 07:03:14 -0600457 ret = gunzip(load_buf, unc_len, image_buf, &image_len);
Julius Werner20908542019-07-24 19:37:54 -0700458 break;
Simon Glass458b30a2021-09-25 07:03:14 -0600459 case IH_COMP_BZIP2:
Simon Glassc9d6b5b2021-09-25 19:43:14 -0600460 if (!tools_build() && CONFIG_IS_ENABLED(BZIP2)) {
Simon Glass458b30a2021-09-25 07:03:14 -0600461 uint size = unc_len;
Julius Werner20908542019-07-24 19:37:54 -0700462
Simon Glass458b30a2021-09-25 07:03:14 -0600463 /*
464 * If we've got less than 4 MB of malloc() space,
465 * use slower decompression algorithm which requires
466 * at most 2300 KB of memory.
467 */
468 ret = BZ2_bzBuffToBuffDecompress(load_buf, &size,
469 image_buf, image_len, CONSERVE_MEMORY, 0);
470 image_len = size;
Robert Marko26073f92020-04-25 19:37:21 +0200471 }
Robert Marko26073f92020-04-25 19:37:21 +0200472 break;
Simon Glass458b30a2021-09-25 07:03:14 -0600473 case IH_COMP_LZMA:
Simon Glassc9d6b5b2021-09-25 19:43:14 -0600474 if (!tools_build() && CONFIG_IS_ENABLED(LZMA)) {
Simon Glass458b30a2021-09-25 07:03:14 -0600475 SizeT lzma_len = unc_len;
476
477 ret = lzmaBuffToBuffDecompress(load_buf, &lzma_len,
478 image_buf, image_len);
479 image_len = lzma_len;
480 }
481 break;
482 case IH_COMP_LZO:
Simon Glassc9d6b5b2021-09-25 19:43:14 -0600483 if (!tools_build() && CONFIG_IS_ENABLED(LZO)) {
Simon Glass458b30a2021-09-25 07:03:14 -0600484 size_t size = unc_len;
485
486 ret = lzop_decompress(image_buf, image_len, load_buf, &size);
487 image_len = size;
488 }
489 break;
490 case IH_COMP_LZ4:
Simon Glassc9d6b5b2021-09-25 19:43:14 -0600491 if (!tools_build() && CONFIG_IS_ENABLED(LZ4)) {
Simon Glass458b30a2021-09-25 07:03:14 -0600492 size_t size = unc_len;
493
494 ret = ulz4fn(image_buf, image_len, load_buf, &size);
495 image_len = size;
496 }
497 break;
498 case IH_COMP_ZSTD:
Simon Glassc9d6b5b2021-09-25 19:43:14 -0600499 if (!tools_build() && CONFIG_IS_ENABLED(ZSTD)) {
Simon Glass458b30a2021-09-25 07:03:14 -0600500 struct abuf in, out;
501
502 abuf_init_set(&in, image_buf, image_len);
503 abuf_init_set(&in, load_buf, unc_len);
504 ret = zstd_decompress(&in, &out);
505 if (ret >= 0) {
506 image_len = ret;
507 ret = 0;
508 }
509 }
510 break;
Julius Werner20908542019-07-24 19:37:54 -0700511 }
Simon Glassb876eb82021-09-25 07:03:11 -0600512 if (ret == -ENOSYS) {
513 printf("Unimplemented compression type %d\n", comp);
514 return ret;
515 }
516 if (ret)
517 return ret;
Julius Werner20908542019-07-24 19:37:54 -0700518
519 *load_end = load + image_len;
520
Simon Glassb876eb82021-09-25 07:03:11 -0600521 return 0;
Julius Werner20908542019-07-24 19:37:54 -0700522}
523
Simon Glass5b9d44d2015-06-23 15:38:25 -0600524const table_entry_t *get_table_entry(const table_entry_t *table, int id)
525{
526 for (; table->id >= 0; ++table) {
527 if (table->id == id)
528 return table;
529 }
530 return NULL;
531}
532
Simon Glass14262202016-06-30 10:52:16 -0600533static const char *unknown_msg(enum ih_category category)
534{
Simon Glassae3de0d2016-10-31 10:21:09 -0600535 static const char unknown_str[] = "Unknown ";
Simon Glass14262202016-06-30 10:52:16 -0600536 static char msg[30];
537
Simon Glassae3de0d2016-10-31 10:21:09 -0600538 strcpy(msg, unknown_str);
539 strncat(msg, table_info[category].desc,
540 sizeof(msg) - sizeof(unknown_str));
Simon Glass14262202016-06-30 10:52:16 -0600541
542 return msg;
543}
544
545/**
Naoki Hayama898a0842020-10-07 11:22:24 +0900546 * genimg_get_cat_name - translate entry id to long name
Simon Glass14262202016-06-30 10:52:16 -0600547 * @category: category to look up (enum ih_category)
548 * @id: entry id to be translated
549 *
550 * This will scan the translation table trying to find the entry that matches
551 * the given id.
552 *
Heinrich Schuchardt185f8122022-01-19 18:05:50 +0100553 * Return: long entry name if translation succeeds; error string on failure
Simon Glass14262202016-06-30 10:52:16 -0600554 */
555const char *genimg_get_cat_name(enum ih_category category, uint id)
556{
557 const table_entry_t *entry;
558
559 entry = get_table_entry(table_info[category].table, id);
560 if (!entry)
561 return unknown_msg(category);
Simon Glass2ac00c02021-09-25 07:03:18 -0600562 return manual_reloc(entry->lname);
Simon Glass14262202016-06-30 10:52:16 -0600563}
564
565/**
Naoki Hayama898a0842020-10-07 11:22:24 +0900566 * genimg_get_cat_short_name - translate entry id to short name
Simon Glass14262202016-06-30 10:52:16 -0600567 * @category: category to look up (enum ih_category)
568 * @id: entry id to be translated
569 *
570 * This will scan the translation table trying to find the entry that matches
571 * the given id.
572 *
Heinrich Schuchardt185f8122022-01-19 18:05:50 +0100573 * Return: short entry name if translation succeeds; error string on failure
Simon Glass14262202016-06-30 10:52:16 -0600574 */
575const char *genimg_get_cat_short_name(enum ih_category category, uint id)
576{
577 const table_entry_t *entry;
578
579 entry = get_table_entry(table_info[category].table, id);
580 if (!entry)
581 return unknown_msg(category);
Simon Glass2ac00c02021-09-25 07:03:18 -0600582 return manual_reloc(entry->sname);
Simon Glass14262202016-06-30 10:52:16 -0600583}
584
585int genimg_get_cat_count(enum ih_category category)
586{
587 return table_info[category].count;
588}
589
590const char *genimg_get_cat_desc(enum ih_category category)
591{
592 return table_info[category].desc;
593}
594
Marian Balakowicz570abb02008-02-29 15:59:59 +0100595/**
Naoki Hayama02d41b02020-10-07 11:21:25 +0900596 * genimg_cat_has_id - check whether category has entry id
597 * @category: category to look up (enum ih_category)
598 * @id: entry id to be checked
599 *
600 * This will scan the translation table trying to find the entry that matches
601 * the given id.
602 *
Heinrich Schuchardt185f8122022-01-19 18:05:50 +0100603 * Return: true if category has entry id; false if not
Naoki Hayama02d41b02020-10-07 11:21:25 +0900604 */
605bool genimg_cat_has_id(enum ih_category category, uint id)
606{
607 if (get_table_entry(table_info[category].table, id))
608 return true;
609
610 return false;
611}
612
613/**
Marian Balakowicz570abb02008-02-29 15:59:59 +0100614 * get_table_entry_name - translate entry id to long name
615 * @table: pointer to a translation table for entries of a specific type
616 * @msg: message to be returned when translation fails
617 * @id: entry id to be translated
618 *
619 * get_table_entry_name() will go over translation table trying to find
620 * entry that matches given id. If matching entry is found, its long
621 * name is returned to the caller.
622 *
623 * returns:
624 * long entry name if translation succeeds
625 * msg otherwise
626 */
Mike Frysinger7edb1862010-10-20 07:17:39 -0400627char *get_table_entry_name(const table_entry_t *table, char *msg, int id)
Marian Balakowicz570abb02008-02-29 15:59:59 +0100628{
Simon Glass5b9d44d2015-06-23 15:38:25 -0600629 table = get_table_entry(table, id);
630 if (!table)
631 return msg;
Simon Glass2ac00c02021-09-25 07:03:18 -0600632 return manual_reloc(table->lname);
Marian Balakowicz570abb02008-02-29 15:59:59 +0100633}
634
Stephen Warren712fbcf2011-10-18 11:11:49 +0000635const char *genimg_get_os_name(uint8_t os)
Marian Balakowicz570abb02008-02-29 15:59:59 +0100636{
Stephen Warren712fbcf2011-10-18 11:11:49 +0000637 return (get_table_entry_name(uimage_os, "Unknown OS", os));
Marian Balakowicz570abb02008-02-29 15:59:59 +0100638}
639
Stephen Warren712fbcf2011-10-18 11:11:49 +0000640const char *genimg_get_arch_name(uint8_t arch)
Marian Balakowicz570abb02008-02-29 15:59:59 +0100641{
Stephen Warren712fbcf2011-10-18 11:11:49 +0000642 return (get_table_entry_name(uimage_arch, "Unknown Architecture",
643 arch));
Marian Balakowicz570abb02008-02-29 15:59:59 +0100644}
645
Stephen Warren712fbcf2011-10-18 11:11:49 +0000646const char *genimg_get_type_name(uint8_t type)
Marian Balakowicz570abb02008-02-29 15:59:59 +0100647{
Stephen Warren712fbcf2011-10-18 11:11:49 +0000648 return (get_table_entry_name(uimage_type, "Unknown Image", type));
Marian Balakowicz570abb02008-02-29 15:59:59 +0100649}
650
Naoki Hayama898a0842020-10-07 11:22:24 +0900651const char *genimg_get_comp_name(uint8_t comp)
652{
653 return (get_table_entry_name(uimage_comp, "Unknown Compression",
654 comp));
655}
656
Simon Glasscef2e512016-02-22 22:55:50 -0700657static const char *genimg_get_short_name(const table_entry_t *table, int val)
Simon Glass5b9d44d2015-06-23 15:38:25 -0600658{
Simon Glasscef2e512016-02-22 22:55:50 -0700659 table = get_table_entry(table, val);
Simon Glass5b9d44d2015-06-23 15:38:25 -0600660 if (!table)
661 return "unknown";
Simon Glass2ac00c02021-09-25 07:03:18 -0600662 return manual_reloc(table->sname);
Simon Glass5b9d44d2015-06-23 15:38:25 -0600663}
664
Simon Glasscef2e512016-02-22 22:55:50 -0700665const char *genimg_get_type_short_name(uint8_t type)
666{
667 return genimg_get_short_name(uimage_type, type);
668}
669
Simon Glasscef2e512016-02-22 22:55:50 -0700670const char *genimg_get_comp_short_name(uint8_t comp)
671{
672 return genimg_get_short_name(uimage_comp, comp);
673}
674
675const char *genimg_get_os_short_name(uint8_t os)
676{
677 return genimg_get_short_name(uimage_os, os);
678}
679
680const char *genimg_get_arch_short_name(uint8_t arch)
681{
682 return genimg_get_short_name(uimage_arch, arch);
683}
684
Marian Balakowicz570abb02008-02-29 15:59:59 +0100685/**
686 * get_table_entry_id - translate short entry name to id
687 * @table: pointer to a translation table for entries of a specific type
688 * @table_name: to be used in case of error
689 * @name: entry short name to be translated
690 *
691 * get_table_entry_id() will go over translation table trying to find
692 * entry that matches given short name. If matching entry is found,
693 * its id returned to the caller.
694 *
695 * returns:
696 * entry id if translation succeeds
697 * -1 otherwise
698 */
Mike Frysinger7edb1862010-10-20 07:17:39 -0400699int get_table_entry_id(const table_entry_t *table,
Marian Balakowicz570abb02008-02-29 15:59:59 +0100700 const char *table_name, const char *name)
701{
Mike Frysinger7edb1862010-10-20 07:17:39 -0400702 const table_entry_t *t;
Marian Balakowicz570abb02008-02-29 15:59:59 +0100703
704 for (t = table; t->id >= 0; ++t) {
Simon Glass2ac00c02021-09-25 07:03:18 -0600705 if (t->sname && !strcasecmp(manual_reloc(t->sname), name))
706 return t->id;
Marian Balakowicz570abb02008-02-29 15:59:59 +0100707 }
Stephen Warren712fbcf2011-10-18 11:11:49 +0000708 debug("Invalid %s Type: %s\n", table_name, name);
Simon Glass5b9d44d2015-06-23 15:38:25 -0600709
710 return -1;
Marian Balakowicz9a4daad2008-02-29 14:58:34 +0100711}
712
Stephen Warren712fbcf2011-10-18 11:11:49 +0000713int genimg_get_os_id(const char *name)
Marian Balakowicz9a4daad2008-02-29 14:58:34 +0100714{
Stephen Warren712fbcf2011-10-18 11:11:49 +0000715 return (get_table_entry_id(uimage_os, "OS", name));
Marian Balakowicz9a4daad2008-02-29 14:58:34 +0100716}
717
Stephen Warren712fbcf2011-10-18 11:11:49 +0000718int genimg_get_arch_id(const char *name)
Marian Balakowicz9a4daad2008-02-29 14:58:34 +0100719{
Stephen Warren712fbcf2011-10-18 11:11:49 +0000720 return (get_table_entry_id(uimage_arch, "CPU", name));
Marian Balakowicz9a4daad2008-02-29 14:58:34 +0100721}
722
Stephen Warren712fbcf2011-10-18 11:11:49 +0000723int genimg_get_type_id(const char *name)
Marian Balakowicz9a4daad2008-02-29 14:58:34 +0100724{
Stephen Warren712fbcf2011-10-18 11:11:49 +0000725 return (get_table_entry_id(uimage_type, "Image", name));
Marian Balakowicz9a4daad2008-02-29 14:58:34 +0100726}
727
Stephen Warren712fbcf2011-10-18 11:11:49 +0000728int genimg_get_comp_id(const char *name)
Marian Balakowicz570abb02008-02-29 15:59:59 +0100729{
Stephen Warren712fbcf2011-10-18 11:11:49 +0000730 return (get_table_entry_id(uimage_comp, "Compression", name));
Marian Balakowicz570abb02008-02-29 15:59:59 +0100731}