[U-Boot] [PATCH] LZMA and LZO causes compile error

[U-Boot] [PATCH] LZMA and LZO causes compile error

[Matthias Weisser]

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>
---
 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 adfa6cd..4562957 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);
 
@@ -389,7 +392,7 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress)
 	case IH_COMP_LZMA:
 		printf ("   Uncompressing %s ... ", type_name);
 
-		int ret = lzmaBuffToBuffDecompress(
+		ret = lzmaBuffToBuffDecompress(
 			(unsigned char *)load, &unc_len,
 			(unsigned char *)image_start, image_len);
 		if (ret != SZ_OK) {
@@ -405,7 +408,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) {
-- 
1.7.0.4

[U-Boot] [PATCH] LZMA and LZO causes compile error

[Wolfgang Denk]

Dear Matthias Weisser,

In message <1281007050-16904-1-git-send-email-weisserm@arcor.de> you wrote:
> 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>
> ---
>  common/cmd_bootm.c |    7 +++++--
>  1 files changed, 5 insertions(+), 2 deletions(-)

Hm... doesn't apply:

Applying: LZMA and LZO causes compile error
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging common/cmd_bootm.c
CONFLICT (content): Merge conflict in common/cmd_bootm.c
Failed to merge in the changes.
Patch failed at 0001 LZMA and LZO causes compile error
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".


OK, applied manually. Thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
After Goliath's defeat, giants ceased to command respect.
- Freeman Dyson