From: Anton Staaf <robotboy@chromium.org>
Date: Mon, 17 Oct 2011 23:46:13 +0000 (-0700)
Subject: cache: include asm/cache.h for ARCH_DMA_MINALIGN definition
X-Git-Tag: v2011.12-rc1~464
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1e41f5ad455e75d3985a0e4670ba1338c2e8faca;p=u-boot

cache: include asm/cache.h for ARCH_DMA_MINALIGN definition

ARCH_DMA_MINALIGN will be used to allocate DMA buffers that are
aligned correctly.  In all current cases this means that the DMA
buffer will be aligned to at least the L1 data cache line size of
the configured architecture.  If the board configuration file
does not specify the architecture L1 data cache line size then the
maximum line size of the architecture is used to align DMA buffers.

Signed-off-by: Anton Staaf <robotboy@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Ilya Yanok <yanok@emcraft.com>
Cc: Laurence Withers <lwithers@guralp.com>
---

diff --git a/include/common.h b/include/common.h
index ccd3dd785a..db1c7d0f51 100644
--- a/include/common.h
+++ b/include/common.h
@@ -834,6 +834,14 @@ int cpu_release(int nr, int argc, char * const argv[]);
 #define ALIGN(x,a)		__ALIGN_MASK((x),(typeof(x))(a)-1)
 #define __ALIGN_MASK(x,mask)	(((x)+(mask))&~(mask))
 
+/*
+ * ARCH_DMA_MINALIGN is defined in asm/cache.h for each architecture.  It
+ * is used to align DMA buffers.
+ */
+#ifndef __ASSEMBLY__
+#include <asm/cache.h>
+#endif
+
 /* Pull in stuff for the build system */
 #ifdef DO_DEPS_ONLY
 # include <environment.h>