summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-07-24 00:17:48 +0200
committerWolfgang Denk <wd@denx.de>2009-07-27 00:12:32 +0200
commitfcd3c87e495f3c48b70c919869fb1e0b93d4880b (patch)
treeb9840b891a1f27b64714a10d984e9bdc35eeaf2f /cpu
parentdeec15b3064d3bb0189aede3c2921fd7ee401a0f (diff)
downloadu-boot-imx-fcd3c87e495f3c48b70c919869fb1e0b93d4880b.zip
u-boot-imx-fcd3c87e495f3c48b70c919869fb1e0b93d4880b.tar.gz
u-boot-imx-fcd3c87e495f3c48b70c919869fb1e0b93d4880b.tar.bz2
Make include/common.h usable by assembler code
Commit 70ebf316 factored out the ROUND() macro into include/common.h, not realizing that the primary use of this macro on AT91 systems was in start.S where common.h was not included, and could not be included because it contains a lot of C code which the assembler doesn't understand. This patch wraps such code in common.h in a "#ifndef __ASSEMBLY__" construct, and then adds an include to cpu/arm926ejs/start.S thus solving the problem. Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'cpu')
-rw-r--r--cpu/arm926ejs/start.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/cpu/arm926ejs/start.S b/cpu/arm926ejs/start.S
index 0275b66..8043322 100644
--- a/cpu/arm926ejs/start.S
+++ b/cpu/arm926ejs/start.S
@@ -32,6 +32,7 @@
#include <config.h>
+#include <common.h>
#include <version.h>
#if defined(CONFIG_OMAP1610)