diff options
| author | Matthias Weisser <weisserm@arcor.de> | 2010-08-05 13:17:30 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-08-07 23:49:59 +0200 |
| commit | 60fdc5f2f0d39776ca7cdd3ebabc9e3a20788da1 (patch) | |
| tree | 3567f23dd26e5424795da132484b2a4abaa5d211 /common | |
| parent | a2740dd00da52874d71269eaa06cf4bde549d2fe (diff) | |
| download | u-boot-imx-60fdc5f2f0d39776ca7cdd3ebabc9e3a20788da1.zip u-boot-imx-60fdc5f2f0d39776ca7cdd3ebabc9e3a20788da1.tar.gz u-boot-imx-60fdc5f2f0d39776ca7cdd3ebabc9e3a20788da1.tar.bz2 | |
LZMA and LZO causes compile error
If both LZMA and LZO compressions are used there is a compile error
in cmd_bootm.c
Signed-off-by: Matthias Weisser <weisserm@arcor.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_bootm.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 594bccb..4c6ed48 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -333,6 +333,9 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress) ulong image_start = os.image_start; ulong image_len = os.image_len; uint unc_len = CONFIG_SYS_BOOTM_LEN; +#if defined(CONFIG_LZMA) || defined(CONFIG_LZO) + int ret; +#endif /* defined(CONFIG_LZMA) || defined(CONFIG_LZO) */ const char *type_name = genimg_get_type_name (os.type); @@ -390,7 +393,7 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress) SizeT lzma_len = unc_len; printf (" Uncompressing %s ... ", type_name); - int ret = lzmaBuffToBuffDecompress( + ret = lzmaBuffToBuffDecompress( (unsigned char *)load, &lzma_len, (unsigned char *)image_start, image_len); unc_len = lzma_len; @@ -408,7 +411,7 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress) case IH_COMP_LZO: printf (" Uncompressing %s ... ", type_name); - int ret = lzop_decompress((const unsigned char *)image_start, + ret = lzop_decompress((const unsigned char *)image_start, image_len, (unsigned char *)load, &unc_len); if (ret != LZO_E_OK) { |