From caf72ff329759b4da71352ab098537c7698c0e9f Mon Sep 17 00:00:00 2001 From: Luigi 'Comio' Mantellini Date: Tue, 21 Jul 2009 10:45:49 +0200 Subject: Refresh LZMA-lib to v4.65 Signed-off-by: Luigi 'Comio' Mantellini --- common/cmd_bootm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'common/cmd_bootm.c') diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 367d5a7..5d5dd33 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -52,9 +52,8 @@ #endif #ifdef CONFIG_LZMA -#define _7ZIP_BYTE_DEFINED /* Byte already defined by zlib */ #include -#include +#include #include #endif /* CONFIG_LZMA */ @@ -390,7 +389,7 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress) int ret = lzmaBuffToBuffDecompress( (unsigned char *)load, &unc_len, (unsigned char *)image_start, image_len); - if (ret != LZMA_RESULT_OK) { + if (ret != SZ_OK) { printf ("LZMA: uncompress or overwrite error %d " "- must RESET board to recover\n", ret); show_boot_progress (-6); -- cgit v1.1