summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLuigi 'Comio' Mantellini <luigi.mantellini@idf-hit.com>2009-07-21 10:45:49 +0200
committerWolfgang Denk <wd@denx.de>2009-07-22 09:43:27 +0200
commitcaf72ff329759b4da71352ab098537c7698c0e9f (patch)
tree90da2f5ff33a6fb194d83bea8a8ce4efd1f74e61 /include
parent70ebf31633f372a24505e47846b2628e8435ea37 (diff)
downloadu-boot-imx-caf72ff329759b4da71352ab098537c7698c0e9f.zip
u-boot-imx-caf72ff329759b4da71352ab098537c7698c0e9f.tar.gz
u-boot-imx-caf72ff329759b4da71352ab098537c7698c0e9f.tar.bz2
Refresh LZMA-lib to v4.65
Signed-off-by: Luigi 'Comio' Mantellini <luigi.mantellini@idf-hit.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/qemu-mips.h2
-rw-r--r--include/lzma/LzmaDec.h (renamed from include/lzma/LzmaDecode.h)10
-rw-r--r--include/lzma/LzmaTools.h2
-rw-r--r--include/lzma/LzmaTypes.h15
4 files changed, 18 insertions, 11 deletions
diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index 8444462..cbacdf9 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -163,6 +163,8 @@
#undef CONFIG_MEMSIZE_IN_BYTES
+#define CONFIG_LZMA
+
/*-----------------------------------------------------------------------
* Cache Configuration
*/
diff --git a/include/lzma/LzmaDecode.h b/include/lzma/LzmaDec.h
index 8fdb2c0..967cdd1 100644
--- a/include/lzma/LzmaDecode.h
+++ b/include/lzma/LzmaDec.h
@@ -1,7 +1,7 @@
/*
- * Fake include for LzmaDecode.h
+ * Fake include for LzmaDec.h
*
- * Copyright (C) 2007-2008 Industrie Dial Face S.p.A.
+ * Copyright (C) 2007-2009 Industrie Dial Face S.p.A.
* Luigi 'Comio' Mantellini (luigi.mantellini@idf-hit.com)
*
* See file CREDITS for list of people who contributed to this
@@ -23,9 +23,9 @@
* MA 02111-1307 USA
*/
-#ifndef __LZMADECODE_H__FAKE__
-#define __LZMADECODE_H__FAKE__
+#ifndef __LZMADEC_H__FAKE__
+#define __LZMADEC_H__FAKE__
-#include "../../lib_generic/lzma/LzmaDecode.h"
+#include "../../lib_generic/lzma/LzmaDec.h"
#endif
diff --git a/include/lzma/LzmaTools.h b/include/lzma/LzmaTools.h
index 7c5eea1..87943c0 100644
--- a/include/lzma/LzmaTools.h
+++ b/include/lzma/LzmaTools.h
@@ -1,7 +1,7 @@
/*
* Fake include for LzmaTools.h
*
- * Copyright (C) 2007-2008 Industrie Dial Face S.p.A.
+ * Copyright (C) 2007-2009 Industrie Dial Face S.p.A.
* Luigi 'Comio' Mantellini (luigi.mantellini@idf-hit.com)
*
* See file CREDITS for list of people who contributed to this
diff --git a/include/lzma/LzmaTypes.h b/include/lzma/LzmaTypes.h
index 02daa59..86160a4 100644
--- a/include/lzma/LzmaTypes.h
+++ b/include/lzma/LzmaTypes.h
@@ -1,7 +1,7 @@
/*
- * Fake include for LzmaTypes.h
+ * Fake include for Types.h
*
- * Copyright (C) 2007-2008 Industrie Dial Face S.p.A.
+ * Copyright (C) 2007-2009 Industrie Dial Face S.p.A.
* Luigi 'Comio' Mantellini (luigi.mantellini@idf-hit.com)
*
* See file CREDITS for list of people who contributed to this
@@ -23,9 +23,14 @@
* MA 02111-1307 USA
*/
-#ifndef __LZMATYPES_H__FAKE__
-#define __LZMATYPES_H__FAKE__
+#ifndef __TYPES_H__FAKE__
+#define __TYPES_H__FAKE__
-#include "../../lib_generic/lzma/LzmaTypes.h"
+/*
+ *This avoids the collition with zlib.h Byte definition
+ */
+#define Byte LZByte
+
+#include "../../lib_generic/lzma/Types.h"
#endif