From 4519668b29bb8422ceca8e7ca9a35d5af0afe959 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Tue, 18 Aug 2015 13:06:37 +0200 Subject: mtd/nand/ubi: assortment of alignment fixes Various U-Boot adoptions/extensions to MTD/NAND/UBI did not take buffer alignment into account which led to failures of the following form: ERROR: v7_dcache_inval_range - start address is not aligned - 0x1f7f0108 ERROR: v7_dcache_inval_range - stop address is not aligned - 0x1f7f1108 Signed-off-by: Marcel Ziswiler Reviewed-by: Simon Glass Acked-by: Scott Wood [trini: Add __UBOOT__ hunk to lib/zlib/zutil.c due to malloc.h in common.h] Signed-off-by: Tom Rini --- lib/gzip.c | 2 +- lib/zlib/zutil.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/gzip.c b/lib/gzip.c index ff37d4f31b..cd8e9fea43 100644 --- a/lib/gzip.c +++ b/lib/gzip.c @@ -25,7 +25,7 @@ static void *zalloc(void *x, unsigned items, unsigned size) size *= items; size = (size + ZALLOC_ALIGNMENT - 1) & ~(ZALLOC_ALIGNMENT - 1); - p = malloc (size); + p = malloc_cache_aligned(size); return (p); } diff --git a/lib/zlib/zutil.c b/lib/zlib/zutil.c index 14f6eb1e07..173a81d1ea 100644 --- a/lib/zlib/zutil.c +++ b/lib/zlib/zutil.c @@ -43,11 +43,13 @@ void z_error (m) */ #ifndef MY_ZCALLOC /* Any system without a special alloc function */ +#ifndef __UBOOT__ #ifndef STDC extern voidp malloc OF((uInt size)); extern voidp calloc OF((uInt items, uInt size)); extern void free OF((voidpf ptr)); #endif +#endif voidpf zcalloc(voidpf opaque, unsigned items, unsigned size) { -- cgit v1.2.1