diff options
| author | Wolfgang Denk <[email protected]> | 2009-07-23 00:48:20 +0200 |
|---|---|---|
| committer | Wolfgang Denk <[email protected]> | 2009-07-23 00:48:20 +0200 |
| commit | 46edbc545d1d0ae166271488e89c9967fb54393f (patch) | |
| tree | 90da2f5ff33a6fb194d83bea8a8ce4efd1f74e61 /common/cmd_bootm.c | |
| parent | f15f14e52879711be1d1bba2634dec684eda722e (diff) | |
| parent | caf72ff329759b4da71352ab098537c7698c0e9f (diff) | |
Merge branch 'master' of /home/wd/git/u-boot/master/
Diffstat (limited to 'common/cmd_bootm.c')
| -rw-r--r-- | common/cmd_bootm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 367d5a7a94c..5d5dd338e30 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 <lzma/LzmaTypes.h> -#include <lzma/LzmaDecode.h> +#include <lzma/LzmaDec.h> #include <lzma/LzmaTools.h> #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); |