bootvx_fdt: fix missing 'fdt_fixup_ethernet(...)' on vxWorks boot

[u-boot] / fs / cramfs / uncompress.c

diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c
index 18d1f0f5318f5e6d9f26921f2ff00780d8eccc49..f431cc46c1f756bb3100d5dd9830099c241cc628 100644 (file)
--- 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 (CONFIG_COMMANDS & CFG_CMD_JFFS2) || 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 */