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 --- include/common.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'include') diff --git a/include/common.h b/include/common.h index c48e5bc11bf..c12f402f773 100644 --- a/include/common.h +++ b/include/common.h @@ -1060,6 +1060,15 @@ int cpu_release(int nr, int argc, char * const argv[]); #define DEFINE_CACHE_ALIGN_BUFFER(type, name, size) \ DEFINE_ALIGN_BUFFER(type, name, size, ARCH_DMA_MINALIGN) +#ifndef __ASSEMBLY__ +#include + +static inline void *malloc_cache_aligned(size_t size) +{ + return memalign(ARCH_DMA_MINALIGN, ALIGN(size, ARCH_DMA_MINALIGN)); +} +#endif + /* * check_member() - Check the offset of a structure member * -- cgit v1.3.1