summaryrefslogtreecommitdiff
path: root/cpu
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
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')
-rw-r--r--cpu/arm1136/cpu.c2
-rw-r--r--cpu/arm1136/interrupts.c9
-rw-r--r--cpu/arm1136/start.S3
-rw-r--r--cpu/arm720t/interrupts.c6
4 files changed, 12 insertions, 8 deletions
diff --git a/cpu/arm1136/cpu.c b/cpu/arm1136/cpu.c
index 7fa5ddc..85a4849 100644
--- a/cpu/arm1136/cpu.c
+++ b/cpu/arm1136/cpu.c
@@ -33,7 +33,9 @@
#include <common.h>
#include <command.h>
+#if !defined(CONFIG_INTEGRATOR) && ! defined(CONFIG_ARCH_CINTEGRATOR)
#include <asm/arch/omap2420.h>
+#endif
/* read co-processor 15, register #1 (control register) */
static unsigned long read_p15_c1 (void)
diff --git a/cpu/arm1136/interrupts.c b/cpu/arm1136/interrupts.c
index 6b1449e..1dc36d0 100644
--- a/cpu/arm1136/interrupts.c
+++ b/cpu/arm1136/interrupts.c
@@ -33,7 +33,7 @@
#include <common.h>
#include <asm/arch/bits.h>
-#if !defined(CONFIG_INTEGRATOR) || ! defined(CONFIG_ARCH_CINTEGRATOR)
+#if !defined(CONFIG_INTEGRATOR) && ! defined(CONFIG_ARCH_CINTEGRATOR)
# include <asm/arch/omap2420.h>
#endif
@@ -176,12 +176,13 @@ void do_irq (struct pt_regs *pt_regs)
bad_mode ();
}
-static ulong timestamp;
-static ulong lastinc;
-
#if defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_CINTEGRATOR)
/* Use the IntegratorCP function from board/integratorcp.c */
#else
+
+static ulong timestamp;
+static ulong lastinc;
+
/* nothing really to do with interrupts, just starts up a counter. */
int interrupt_init (void)
{
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
diff --git a/cpu/arm720t/interrupts.c b/cpu/arm720t/interrupts.c
index 575d923..da62502 100644
--- a/cpu/arm720t/interrupts.c
+++ b/cpu/arm720t/interrupts.c
@@ -218,13 +218,13 @@ static void timer_isr( void *data) {
}
#endif
-static ulong timestamp;
-static ulong lastdec;
-
#if defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_INTEGRATOR)
/* Use IntegratorAP routines in board/integratorap.c */
#else
+static ulong timestamp;
+static ulong lastdec;
+
int interrupt_init (void)
{