X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=fs%2Fcramfs%2Funcompress.c;h=f431cc46c1f756bb3100d5dd9830099c241cc628;hb=57c4c5d3366b229bfc2228fd8029d06e627972a0;hp=2e906eb4cfa498a2c61e1f5d39050fe6ef894628;hpb=78549bbf44bd2c8d1a0730fb068836071751afaa;p=platform%2Fkernel%2Fu-boot.git

diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c
index 2e906eb..f431cc4 100644
--- a/fs/cramfs/uncompress.c
+++ b/fs/cramfs/uncompress.c
@@ -23,31 +23,10 @@
 #include <common.h>
 #include <malloc.h>
 #include <watchdog.h>
-#include <zlib.h>
-
-#if defined(CONFIG_CMD_JFFS2)
+#include <u-boot/zlib.h>
 
 static z_stream stream;
 
-#define ZALLOC_ALIGNMENT	16
-
-static void *zalloc (void *x, unsigned items, unsigned size)
-{
-	void *p;
-
-	size *= items;
-	size = (size + ZALLOC_ALIGNMENT - 1) & ~(ZALLOC_ALIGNMENT - 1);
-
-	p = malloc (size);
-
-	return (p);
-}
-
-static void zfree (void *x, void *addr, unsigned nb)
-{
-	free (addr);
-}
-
 /* Returns length of decompressed data. */
 int cramfs_uncompress_block (void *dst, void *src, int srclen)
 {
@@ -77,8 +56,8 @@ int cramfs_uncompress_init (void)
 {
 	int err;
 
-	stream.zalloc = zalloc;
-	stream.zfree = zfree;
+	stream.zalloc = gzalloc;
+	stream.zfree = gzfree;
 	stream.next_in = 0;
 	stream.avail_in = 0;
 
@@ -102,5 +81,3 @@ int cramfs_uncompress_exit (void)
 	inflateEnd (&stream);
 	return 0;
 }
-
-#endif /* CFG_FS_CRAMFS */