summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorBartlomiej Sieka <tur@semihalf.com>2008-03-26 09:38:06 +0100
committerBartlomiej Sieka <tur@semihalf.com>2008-03-26 09:38:06 +0100
commit27f33e9f45ef7f9685cbdc65066a1828e85dde4f (patch)
tree5828044d71e5caa3bec4d05c6c48793df0cd17a3 /fs
parent18e69a35efbb078403db0c0063986470dad7d082 (diff)
parent388b82fddc7c05596f3f615f190da0448227dc82 (diff)
downloadu-boot-imx-27f33e9f45ef7f9685cbdc65066a1828e85dde4f.zip
u-boot-imx-27f33e9f45ef7f9685cbdc65066a1828e85dde4f.tar.gz
u-boot-imx-27f33e9f45ef7f9685cbdc65066a1828e85dde4f.tar.bz2
Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing
Conflicts: common/cmd_bootm.c cpu/mpc8xx/cpu.c Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/cramfs/uncompress.c20
1 files changed, 2 insertions, 18 deletions
diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c
index a9c0b7d..cf67967 100644
--- a/fs/cramfs/uncompress.c
+++ b/fs/cramfs/uncompress.c
@@ -29,24 +29,8 @@
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);
-}
+void *zalloc(void *, unsigned, unsigned);
+void zfree(void *, void *, unsigned);
/* Returns length of decompressed data. */
int cramfs_uncompress_block (void *dst, void *src, int srclen)