summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-06-23 00:12:01 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-07-06 21:52:30 +0200
commit798bf9a9ade1cfbe85a16d180cad720927d8e10a (patch)
treecbc48de57fa5a96795cd902f17a73baf74a4556c
parent06e758e75c79ce8761866bf8165c443584a20893 (diff)
downloadu-boot-imx-798bf9a9ade1cfbe85a16d180cad720927d8e10a.zip
u-boot-imx-798bf9a9ade1cfbe85a16d180cad720927d8e10a.tar.gz
u-boot-imx-798bf9a9ade1cfbe85a16d180cad720927d8e10a.tar.bz2
arm920t/interrupts: Move conditional compilation to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-rw-r--r--cpu/arm920t/Makefile8
-rw-r--r--cpu/arm920t/interrupts.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/cpu/arm920t/Makefile b/cpu/arm920t/Makefile
index e02bc6a..cbb13b2 100644
--- a/cpu/arm920t/Makefile
+++ b/cpu/arm920t/Makefile
@@ -26,10 +26,12 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(CPU).a
START = start.o
-COBJS = cpu.o interrupts.o
-SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))
+COBJS-y += cpu.o
+COBJS-$(CONFIG_USE_IRQ) += interrupts.o
+
+SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS-y) $(SOBJS))
START := $(addprefix $(obj),$(START))
all: $(obj).depend $(START) $(LIB)
diff --git a/cpu/arm920t/interrupts.c b/cpu/arm920t/interrupts.c
index ea24cdf..539eb5c 100644
--- a/cpu/arm920t/interrupts.c
+++ b/cpu/arm920t/interrupts.c
@@ -30,9 +30,8 @@
*/
#include <common.h>
-
-#ifdef CONFIG_USE_IRQ
#include <asm/proc-armv/ptrace.h>
+
void do_irq (struct pt_regs *pt_regs)
{
#if defined (ARM920_IRQ_CALLBACK)
@@ -46,4 +45,3 @@ void do_irq (struct pt_regs *pt_regs)
#error do_irq() not defined for this cpu type
#endif
}
-#endif