From patchwork Thu Apr 30 22:07:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Christophe PLAGNIOL-VILLARD X-Patchwork-Id: 71662 X-Patchwork-Delegate: albert.aribaud@free.fr Return-Path: X-Original-To: wd@gemini.denx.de Delivered-To: wd@gemini.denx.de Received: from diddl.denx.de (diddl.denx.de [10.0.0.6]) by gemini.denx.de (Postfix) with ESMTP id 032BE83420E8 for ; Fri, 1 May 2009 00:14:33 +0200 (CEST) Received: from diddl.denx.de (localhost.localdomain [127.0.0.1]) by diddl.denx.de (Postfix) with ESMTP id E7E50C912BCD for ; Fri, 1 May 2009 00:14:32 +0200 (CEST) Received: from pop.mnet-online.de by diddl.denx.de with POP3 (fetchmail-6.3.8) for (single-drop); Fri, 01 May 2009 00:14:32 +0200 (CEST) Received: from murder (svr19.m-online.net [192.168.3.147]) by backend2 (Cyrus v2.2.12) with LMTPA; Fri, 01 May 2009 00:11:49 +0200 X-Sieve: CMU Sieve 2.2 Received: from mail.m-online.net (localhost [127.0.0.1]) by frontend3.pop.m-online.net (Cyrus v2.2.13) with LMTPA; Fri, 01 May 2009 00:11:49 +0200 Received: from scanner-3.m-online.net (scanner-3.m-online.net [192.168.1.20]) by mail.m-online.net (Postfix) with ESMTP id 7B13F2003BE; Fri, 1 May 2009 00:11:49 +0200 (CEST) Received: from mxin-1.m-online.net ([192.168.2.222]) by scanner-3.m-online.net (scanner-3.m-online.net [192.168.1.20]) (amavisd-new, port 10026) with ESMTP id 24507-06-3; Fri, 1 May 2009 00:11:43 +0200 (CEST) Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by mxin-1.m-online.net (Postfix) with ESMTP id D1AFF481ACB; Fri, 1 May 2009 00:17:12 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 94BA728429; Fri, 1 May 2009 00:11:10 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X9r2HIjme88X; Fri, 1 May 2009 00:11:10 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E119F28436; Fri, 1 May 2009 00:10:56 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EB62D283FC for ; Fri, 1 May 2009 00:10:52 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hiSUbQpCrrrm for ; Fri, 1 May 2009 00:10:48 +0200 (CEST) Received: from 30.mail-out.ovh.net (30.mail-out.ovh.net [213.186.62.213]) by theia.denx.de (Postfix) with SMTP id 155F3283CB for ; Fri, 1 May 2009 00:10:45 +0200 (CEST) Received: (qmail 5700 invoked by uid 503); 30 Apr 2009 22:10:57 -0000 Received: from b7.ovh.net (HELO mail153.ha.ovh.net) (213.186.33.57) by 30.mail-out.ovh.net with SMTP; 30 Apr 2009 22:10:57 -0000 Received: from b0.ovh.net (HELO queue-out) (213.186.33.50) by b0.ovh.net with SMTP; 30 Apr 2009 22:10:51 -0000 Received: from ns32433.ovh.net (HELO localhost) (plagnioj%jcrosoft.com@213.251.161.87) by ns0.ovh.net with SMTP; 30 Apr 2009 22:10:48 -0000 From: Jean-Christophe PLAGNIOL-VILLARD To: u-boot@lists.denx.de Date: Fri, 1 May 2009 00:07:58 +0200 Message-Id: <1241129278-20661-4-git-send-email-plagnioj@jcrosoft.com> X-Mailer: git-send-email 1.6.2.1 In-Reply-To: <1241129278-20661-3-git-send-email-plagnioj@jcrosoft.com> References: <1241129278-20661-1-git-send-email-plagnioj@jcrosoft.com> <1241129278-20661-2-git-send-email-plagnioj@jcrosoft.com> <1241129278-20661-3-git-send-email-plagnioj@jcrosoft.com> X-Ovh-Tracer-Id: 2443202798867819290 X-Ovh-Remote: 213.251.161.87 (ns32433.ovh.net) X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-Spam-Check: DONE|H 0.5/N Subject: [U-Boot] [PATCH 4/4] lpc2292: move interrupts code to soc X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de X-Virus-Scanned: by amavisd-new at m-online.net Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- cpu/arm720t/lpc2292/Makefile | 15 +++++++++---- cpu/arm720t/lpc2292/interrupts.c | 41 ++++++++++++++++++++++++++++++++++++++ cpu/arm720t/timer.c | 12 ----------- 3 files changed, 51 insertions(+), 17 deletions(-) create mode 100644 cpu/arm720t/lpc2292/interrupts.c diff --git a/cpu/arm720t/lpc2292/Makefile b/cpu/arm720t/lpc2292/Makefile index 240f1e3..296f53f 100644 --- a/cpu/arm720t/lpc2292/Makefile +++ b/cpu/arm720t/lpc2292/Makefile @@ -25,16 +25,21 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).a -COBJS = flash.o mmc.o mmc_hw.o spi.o SOBJS = $(obj)iap_entry.o -SRCS := $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) +COBJS-y += flash.o +COBJS-$(CONFIG_USE_IRQ) += interrupts.o +COBJS-y += mmc.o +COBJS-y += mmc_hw.o spi.o +COBJS-y += spi.o + +SRCS := $(COBJS-y:.o=.c) +COBJS := $(addprefix $(obj),$(COBJS-y)) all: $(obj).depend $(LIB) -$(LIB): $(OBJS) $(SOBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) +$(LIB): $(COBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(COBJS) $(SOBJS) # this MUST be compiled as thumb code! $(SOBJS): diff --git a/cpu/arm720t/lpc2292/interrupts.c b/cpu/arm720t/lpc2292/interrupts.c new file mode 100644 index 0000000..4183f77 --- /dev/null +++ b/cpu/arm720t/lpc2292/interrupts.c @@ -0,0 +1,41 @@ +/* + * (C) Copyright 2002 + * Sysgo Real-Time Solutions, GmbH + * Marius Groeger + * + * (C) Copyright 2002 + * Sysgo Real-Time Solutions, GmbH + * Alex Zuepke + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include +#include +#include +#include + +void do_irq (struct pt_regs *pt_regs) +{ + void (*pfnct)(void); + + pfnct = (void (*)(void))VICVectAddr; + + (*pfnct)(); +} diff --git a/cpu/arm720t/timer.c b/cpu/arm720t/timer.c index 98588af..5352c79 100644 --- a/cpu/arm720t/timer.c +++ b/cpu/arm720t/timer.c @@ -28,7 +28,6 @@ #include #include -#include #include #ifndef CONFIG_NETARM @@ -50,17 +49,6 @@ #define READ_TIMER (TM2STAT & NETARM_GEN_TSTAT_CTC_MASK) #endif -#if defined(CONFIG_USE_IRQ) && defined(CONFIG_LPC2292) -void do_irq (struct pt_regs *pt_regs) -{ - void (*pfnct)(void); - - pfnct = (void (*)(void))VICVectAddr; - - (*pfnct)(); -} -#endif - #if defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_INTEGRATOR) /* Use IntegratorAP routines in board/integratorap.c */ #else