summaryrefslogtreecommitdiff
path: root/cpu/arm1136/start.S
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2005-10-09 00:22:48 +0200
committerWolfgang Denk <wd@pollux.denx.de>2005-10-09 00:22:48 +0200
commit96782c63d3bd4067623895b8691ed2823c715f1d (patch)
tree7cdf8a7a2a40206c4e9009cd6eb63866e18b2f5f /cpu/arm1136/start.S
parentb8e16a3450fb9853a8b0ff617d70f1121b32c4c0 (diff)
downloadu-boot-imx-96782c63d3bd4067623895b8691ed2823c715f1d.zip
u-boot-imx-96782c63d3bd4067623895b8691ed2823c715f1d.tar.gz
u-boot-imx-96782c63d3bd4067623895b8691ed2823c715f1d.tar.bz2
Cleanup warnings for cpu/arm720t & cpu/arm1136 files.
sed the linker scripts, rather than pre-process them. Patch by Peter Pearse, 07 Oct 2005
Diffstat (limited to 'cpu/arm1136/start.S')
-rw-r--r--cpu/arm1136/start.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpu/arm1136/start.S b/cpu/arm1136/start.S
index 05c9128..17c7a83 100644
--- a/cpu/arm1136/start.S
+++ b/cpu/arm1136/start.S
@@ -30,8 +30,9 @@
#include <config.h>
#include <version.h>
+#if !defined(CONFIG_INTEGRATOR) && ! defined(CONFIG_ARCH_CINTEGRATOR)
#include <asm/arch/omap2420.h>
-
+#endif
.globl _start
_start: b reset
ldr pc, _undefined_instruction