Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bootm: Move compression progress/error messages into a function

Browse source 
This code is repeated in several places, and does not detect a common
fault where the image is too large. Move it into its own function and
provide a more helpful messages in this case, for compression schemes
which support this.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2014-12-02 13:17:30 -07:00 committed by Tom Rini
parent f6eec89fa3
commit 40e5975f9a
1 changed files with 47 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
common/bootm.c
View file

@ -264,7 +264,30 @@ static int bootm_find_other(cmd_tbl_t *cmdtp, int flag, int argc,
return 0; return 0;
} }
#endif /* USE_HOSTCC */ #endif /* USE_HOSTC */
#if defined(CONFIG_GZIP) || defined(CONFIG_GZIP) || defined(CONFIG_BZIP2) || \
defined(CONFIG_LZMA) || defined(CONFIG_LZO)
static void print_decomp_msg(const char *type_name)
{
printf(" Uncompressing %s ... ", type_name);
}
static int handle_decomp_error(const char *algo, size_t size, size_t unc_len,
int ret)
{
if (size >= unc_len)
puts("Image too large: increase CONFIG_SYS_BOOTM_LEN\n");
else
printf("%s: uncompress or overwrite error %d\n", algo, ret);
puts("Must RESET board to recover\n");
#ifndef USE_HOSTCC
bootstage_error(BOOTSTAGE_ID_DECOMP_IMAGE);
#endif
return BOOTM_ERR_RESET;
}
#endif
/** /**
* decomp_image() - decompress the operating system * decomp_image() - decompress the operating system
@ -296,19 +319,25 @@ static int decomp_image(int comp, ulong load, ulong image_start, int type,
*load_end = load + image_len; *load_end = load + image_len;
break; break;
#ifdef CONFIG_GZIP #ifdef CONFIG_GZIP
case IH_COMP_GZIP: case IH_COMP_GZIP: {
printf(" Uncompressing %s ... ", type_name); int ret;
if (gunzip(load_buf, unc_len, image_buf, &image_len) != 0) {
puts("GUNZIP: uncompress, out-of-mem or overwrite error - must RESET board to recover\n"); print_decomp_msg(type_name);
return BOOTM_ERR_RESET; ret = gunzip(load_buf, unc_len, image_buf, &image_len);
if (ret != 0) {
return handle_decomp_error("GUNZIP", image_len,
unc_len, ret);
} }
*load_end = load + image_len; *load_end = load + image_len;
break; break;
}
#endif /* CONFIG_GZIP */ #endif /* CONFIG_GZIP */
#ifdef CONFIG_BZIP2 #ifdef CONFIG_BZIP2
case IH_COMP_BZIP2: case IH_COMP_BZIP2: {
printf(" Uncompressing %s ... ", type_name); size_t size = unc_len;
print_decomp_msg(type_name);
/* /*
* If we've got less than 4 MB of malloc() space, * If we've got less than 4 MB of malloc() space,
* use slower decompression algorithm which requires * use slower decompression algorithm which requires
@ -318,30 +347,27 @@ static int decomp_image(int comp, ulong load, ulong image_start, int type,
image_buf, image_len, image_buf, image_len,
CONFIG_SYS_MALLOC_LEN < (4096 * 1024), 0); CONFIG_SYS_MALLOC_LEN < (4096 * 1024), 0);
if (i != BZ_OK) { if (i != BZ_OK) {
printf("BUNZIP2: uncompress or overwrite error %d - must RESET board to recover\n", return handle_decomp_error("BUNZIP2", size, unc_len,
i); i);
return BOOTM_ERR_RESET;
} }
*load_end = load + unc_len; *load_end = load + unc_len;
break; break;
}
#endif /* CONFIG_BZIP2 */ #endif /* CONFIG_BZIP2 */
#ifdef CONFIG_LZMA #ifdef CONFIG_LZMA
case IH_COMP_LZMA: { case IH_COMP_LZMA: {
SizeT lzma_len = unc_len; SizeT lzma_len = unc_len;
int ret; int ret;
printf(" Uncompressing %s ... ", type_name); print_decomp_msg(type_name);
ret = lzmaBuffToBuffDecompress(load_buf, &lzma_len, ret = lzmaBuffToBuffDecompress(load_buf, &lzma_len,
image_buf, image_len); image_buf, image_len);
unc_len = lzma_len;
if (ret != SZ_OK) { if (ret != SZ_OK) {
printf("LZMA: uncompress or overwrite error %d - must RESET board to recover\n", return handle_decomp_error("LZMA", lzma_len, unc_len,
ret); ret);
bootstage_error(BOOTSTAGE_ID_DECOMP_IMAGE);
return BOOTM_ERR_RESET;
} }
unc_len = lzma_len;
*load_end = load + unc_len; *load_end = load + unc_len;
break; break;
} }
@ -351,14 +377,11 @@ static int decomp_image(int comp, ulong load, ulong image_start, int type,
size_t size = unc_len; size_t size = unc_len;
int ret; int ret;
printf(" Uncompressing %s ... ", type_name); print_decomp_msg(type_name);
ret = lzop_decompress(image_buf, image_len, load_buf, &size); ret = lzop_decompress(image_buf, image_len, load_buf, &size);
if (ret != LZO_E_OK) { if (ret != LZO_E_OK)
printf("LZO: uncompress or overwrite error %d - must RESET board to recover\n", return handle_decomp_error("LZO", size, unc_len, ret);
ret);
return BOOTM_ERR_RESET;
}
*load_end = load + size; *load_end = load + size;
break; break;