projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MIPS: ZBOOT: Support XZ compression scheme
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
mips
/
boot
/
compressed
/
decompress.c
diff --git
a/arch/mips/boot/compressed/decompress.c
b/arch/mips/boot/compressed/decompress.c
index
2c95730
..
cff7b7d
100644
(file)
--- a/
arch/mips/boot/compressed/decompress.c
+++ b/
arch/mips/boot/compressed/decompress.c
@@
-43,7
+43,7
@@
void error(char *x)
/* activate the code for pre-boot environment */
#define STATIC static
/* activate the code for pre-boot environment */
#define STATIC static
-#if
def CONFIG_KERNEL_GZIP
+#if
defined(CONFIG_KERNEL_GZIP) || defined(CONFIG_KERNEL_XZ)
void *memcpy(void *dest, const void *src, size_t n)
{
int i;
void *memcpy(void *dest, const void *src, size_t n)
{
int i;
@@
-54,6
+54,8
@@
void *memcpy(void *dest, const void *src, size_t n)
d[i] = s[i];
return dest;
}
d[i] = s[i];
return dest;
}
+#endif
+#ifdef CONFIG_KERNEL_GZIP
#include "../../../../lib/decompress_inflate.c"
#endif
#include "../../../../lib/decompress_inflate.c"
#endif
@@
-78,6
+80,10
@@
void *memset(void *s, int c, size_t n)
#include "../../../../lib/decompress_unlzo.c"
#endif
#include "../../../../lib/decompress_unlzo.c"
#endif
+#ifdef CONFIG_KERNEL_XZ
+#include "../../../../lib/decompress_unxz.c"
+#endif
+
void decompress_kernel(unsigned long boot_heap_start)
{
unsigned long zimage_start, zimage_size;
void decompress_kernel(unsigned long boot_heap_start)
{
unsigned long zimage_start, zimage_size;